Changeset 9dbad556


Ignore:
Timestamp:
03/30/2022 09:21:57 PM (2 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
75b35eb
Parents:
d6796c8 (diff), 676f0fd (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 'trunk' into xry111/clfs-ng

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • appendices/acknowledgments.xml

    rd6796c8 r9dbad556  
    9898      translation project</para>
    9999    </listitem>
    100 
     100<!--
    101101    <listitem>
    102102      <para><ulink url="mailto:info@linuxfromscratch.org.ru">Anton Maisak</ulink>
    … …  
    110110      translation project</para>
    111111    </listitem>
    112 
     112-->
    113113  </itemizedlist>
    114114

  • bootscripts/Makefile

    rd6796c8 r9dbad556  
    118118        ln -sf ../init.d/network     ${ETCDIR}/rc.d/rc6.d/K80network
    119119        ln -sf ../init.d/sysklogd    ${ETCDIR}/rc.d/rc6.d/K90sysklogd
    120         ln -sf ../init.d/sendsignals ${ETCDIR}/rc.d/rc0.d/K92sendsignals
    121         ln -sf ../init.d/swap        ${ETCDIR}/rc.d/rc0.d/K94swap
    122         ln -sf ../init.d/mountfs     ${ETCDIR}/rc.d/rc0.d/K96mountfs
    123         ln -sf ../init.d/localnet    ${ETCDIR}/rc.d/rc0.d/K98localnet
     120        ln -sf ../init.d/sendsignals ${ETCDIR}/rc.d/rc6.d/K92sendsignals
     121        ln -sf ../init.d/swap        ${ETCDIR}/rc.d/rc6.d/K94swap
     122        ln -sf ../init.d/mountfs     ${ETCDIR}/rc.d/rc6.d/K96mountfs
     123        ln -sf ../init.d/localnet    ${ETCDIR}/rc.d/rc6.d/K98localnet
    124124        ln -sf ../init.d/reboot      ${ETCDIR}/rc.d/rc6.d/S99reboot
    125125

  • chapter01/changelog.xml

    rd6796c8 r9dbad556  
    4242
    4343    <listitem>
     44      <para>2022-03-31</para>
     45      <itemizedlist>
     46        <listitem revision="sysv">
     47          <para>[bdubbs] - Update to sysvinit-3.02.  Fixes
     48          <ulink url="&lfs-ticket-root;5041">#5041</ulink>.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[bdubbs] - Update to zlib-1.2.12.  Fixes
     52          <ulink url="&lfs-ticket-root;5040">#5040</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[bdubbs] - Update to expat-2.4.8.  Fixes
     56          <ulink url="&lfs-ticket-root;5039">#5039</ulink>.</para>
     57        </listitem>
     58        <listitem revision="systemd">
     59          <para>[bdubbs] - Update to Jinja2-3.1.1.  Fixes
     60          <ulink url="&lfs-ticket-root;5038">#5038</ulink>.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[bdubbs] - Update to Python-3.10.4.  Fixes
     64          <ulink url="&lfs-ticket-root;5037">#5037</ulink>.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[bdubbs] - Update to procps-ng-4.0.0.  Fixes
     68          <ulink url="&lfs-ticket-root;5036">#5036</ulink>.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[bdubbs] - Update to iproute2-5.17.0.  Fixes
     72          <ulink url="&lfs-ticket-root;5035">#5035</ulink>.</para>
     73        </listitem>
     74        <listitem>
     75          <para>[bdubbs] - Update to meson-0.62.0.  Fixes
     76          <ulink url="&lfs-ticket-root;5034">#5034</ulink>.</para>
     77        </listitem>
     78        <listitem>
     79          <para>[bdubbs] - Update to linux-5.17.1.  Fixes
     80          <ulink url="&lfs-ticket-root;5033">#5033</ulink>.</para>
     81        </listitem>
     82        <listitem>
     83          <para>[bdubbs] - Update to util-linux-2.38.  Fixes
     84          <ulink url="&lfs-ticket-root;4997">#4997</ulink>.</para>
     85        </listitem>
     86      </itemizedlist>
     87    </listitem>
     88
     89    <listitem>
    4490      <para>2022-03-25</para>
    4591      <itemizedlist>

  • chapter01/whatsnew.xml

    rd6796c8 r9dbad556  
    132132      <para>Intltool-&intltool-version;</para>
    133133    </listitem>-->
    134    <!--<listitem>
     134    <listitem>
    135135      <para>IPRoute2-&iproute2-version;</para>
    136     </listitem>-->
    137     <!--<listitem revision="systemd">
     136    </listitem>
     137    <listitem revision="systemd">
    138138      <para>Jinja2-&jinja2-version;</para>
    139     </listitem>-->
     139    </listitem>
    140140    <!--<listitem>
    141141      <para>Kbd-&kbd-version;</para>
    … …  
    210210      <para>Pkg-config-&pkgconfig-version;</para>
    211211    </listitem>-->
    212     <!--<listitem>
     212    <listitem>
    213213      <para>Procps-ng-&procps-ng-version;</para>
    214     </listitem>-->
     214    </listitem>
    215215    <!--<listitem>
    216216      <para>Psmisc-&psmisc-version;</para>
    … …  
    234234      <para>Systemd-&systemd-version;</para>
    235235    </listitem>-->
    236    <!--<listitem revision="sysv">
     236    <listitem revision="sysv">
    237237      <para>SysVinit-&sysvinit-version;</para>
    238     </listitem>-->
     238    </listitem>
    239239    <!--<listitem>
    240240      <para>Tar-&tar-version;</para>
    … …  
    249249      <para>Tzdata-&tzdata-version;</para>
    250250    </listitem>
    251    <!--<listitem>
     251    <listitem>
    252252      <para>Util-Linux-&util-linux-version;</para>
    253     </listitem>-->
     253    </listitem>
    254254    <listitem>
    255255      <para>Vim-&vim-version;</para>
    … …  
    261261      <para>XZ-Utils-&xz-version;</para>
    262262    </listitem>-->
    263     <!--<listitem>
     263    <listitem>
    264264      <para>Zlib-&zlib-version;</para>
    265     </listitem>-->
     265    </listitem>
    266266   <!--<listitem>
    267267      <para>Zstd-&zstd-version;</para>

  • chapter08/libffi.xml

    rd6796c8 r9dbad556  
    4545    <note>
    4646      <para>Similar to GMP, libffi builds with optimizations specific
    47       to the processor in use. If building for another system, export
    48       CFLAGS and CXXFLAGS to specify a generic build for your architecture.
     47      to the processor in use. If building for another system, change the
     48      value of the <parameter>--with-gcc-arch=</parameter> parameter in the
     49      following command to an architecture name fully implemented by the
     50      CPU on that system.
    4951      If this is not done, all applications that link to libffi will trigger
    5052      Illegal Operation Errors.</para>

  • chapter08/man-db.xml

    rd6796c8 r9dbad556  
    210210            <entry>Indonesian (id)</entry>
    211211            <entry>ISO-8859-1</entry>
    212             <entry>Russian (ru)</entry>
    213             <entry>KOI8-R</entry>
     212            <entry>Greek (el)</entry>
     213            <entry>ISO-8859-7</entry>
     214            <!--<entry>Russian (ru)</entry>-->
     215            <!--<entry>KOI8-R</entry>-->
    214216          </row>
    215217          <row>
    … …  
    279281            <entry>BIG5</entry>
    280282          </row>
    281           <row>
     283<!--          <row>
    282284            <entry>Greek (el)</entry>
    283285            <entry>ISO-8859-7</entry>
    … …  
    285287            <entry></entry>
    286288          </row>
    287 
     289-->
    288290        </tbody>
    289291

  • chapter08/python.xml

    rd6796c8 r9dbad556  
    4949            --with-system-expat  \
    5050            --with-system-ffi    \
    51             --with-ensurepip=yes \
    5251            --enable-optimizations</userinput></screen>
    5352
    … …  
    6867        <para>This switch enables linking against system version of
    6968        <application>libffi</application>.</para>
    70       </listitem>
    71     </varlistentry>
    72 
    73     <varlistentry>
    74       <term><parameter>--with-ensurepip=yes</parameter></term>
    75       <listitem>
    76         <para>This switch enables building <command>pip</command> and
    77         <command>setuptools</command> packaging programs.</para>
    7869      </listitem>
    7970    </varlistentry>

  • chapter08/util-linux.xml

    rd6796c8 r9dbad556  
    108108<screen><userinput remap="test">chown -Rv tester .
    109109su tester -c "make -k check"</userinput></screen>
     110
     111    <para>The <emphasis>hardlink</emphasis> tests will fail if the host's kernel
     112    does not have the option CONFIG_CRYPTO_USER_API_HASH set.</para>
    110113
    111114    <para>Install the package:</para>

  • packages.ent

    rd6796c8 r9dbad556  
    164164<!ENTITY eudev-fin-sbu "0.2 SBU">
    165165
    166 <!ENTITY expat-version "2.4.7">
     166<!ENTITY expat-version "2.4.8">
    167167<!ENTITY expat-size "444 KB">
    168168<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
    169 <!ENTITY expat-md5 "75a1f475e30281a00cb6f083ea481159">
     169<!ENTITY expat-md5 "0584a7318a4c007f7ec94778799d72fe">
    170170<!ENTITY expat-home "https://libexpat.github.io/">
    171171<!ENTITY expat-fin-du "12 MB">
    … …  
    348348<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
    349349
    350 <!ENTITY iproute2-version "5.16.0">
    351 <!ENTITY iproute2-size "843 KB">
     350<!ENTITY iproute2-version "5.17.0">
     351<!ENTITY iproute2-size "851 KB">
    352352<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
    353 <!ENTITY iproute2-md5 "994c1bad2a24aa9d70e89670c5b5dfcb">
     353<!ENTITY iproute2-md5 "8ade96ee93f37fba7e1beec89f1a54bf">
    354354<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
    355355<!ENTITY iproute2-fin-du "15 MB">
    … …  
    358358<!ENTITY iproute2-tmp-sbu "less than 0.1 SBU">
    359359
    360 <!ENTITY jinja2-version "3.0.3">
    361 <!ENTITY jinja2-size "263 KB">
     360<!ENTITY jinja2-version "3.1.1">
     361<!ENTITY jinja2-size "261 KB">
    362362<!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
    363 <!ENTITY jinja2-md5 "b76ae2f0647abebc81e7c03f5fb7b00f">
     363<!ENTITY jinja2-md5 "964afcd0853f67f20f7b2e34e5935564">
    364364<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
    365365<!ENTITY jinja2-fin-du "3.7 MB">
    … …  
    390390<!ENTITY less-fin-sbu "less than 0.1 SBU">
    391391
    392 <!ENTITY lfs-bootscripts-version "20220324">      <!-- Scripts depend on this format -->
     392<!ENTITY lfs-bootscripts-version "20220327">      <!-- Scripts depend on this format -->
    393393<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
    394394<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
    … …  
    431431
    432432<!ENTITY linux-major-version "5">
    433 <!ENTITY linux-minor-version "16">
    434 <!ENTITY linux-patch-version "16">
     433<!ENTITY linux-minor-version "17">
     434<!ENTITY linux-patch-version "1">
    435435<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    436436<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    437 <!ENTITY linux-size "124,600 KB">
     437<!ENTITY linux-size "125,378 KB">
    438438<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    439 <!ENTITY linux-md5 "bd7eeeeb178363b123bf1853c635afac">
     439<!ENTITY linux-md5 "1b96df11f2eda625c1637d3e941848ad">
    440440<!ENTITY linux-home "https://www.kernel.org/">
    441441<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
    … …  
    497497<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    498498
    499 <!ENTITY meson-version "0.61.3">
    500 <!ENTITY meson-size "1,965 KB">
     499<!ENTITY meson-version "0.62.0">
     500<!ENTITY meson-size "1,986 KB">
    501501<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    502 <!ENTITY meson-md5 "8998d77313d753a0c474d9bdf1738b2e">
     502<!ENTITY meson-md5 "2b8c86273f9f94aada9adcce895861d8">
    503503<!ENTITY meson-home "https://mesonbuild.com">
    504504<!ENTITY meson-fin-du "41 MB">
    … …  
    579579<!ENTITY pkgconfig-fin-sbu "0.3 SBU">
    580580
    581 <!ENTITY procps-ng-version "3.3.17">
    582 <!ENTITY procps-ng-size "985 KB">
     581<!ENTITY procps-ng-version "4.0.0">
     582<!ENTITY procps-ng-size "979 KB">
    583583<!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
    584 <!ENTITY procps-ng-md5 "d60613e88c2f442ebd462b5a75313d56">
     584<!ENTITY procps-ng-md5 "eedf93f2f6083afb7abf72188018e1e5">
    585585<!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
    586586<!ENTITY procps-ng-fin-du "19 MB">
    … …  
    598598     meson pages will be needed: python3.6 and python3.6m -->
    599599
    600 <!ENTITY python-version "3.10.3">
     600<!ENTITY python-version "3.10.4">
    601601<!ENTITY python-minor "3.10">
    602 <!ENTITY python-size "18,896 KB">
     602<!ENTITY python-size "18,890 KB">
    603603<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    604 <!ENTITY python-md5 "21e0b70d70fdd4756aafc4caa55cc17e">
     604<!ENTITY python-md5 "21f2e113e087083a1e8cf10553d93599">
    605605<!ENTITY python-home "https://www.python.org/">
    606606<!ENTITY python-tmp-du "359 MB">
    … …  
    609609<!ENTITY python-fin-sbu "4.3 SBU">
    610610<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
    611 <!ENTITY python-docs-md5 "f7936e437c1b05a4ff5835491d516301">
    612 <!ENTITY python-docs-size "7,092 KB">
     611<!ENTITY python-docs-md5 "f5dce93c8149e45324d87c5e05e5fcb9">
     612<!ENTITY python-docs-size "7,098 KB">
    613613
    614614<!ENTITY readline-version "8.1.2">
    … …  
    664664<!ENTITY systemd-fin-sbu  "2.2 SBU">
    665665
    666 <!ENTITY sysvinit-version "3.01">
    667 <!ENTITY sysvinit-size "124 KB">
     666<!ENTITY sysvinit-version "3.02">
     667<!ENTITY sysvinit-size "215 KB">
    668668<!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
    669 <!ENTITY sysvinit-md5 "dc14f92af715bcfa33cc25341730452e">
     669<!ENTITY sysvinit-md5 "db6ef4ee503211cb45cdd56735108942">
    670670<!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
    671671<!ENTITY sysvinit-fin-du "1.4 MB">
    … …  
    716716<!ENTITY udev-lfs-home    " ">
    717717
    718 <!ENTITY util-linux-minor "2.37">
    719 <!ENTITY util-linux-version "2.37.4"> <!-- 2.33.x -->
    720 <!ENTITY util-linux-size "5,971 KB">
     718<!ENTITY util-linux-minor "2.38">
     719<!ENTITY util-linux-version "2.38"> <!-- 2.33.x -->
     720<!ENTITY util-linux-size "7,177 KB">
    721721<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
    722 <!ENTITY util-linux-md5 "755919e658c349cad9e1c7c771742d48">
     722<!ENTITY util-linux-md5 "fffdc126809a6d4c1789a9efc1b96623">
    723723<!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
    724724<!ENTITY util-linux-tmp-du "129 MB">
    … …  
    758758<!ENTITY xz-fin-sbu "0.2 SBU">
    759759
    760 <!ENTITY zlib-version "1.2.11">
    761 <!ENTITY zlib-size "457 KB">
     760<!ENTITY zlib-version "1.2.12">
     761<!ENTITY zlib-size "1259 KB">
    762762<!ENTITY zlib-url "https://zlib.net/zlib-&zlib-version;.tar.xz">
    763 <!ENTITY zlib-md5 "85adef240c5f370b308da8c938951a68">
     763<!ENTITY zlib-md5 "28687d676c04e7103bb6ff2b9694c471">
    764764<!ENTITY zlib-home "https://www.zlib.net/">
    765765<!ENTITY zlib-tmp-du "5.0 MB">
Note: See TracChangeset for help on using the changeset viewer.