Changeset 6304533


Ignore:
Timestamp:
08/11/2022 02:14:45 PM (14 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
54bc22e
Parents:
0400cfe (diff), e9d9f83 (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 remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Files:
19 edited

Legend:

Unmodified
Added
Removed

  • bootscripts/ChangeLog

    r0400cfe r6304533  
     12022-07-23 Thomas Trepl <thomas@linuxfromscratch.org>
     2   * Mark an raid array clean when root (/) has been remounted
     3     r/o when system goes down. Otherwise, array does remain
     4     always 'dirty', causing a resync at next boot.
     5
    162022-03-24 Pierre Labastie <pierre dot labastie at neuf dot fr>
    27   * New semantics for K and S scripts:

  • bootscripts/lfs/init.d/mountfs

    r0400cfe r6304533  
    6868      # This fails if swap or / are on an LVM partition
    6969      #if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi
     70      if [ -r /etc/mdadm.conf ]; then
     71         log_info_msg "Mark arrays as clean..."
     72         mdadm --wait-clean --scan
     73         evaluate_retval
     74      fi
    7075      ;;
    7176

  • chapter01/changelog.xml

    r0400cfe r6304533  
    4242
    4343    <listitem>
     44      <para>2022-08-06</para>
     45      <itemizedlist>
     46        <listitem>
     47          <para>[bdubbs] - Update to binutils-2.39. Fixes
     48          <ulink url="&lfs-ticket-root;5089">#5089</ulink>.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[bdubbs] - Update to util-linux-2.38.1. Fixes
     52          <ulink url="&lfs-ticket-root;5088">#5088</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[bdubbs] - Update to Python3-3.10.6. Fixes
     56          <ulink url="&lfs-ticket-root;5087">#5087</ulink>.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[bdubbs] - Update to glibc-2.36. Fixes
     60          <ulink url="&lfs-ticket-root;5083">#5084</ulink>.</para>
     61        </listitem>
     62      </itemizedlist>
     63    </listitem>
     64
     65    <listitem>
     66      <para>2022-07-24</para>
     67      <itemizedlist>
     68        <listitem>
     69          <para>[bdubbs] - Update to linux-5.18.14. (Security fixes
     70          for machines affected by the RETBleed vulnerability). Fixes
     71          <ulink url="&lfs-ticket-root;5082">#5082</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[bdubbs] - Update to libcap-2.65. Fixes
     75          <ulink url="&lfs-ticket-root;5083">#5083</ulink>.</para>
     76        </listitem>
     77      </itemizedlist>
     78    </listitem>
     79
     80    <listitem>
    4481      <para>2022-07-15</para>
    4582      <itemizedlist>

  • chapter01/whatsnew.xml

    r0400cfe r6304533  
    4545      <para>Bc &bc-version;</para>
    4646    </listitem>
    47     <!--<listitem>
     47    <listitem>
    4848      <para>Binutils-&binutils-version;</para>
    49     </listitem>-->
     49    </listitem>
    5050    <!--<listitem>
    5151      <para>Bison-&bison-version;</para>
    … …  
    102102      <para>Gettext-&gettext-version;</para>
    103103    </listitem>-->
    104     <!--<listitem>
     104    <listitem>
    105105      <para>Glibc-&glibc-version;</para>
    106     </listitem>-->
     106    </listitem>
    107107    <!--<listitem>
    108108      <para>GMP-&gmp-version;</para>

  • chapter03/patches.xml

    r0400cfe r6304533  
    3636    </varlistentry>
    3737-->
    38 
     38<!--
    3939    <varlistentry>
    4040      <term>Binutils LTO Fix Patch - <token>&binutils-lto-patch-size;</token>:</term>
    … …  
    4444      </listitem>
    4545    </varlistentry>
    46 
     46-->
    4747    <varlistentry>
    4848      <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
    … …  
    6969   </varlistentry>
    7070-->
    71 <!--
     71
    7272    <varlistentry>
    73       <term>File Upstream Fixes Patch - <token>&file-upstream-fixes-patch-size;</token>:</term>
     73      <term>Gcc glibc-2.36 Fixes Patch - <token>&gcc-upstream-fixes-patch-size;</token>:</term>
    7474      <listitem>
    75         <para>Download: <ulink url="&patches-root;&file-upstream-fixes-patch;"/></para>
    76         <para>MD5 sum: <literal>&file-upstream-fixes-md5;</literal></para>
     75        <para>Download: <ulink url="&patches-root;&gcc-upstream-fixes-patch;"/></para>
     76        <para>MD5 sum: <literal>&gcc-upstream-fixes-patch-md5;</literal></para>
    7777      </listitem>
    7878    </varlistentry>
    79 -->
     79
    8080    <varlistentry>
    8181      <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
    … …  
    136136    </varlistentry>
    137137
     138    <varlistentry revision="systemd">
     139      <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
     140      <listitem>
     141        <para>Download: <ulink url="&patches-root;&systemd-upstream-patch;"/></para>
     142        <para>MD5 sum: <literal>&systemd-upstream-patch-md5;</literal></para>
     143      </listitem>
     144    </varlistentry>
     145
    138146    <varlistentry>
    139147      <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term>

  • chapter05/binutils-pass1.xml

    r0400cfe r6304533  
    7575             --target=$LFS_TGT   \
    7676             --disable-nls       \
     77             --enable-gprofng=no \
    7778             --disable-werror</userinput></screen>
    7879
    … …  
    117118
    118119      <varlistentry>
     120        <term><parameter>--enable-gprofng=no</parameter></term>
     121        <listitem>
     122          <para>This disables building gprofng which is not needed for the
     123          temporary tools.</para>
     124        </listitem>
     125      </varlistentry>
     126
     127      <varlistentry>
    119128        <term><parameter>--disable-werror</parameter></term>
    120129        <listitem>

  • chapter06/binutils-pass2.xml

    r0400cfe r6304533  
    6565    --disable-nls              \
    6666    --enable-shared            \
     67    --enable-gprofng=no        \
    6768    --disable-werror           \
    6869    --enable-64-bit-bfd</userinput></screen>

  • chapter06/gcc-pass2.xml

    r0400cfe r6304533  
    4343  <sect2 role="installation">
    4444    <title>Installation of GCC</title>
     45
     46    <para>First fix a problem with the latest version of glibc:</para>
     47
     48    <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
    4549
    4650    <para>As in the first build of GCC, the GMP, MPFR, and MPC packages are

  • chapter08/binutils.xml

    r0400cfe r6304533  
    5757<screen><computeroutput>The system has no more ptys.
    5858Ask your system administrator to create more.</computeroutput></screen>
    59 
     59<!--
    6060    <para>Upstream has made a patch to fix a problem when using binutils
    6161    for building some BLFS packages with Link Time Optimization (LTO)
    … …  
    6363
    6464 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-patch;</userinput></screen>
    65 
     65-->
    6666<!--
    6767    <para>An error in the building system causes the shipped man pages to
    … …  
    8989
    9090<screen><userinput remap="configure">../configure --prefix=/usr       \
     91             --sysconfdir=/etc   \
    9192             --enable-gold       \
    9293             --enable-ld=default \
    … …  
    200201
    201202      <seglistitem>
    202         <seg>addr2line, ar, as, c++filt, dwp, elfedit, gprof, ld, ld.bfd, ld.gold, nm,
     203        <seg>addr2line, ar, as, c++filt, dwp, elfedit, gprof, gprofng, ld, ld.bfd, ld.gold, nm,
    203204        objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
    204205        <seg>libbfd.so, libctf.so, libctf-nobfd.so, and libopcodes.so</seg>
    … …  
    283284          <indexterm zone="ch-system-binutils gprof">
    284285            <primary sortas="b-gprof">gprof</primary>
     286          </indexterm>
     287        </listitem>
     288      </varlistentry>
     289
     290      <varlistentry id="gprofng">
     291        <term><command>gprofng</command></term>
     292        <listitem>
     293          <para>Gather and analyze performance data</para>
     294          <indexterm zone="ch-system-binutils gprofng">
     295            <primary sortas="b-gprofng">gprofng</primary>
    285296          </indexterm>
    286297        </listitem>

  • chapter08/gcc.xml

    r0400cfe r6304533  
    5050    -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp</userinput></screen>
    5151-->
     52    <para>First fix a problem with the latest version of glibc:</para>
     53
     54    <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
     55
    5256    <para>For x86_64 target, set the default directory name for
    5357    64-bit libraries to <quote>lib</quote>.  The command is unnecessary,

  • chapter08/jinja2.xml

    r0400cfe r6304533  
    4747    <para>Install the package:</para>
    4848
    49 <screen><userinput remap="install">pip3 install --no-index --find-links dist Jinja2</userinput></screen>
     49<screen><userinput remap="install">pip3 install --no-index --no-user --find-links dist Jinja2</userinput></screen>
    5050
    5151  </sect2>

  • chapter08/markupsafe.xml

    r0400cfe r6304533  
    4949    <para>Install the package:</para>
    5050
    51 <screen><userinput remap="install">pip3 install --no-index --find-links dist Markupsafe</userinput></screen>
     51<screen><userinput remap="install">pip3 install --no-index --no-user --find-links dist Markupsafe</userinput></screen>
    5252
    5353  </sect2>

  • chapter08/perl.xml

    r0400cfe r6304533  
    140140<screen><userinput remap="test">make test</userinput></screen>
    141141
    142     <note>
    143        <para>Nine tests fail due to using the most recent version of zlib.</para>
    144     </note>
    145 
    146142    <para>Install the package and clean up:</para>
    147143

  • chapter08/python.xml

    r0400cfe r6304533  
    104104    package manager (<command>dpkg</command> for example), but LFS does not
    105105    have a system-wide package manager so this is not a problem.  If desired,
    106     suppress this warning by running the following command:</para>
    107 
     106    suppress this warning by running the following commands:</para>
     107
     108 <screen><userinput remap="install">cat &gt; /etc/pip.conf &lt;&lt; EOF
     109[global]
     110root-user-action = ignore
     111EOF
     112</userinput></screen>
     113<!--
    108114<screen><userinput remap="install">sed -e '/def warn_if_run_as_root/a\    return' \
    109115    -i /usr/lib/python3.10/site-packages/pip/_internal/cli/req_command.py
    110116</userinput></screen>
    111 
     117-->
    112118    <important>
    113119      <para>

  • chapter08/systemd.xml

    r0400cfe r6304533  
    4040  <sect2 role="installation">
    4141    <title>Installation of systemd</title>
     42
     43    <para>First, fix an issue introduced by glibc-2.36.</para>
     44
     45<screen><userinput remap="pre">patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
    4246
    4347    <para>Remove two unneeded groups,

  • chapter08/wheel.xml

    r0400cfe r6304533  
    8181    <segmentedlist>
    8282      <segtitle>Installed program</segtitle>
    83       <segtitle>Installed directory</segtitle>
     83      <segtitle>Installed directories</segtitle>
    8484
    8585      <seglistitem>
    8686        <seg>wheel</seg>
    87         <seg>/usr/lib/python&python-minor;/site-packages/wheel</seg>
     87        <seg>
     88           /usr/lib/python&python-minor;/site-packages/wheel and
     89           /usr/lib/python&python-minor;/site-packages/wheel-0.37.1-py3.10.egg-info
     90        </seg>
    8891      </seglistitem>
    8992    </segmentedlist>

  • packages.ent

    r0400cfe r6304533  
    6767<!ENTITY bc-fin-sbu "less than 0.1 SBU">
    6868
    69 <!ENTITY binutils-version "2.38">
    70 <!ENTITY binutils-size "23,098 KB">
     69<!ENTITY binutils-version "2.39">
     70<!ENTITY binutils-size "24,578 KB">
    7171<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
    72 <!ENTITY binutils-md5 "6e39cad1bb414add02b5b1169c18fdc5">
     72<!ENTITY binutils-md5 "f7e986ae9ff06405cafb2e585ee36d27">
    7373<!ENTITY binutils-home "&gnu-software;binutils/">
    7474<!ENTITY binutils-tmpp1-du "620 MB">
    … …  
    258258<!ENTITY gettext-fin-sbu "2.7 SBU">
    259259
    260 <!ENTITY glibc-version "2.35">
    261 <!ENTITY glibc-size "17,741 KB">
     260<!ENTITY glibc-version "2.36">
     261<!ENTITY glibc-size "18,175 KB">
    262262<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
    263 <!ENTITY glibc-md5 "dd571c67d85d89d7f60b854a4e207423">
     263<!ENTITY glibc-md5 "00e9b89e043340f688bc93ec03239b57">
    264264<!ENTITY glibc-home "&gnu-software;libc/">
    265265<!ENTITY glibc-tmp-du "818 MB">
    … …  
    390390<!ENTITY less-fin-sbu "less than 0.1 SBU">
    391391
    392 <!ENTITY lfs-bootscripts-version "20220623">      <!-- Scripts depend on this format -->
     392<!ENTITY lfs-bootscripts-version "20220723">      <!-- 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">
    … …  
    398398<!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
    399399
    400 <!ENTITY libcap-version "2.64">
    401 <!ENTITY libcap-size "172 KB">
     400<!ENTITY libcap-version "2.65">
     401<!ENTITY libcap-size "176 KB">
    402402<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
    403 <!ENTITY libcap-md5 "14fb1fa596f58596bdef0bb5033d2586">
     403<!ENTITY libcap-md5 "3543e753dd941255c4def6cc67a462bb">
    404404<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
    405405<!ENTITY libcap-fin-du "2.7 MB">
    … …  
    432432<!ENTITY linux-major-version "5">
    433433<!ENTITY linux-minor-version "18">
    434 <!ENTITY linux-patch-version "11">
     434<!ENTITY linux-patch-version "14">
    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 "126,787 KB">
     437<!ENTITY linux-size "126,808 KB">
    438438<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    439 <!ENTITY linux-md5 "3617b3dd0e2d9c8dd216d3bc6ea9f022">
     439<!ENTITY linux-md5 "3191e07cbaa8cad0bcda8847af3c31fa">
    440440<!ENTITY linux-home "https://www.kernel.org/">
    441441<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
    … …  
    598598     meson pages will be needed: python3.6 and python3.6m -->
    599599
    600 <!ENTITY python-version "3.10.5">
     600<!ENTITY python-version "3.10.6">
    601601<!ENTITY python-minor "3.10">
    602 <!ENTITY python-size "18,908 KB">
     602<!ENTITY python-size "19,142 KB">
    603603<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    604 <!ENTITY python-md5 "f05727cb3489aa93cd57eb561c16747b">
     604<!ENTITY python-md5 "afc7e14f7118d10d1ba95ae8e2134bf0">
    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 "46a8c3285c6ca87736bc9aad2d8519ba">
    612 <!ENTITY python-docs-size "7,112 KB">
     611<!ENTITY python-docs-md5 "8f32c4f4f0b18ec56e8b3822bbaeb017">
     612<!ENTITY python-docs-size "7,321 KB">
    613613
    614614<!ENTITY readline-version "8.1.2">
    … …  
    717717
    718718<!ENTITY util-linux-minor "2.38">
    719 <!ENTITY util-linux-version "2.38"> <!-- 2.33.x -->
    720 <!ENTITY util-linux-size "7,177 KB">
     719<!ENTITY util-linux-version "2.38.1"> <!-- 2.33.x -->
     720<!ENTITY util-linux-size "7,321 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 "fffdc126809a6d4c1789a9efc1b96623">
     722<!ENTITY util-linux-md5 "cd11456f4ddd31f7fbfdd9488c0c0d02">
    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">

  • patches.ent

    r0400cfe r6304533  
    4040<!ENTITY file-upstream-fixes-patch-size "4.0 KB">
    4141-->
    42 <!--
    43 <!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
    44 <!ENTITY gcc-upstream-fixes-patch-md5 "27266d2a771f2ff812cb6ec9c8b456b4">
    45 <!ENTITY gcc-upstream-fixes-patch-size "18.0 KB">
    46 -->
     42
     43<!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-glibc_2.36-1.patch">
     44<!ENTITY gcc-upstream-fixes-patch-md5 "8a5a4c3d14b9b2398b32f20b53a4de50">
     45<!ENTITY gcc-upstream-fixes-patch-size "1.7 KB">
     46
    4747<!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
    4848<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
    … …  
    8686<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
    8787
     88<!ENTITY systemd-upstream-patch "systemd-&systemd-version;-glibc_2.36_fix-1.patch">
     89<!ENTITY systemd-upstream-patch-md5 "fd8dc901e73ad00dc72a351a0d4ac48c">
     90<!ENTITY systemd-upstream-patch-size "3.0 KB">
     91
    8892<!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch">
    8993<!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788">

  • prologue/typography.xml

    r0400cfe r6304533  
    3737  the result of commands issued.  This format is also used to show filenames,
    3838  such as <filename>/etc/ld.so.conf</filename>.</para>
     39
     40  <note>
     41    <para>Please configure your browser to display fixed-width text with
     42    a good monospaced font, with which you can distinguish the glyphs of
     43    <literal>Il1</literal> or <literal>O0</literal> clearly.</para>
     44  </note>
    3945
    4046  <para><emphasis>Emphasis</emphasis></para>
Note: See TracChangeset for help on using the changeset viewer.