Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

Location:
BOOK/materials/common
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOOK/materials/common/introduction.xml

    rec008670 r229ed25  
    4646<screen><userinput>chmod -v a+wt ${CLFS}/sources</userinput></screen>
    4747
    48   <para>You can download all needed packages and patches either by using the
    49   links on the following pages in this section, or by passing the
    50   <ulink url="../dl.list">download list</ulink> to <command>wget</command>.</para>
     48  <para>You can download all needed packages and patches into this directory
     49either by using the links on the following pages in this section, or by passing
     50the <ulink url="../dl.list">download list</ulink> to <command>wget</command>:</para>
     51
     52<screen><userinput>wget -i dl.list -P ${CLFS}/sources</userinput></screen>
     53
     54  <para>Verification of downloaded packages can be done by downloading the
     55following MD5 or SHA1 checksum lists:</para>
     56
     57  <para><ulink url="/files/packages/git/MD5SUMS">MD5SUMS</ulink>:</para>
     58
     59<screen><userinput>pushd ${CLFS}/sources
     60md5sum -c MD5SUMS
     61popd</userinput></screen>
     62
     63  <para><ulink url="/files/packages/git/SHA1SUMS">SHA1SUMS</ulink>:</para>
     64
     65<screen><userinput>pushd ${CLFS}/sources
     66sha1sum -c SHA1SUMS
     67popd</userinput></screen>
    5168
    5269</sect1>

  • BOOK/materials/common/packages.xml

    rec008670 r229ed25  
    5252
    5353    <varlistentry>
     54      <term>Bc (&bc-version;) - <token>&bc-size;</token>:</term>
     55      <listitem>
     56        <para>Home page: <ulink url="&bc-home;"/></para>
     57        <para>Download: <ulink url="&bc-url;"/></para>
     58        <para>MD5 sum: <literal>&bc-md5;</literal></para>
     59      </listitem>
     60    </varlistentry>
     61
     62    <varlistentry>
    5463      <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
    5564      <listitem>
    … …  
    8897
    8998    <varlistentry>
    90       <term>ClooG-PPL (&cloog-ppl-version;) - <token>&cloog-ppl-size;</token>:</term>
    91       <listitem>
    92         <para>Home page: <ulink url="&cloog-ppl-home;"/></para>
    93         <para>Download: <ulink url="&cloog-ppl-url;"/></para>
    94         <para>MD5 sum: <literal>&cloog-ppl-md5;</literal></para>
     99      <term>Check (&check-version;) - <token>&check-size;</token>:</term>
     100      <listitem>
     101        <para>Home page: <ulink url="&check-home;"/></para>
     102        <para>Download: <ulink url="&check-url;"/></para>
     103        <para>MD5 sum: <literal>&check-md5;</literal></para>
     104      </listitem>
     105    </varlistentry>
     106
     107    <varlistentry>
     108      <term>ClooG (&cloog-version;) - <token>&cloog-size;</token>:</term>
     109      <listitem>
     110        <para>Home page: <ulink url="&cloog-home;"/></para>
     111        <para>Download: <ulink url="&cloog-url;"/></para>
     112        <para>MD5 sum: <literal>&cloog-md5;</literal></para>
    95113      </listitem>
    96114    </varlistentry>
    … …  
    304322
    305323    <varlistentry>
     324      <term>ISL (&isl-version;) - <token>&isl-size;</token>:</term>
     325      <listitem>
     326        <para>Home page: <ulink url="&isl-home;"/></para>
     327        <para>Download: <ulink url="&isl-url;"/></para>
     328        <para>MD5 sum: <literal>&isl-md5;</literal></para>
     329      </listitem>
     330    </varlistentry>
     331
     332    <varlistentry>
    306333      <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
    307334      <listitem>
    … …  
    313340
    314341    <varlistentry>
     342      <term>Kmod (&kmod-version;) - <token>&kmod-size;</token>:</term>
     343      <listitem>
     344        <para>Home page: <ulink url="&kmod-home;"/></para>
     345        <para>Download: <ulink url="&kmod-url;"/></para>
     346        <para>MD5 sum: <literal>&kmod-md5;</literal></para>
     347      </listitem>
     348    </varlistentry>
     349
     350    <varlistentry>
    315351      <term>Less (&less-version;) - <token>&less-size;</token>:</term>
    316352      <listitem>
    … …  
    403439
    404440    <varlistentry>
    405       <term>Module-Init-Tools (&module-init-tools-version;) - <token>&module-init-tools-size;</token>:</term>
    406       <listitem>
    407         <para>Home page: <ulink url="&module-init-tools-home;"/></para>
    408         <para>Download: <ulink url="&module-init-tools-url;"/></para>
    409         <para>MD5 sum: <literal>&module-init-tools-md5;</literal></para>
    410       </listitem>
    411     </varlistentry>
    412 
    413     <varlistentry>
    414441      <term>MPC (&mpc-version;) - <token>&mpc-size;</token>:</term>
    415442      <listitem>
    … …  
    457484
    458485    <varlistentry>
    459       <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token>:</term>
    460       <listitem>
    461         <para>Home page: <ulink url="&pkg-config-home;"/></para>
    462         <para>Download: <ulink url="&pkg-config-url;"/></para>
    463         <para>MD5 sum: <literal>&pkg-config-md5;</literal></para>
    464       </listitem>
    465     </varlistentry>
    466 
    467     <varlistentry>
    468       <term>PPL (&ppl-version;) - <token>&ppl-size;</token>:</term>
    469       <listitem>
    470         <para>Home page: <ulink url="&ppl-home;"/></para>
    471         <para>Download: <ulink url="&ppl-url;"/></para>
    472         <para>MD5 sum: <literal>&ppl-md5;</literal></para>
     486      <term>Pkg-config-lite (&pkg-config-lite-version;) - <token>&pkg-config-lite-size;</token>:</term>
     487      <listitem>
     488        <para>Home page: <ulink url="&pkg-config-lite-home;"/></para>
     489        <para>Download: <ulink url="&pkg-config-lite-url;"/></para>
     490        <para>MD5 sum: <literal>&pkg-config-lite-md5;</literal></para>
    473491      </listitem>
    474492    </varlistentry>
    … …  
    573591    </varlistentry>
    574592
    575     <varlistentry>
    576       <term>Udev (&udev-version;) - <token>&udev-size;</token>:</term>
    577       <listitem>
    578         <para>Home page: <ulink url="&udev-home;"/></para>
    579         <para>Download: <ulink url="&udev-url;"/></para>
    580         <para>MD5 sum: <literal>&udev-md5;</literal></para>
    581       </listitem>
     593    <varlistentry> 
     594      <term>Time Zone Data (&tzdata-version;) - <token>&tzdata-size;</token>:</term>
     595      <listitem> 
     596        <para>Home page: <ulink url="&tzdata-home;"/></para>
     597        <para>Download: <ulink url="&tzdata-url;"/></para>
     598        <para>MD5 sum: <literal>&tzdata-md5;</literal></para>
     599      </listitem> 
    582600    </varlistentry>
    583601
    … …  
    615633        <para>Download: <ulink url="&zlib-url;"/></para>
    616634        <para>MD5 sum: <literal>&zlib-md5;</literal></para>
     635
     636        <note>
     637          <para>Zlib (&zlib-version;) may no longer be available at the
     638          listed location. The site administrators of the master download
     639          location occasionally remove older versions when new ones are
     640          released. An alternative download location that may have the
     641          correct version available is <ulink
     642          url="&packages-root;"/>.</para>
     643        </note>
    617644      </listitem>
    618645    </varlistentry>

  • BOOK/materials/common/patches.xml

    rec008670 r229ed25  
    2828    </varlistentry>
    2929
     30<!-- Binutils branch update area
    3031    <varlistentry>
    31       <term>CLooG-PPL Autogen Patch - <token>&cloog-ppl-autogen-patch-size;</token>:</term>
     32      <term>Binutils Branch Update Patch - <token>&binutils-branch_update-patch-size;</token>:</term>
    3233      <listitem>
    3334        <para>Download: <ulink
    34         url="&patches-root;&cloog-ppl-autogen-patch;"/></para>
    35         <para>MD5 sum: <literal>&cloog-ppl-autogen-patch-md5;</literal></para>
     35        url="&patches-root;&binutils-branch_update-patch;"/></para>
     36        <para>MD5 sum: <literal>&binutils-branch_update-patch-md5;</literal></para>
    3637      </listitem>
    3738    </varlistentry>
    38 
     39-->
    3940    <varlistentry>
    4041      <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
    … …  
    4748
    4849    <varlistentry>
    49       <term>EGLIBC Dl Dep Fix Patch - <token>&eglibc-dl_dep_fix-patch-size;</token>:</term>
     50      <term>Coreutils Noman Patch - <token>&coreutils-noman-patch-size;</token>:</term>
    5051      <listitem>
    5152        <para>Download: <ulink
    52         url="&patches-root;&eglibc-dl_dep_fix-patch;"/></para>
    53         <para>MD5 sum: <literal>&eglibc-dl_dep_fix-patch-md5;</literal></para>
     53        url="&patches-root;&coreutils-noman-patch;"/></para>
     54        <para>MD5 sum: <literal>&coreutils-noman-patch-md5;</literal></para>
    5455      </listitem>
    5556    </varlistentry>
    5657
    57     <varlistentry>
    58       <term>Flex GCC 4.4.x Patch - <token>&flex-gcc44-patch-size;</token>:</term>
    59       <listitem>
    60         <para>Download: <ulink
    61         url="&patches-root;&flex-gcc44-patch;"/></para>
    62         <para>MD5 sum: <literal>&flex-gcc44-patch-md5;</literal></para>
    63       </listitem>
    64     </varlistentry>
    65 
     58<!-- GCC Branch Update Area -->
    6659    <varlistentry>
    6760      <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
    … …  
    7063        url="&patches-root;&gcc-branch_update-patch;"/></para>
    7164        <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
     65      </listitem>
     66    </varlistentry>
     67
     68    <varlistentry>
     69      <term>Iana-Etc Get Fix Patch - <token>&iana-etc-get_fix-patch-size;</token>:</term>
     70      <listitem>
     71        <para>Download: <ulink
     72        url="&patches-root;&iana-etc-get_fix-patch;"/></para>
     73        <para>MD5 sum: <literal>&iana-etc-get_fix-patch-md5;</literal></para>
     74      </listitem>
     75    </varlistentry>
     76
     77    <varlistentry>
     78      <term>Iana-Etc Protocol and Port Numbers Update - <token>&iana-etc-numbers_update-patch-size;</token>:</term>
     79      <listitem>
     80        <para>Download: <ulink
     81        url="&patches-root;&iana-etc-numbers_update-patch;"/></para>
     82        <para>MD5 sum: <literal>&iana-etc-numbers_update-patch-md5;</literal></para>
    7283      </listitem>
    7384    </varlistentry>
    … …  
    8394
    8495    <varlistentry>
    85       <term>IPUtils Pregenerated Documentation Patch - <token>&iputils-doc-patch-size;</token>:</term>
    86       <listitem>
    87         <para>Download: <ulink
    88         url="&patches-root;&iputils-doc-patch;"/></para>
    89         <para>MD5 sum: <literal>&iputils-doc-patch-md5;</literal></para>
    90       </listitem>
    91     </varlistentry>
    92 
    93     <varlistentry>
    94       <term>Kbd es.po Fix Patch - <token>&kbd-espo-patch-size;</token>:</term>
    95       <listitem>
    96         <para>Download: <ulink
    97         url="&patches-root;&kbd-espo-patch;"/></para>
    98         <para>MD5 sum: <literal>&kbd-espo-patch-md5;</literal></para>
    99       </listitem>
    100     </varlistentry>
    101 
    102     <varlistentry>
    10396      <term>Man i18n Patch - <token>&man-i18n-patch-size;</token>:</term>
    10497      <listitem>
    … …  
    10699        url="&patches-root;&man-i18n-patch;"/></para>
    107100        <para>MD5 sum: <literal>&man-i18n-patch-md5;</literal></para>
     101      </listitem>
     102    </varlistentry>
     103
     104    <varlistentry>
     105      <term>MPFR Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
     106      <listitem>
     107        <para>Download: <ulink
     108        url="&patches-root;&mpfr-fixes-patch;"/></para>
     109        <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
    108110      </listitem>
    109111    </varlistentry>
    … …  
    172174    </varlistentry>
    173175
    174     <varlistentry>
    175       <term>Texinfo New Compressors Patch - <token>&texinfo-new_compressors-patch-size;</token>:</term>
    176       <listitem>
    177         <para>Download: <ulink
    178         url="&patches-root;&texinfo-new_compressors-patch;"/></para>
    179         <para>MD5 sum: <literal>&texinfo-new_compressors-patch-md5;</literal></para>
    180       </listitem>
    181     </varlistentry>
    182 
     176<!-- Vim branch update patch area -->
    183177    <varlistentry>
    184178      <term>Vim Branch Update Patch - <token>&vim-branch_update-patch-size;</token>:</term>
Note: See TracChangeset for help on using the changeset viewer.