Changeset dd79d3f


Ignore:
Timestamp:
06/16/2021 03:45:12 AM (3 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib, xry111/multilib
Children:
6e9ca99
Parents:
6a72404 (diff), 7fe99c2 (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:

Automatic merge of trunk into multilib

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r6a72404 rdd79d3f  
    4646    -->
    4747    <listitem>
     48      <para>2021-05-15</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[bdubbs] - Update to iana-etc-20210611. Addresses
     52          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[bdubbs] - Update to vim-8.2.3001. Addresses
     56          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[bdubbs] - Update to util-linux-2.37. Fixes
     60          <ulink url="&lfs-ticket-root;4865">#4865</ulink>.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[bdubbs] - Update to meson-0.58.1. Fixes
     64          <ulink url="&lfs-ticket-root;4867">#4867</ulink>.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[bdubbs] - Update to linux-5.12.10. Fixes
     68          <ulink url="&lfs-ticket-root;4857">#4866</ulink>.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[bdubbs] - Update to m4-1.4.19. Fixes
     72          <ulink url="&lfs-ticket-root;4864">#4864</ulink>.</para>
     73        </listitem>
     74        <listitem>
     75          <para>[bdubbs] - Update to grub-2.06. Fixes
     76          <ulink url="&lfs-ticket-root;4868">#4868</ulink>.</para>
     77        </listitem>
     78      </itemizedlist>
     79    </listitem>
     80
     81    <listitem>
    4882      <para>2021-06-09</para>
    4983      <itemizedlist>
    … …  
    108142        </listitem>
    109143        <listitem>
    110           <para>[bdubbs] - Update to inux-5.12.7. Fixes
     144          <para>[bdubbs] - Update to linux-5.12.7. Fixes
    111145          <ulink url="&lfs-ticket-root;4857">#4857</ulink>.</para>
    112146        </listitem>

  • chapter01/whatsnew.xml

    r6a72404 rdd79d3f  
    169169      <para>Linux-&linux-version;</para>
    170170    </listitem>
    171     <!--<listitem>
     171    <listitem>
    172172      <para>M4-&m4-version;</para>
    173     </listitem>-->
     173    </listitem>
    174174    <!--<listitem>
    175175      <para>Make-&make-version;</para>
    … …  
    247247      <para>Tzdata-&tzdata-version;</para>
    248248    </listitem>-->
    249     <!--<listitem>
     249    <listitem>
    250250      <para>Util-Linux-&util-linux-version;</para>
    251     </listitem>-->
     251    </listitem>
    252252    <listitem>
    253253      <para>Vim-&vim-version;</para>

  • chapter03/packages.xml

    r6a72404 rdd79d3f  
    731731        <para>Download: <ulink url="&util-linux-url;"/></para>
    732732        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
     733      </listitem>
     734    </varlistentry>
     735
     736    <varlistentry>
     737      <term>Util-linux Man Pages - <token>&util-linux-man-size;</token>:</term>
     738      <listitem>
     739        <para>Download: <ulink url="&util-linux-man-url;"/></para>
     740        <para>MD5 sum: <literal>&util-linux-man-md5;</literal></para>
     741
     742        <note>
     743          <para>The Linux From Scratch team generates its own tarball of the
     744          man pages using the util-linux source. This is done in order to avoid
     745          unnecessary dependencies.</para>
     746        </note>
    733747      </listitem>
    734748    </varlistentry>

  • chapter08/chapter08.xml

    r6a72404 rdd79d3f  
    8080  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
    8181  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
    82   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
    8382  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
    8483  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
    … …  
    9392
    9493  <!-- Both sysv on systemd builds -->
     94  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
    9595  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
    9696  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>

  • chapter08/util-linux.xml

    r6a72404 rdd79d3f  
    102102
    103103<screen><userinput remap="install">make install</userinput></screen>
     104
     105  <para>Finally, install the man pages:</para>
     106
     107<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz \
     108--directory /usr/share/man --strip-components=1</userinput></screen>
    104109
    105110  </sect2>

  • packages.ent

    r6a72404 rdd79d3f  
    302302<!ENTITY groff-fin-sbu "0.5 SBU">
    303303
    304 <!ENTITY grub-version "2.06~rc1">
    305 <!ENTITY grub-size "6,391 KB">
     304<!ENTITY grub-version "2.06">
     305<!ENTITY grub-size "6,428 KB">
    306306<!--<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">-->
    307307<!ENTITY grub-url "https://alpha.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
    308 <!ENTITY grub-md5 "3c222b51347c182d655f9b94d5b56582">
     308<!ENTITY grub-md5 "cf0fd928b1e5479c8108ee52cb114363">
    309309<!ENTITY grub-home "&gnu-software;grub/">
    310310<!ENTITY grub-fin-du "154 MB">
    … …  
    321321<!ENTITY gzip-fin-sbu "0.1 SBU">
    322322
    323 <!ENTITY iana-etc-version "20210526">
     323<!ENTITY iana-etc-version "20210611">
    324324<!ENTITY iana-etc-size "579 KB">
    325325<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
    326 <!ENTITY iana-etc-md5 "8442d67cc5f5b3616d128e25779a93c7">
     326<!ENTITY iana-etc-md5 "f2854be57fe281e3ffc7364984467d2f">
    327327<!ENTITY iana-etc-home "https://www.iana.org/protocols">
    328328<!ENTITY iana-etc-fin-du "4.7 MB">
    … …  
    427427<!ENTITY linux-major-version "5">
    428428<!ENTITY linux-minor-version "12">
    429 <!ENTITY linux-patch-version "8">
     429<!ENTITY linux-patch-version "10">
    430430<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    431431<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    432 <!ENTITY linux-size "115,385 KB">
     432<!ENTITY linux-size "115,379 KB">
    433433<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    434 <!ENTITY linux-md5 "77cb5ae53f13405dac2a5bcb887a274a">
     434<!ENTITY linux-md5 "7a3d78b97103f2b64c8c8592c1dfbe8d">
    435435<!ENTITY linux-home "https://www.kernel.org/">
    436436<!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
    … …  
    446446<!ENTITY linux-headers-fin-sbu "0.1 SBU">-->
    447447
    448 <!ENTITY m4-version "1.4.18">
    449 <!ENTITY m4-size "1,180 KB">
     448<!ENTITY m4-version "1.4.19">
     449<!ENTITY m4-size "1,617 KB">
    450450<!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.xz">
    451 <!ENTITY m4-md5 "730bb15d96fffe47e148d1e09235af82">
     451<!ENTITY m4-md5 "0d90823e1426f1da2fd872df0311298d">
    452452<!ENTITY m4-home "&gnu-software;m4/">
    453453<!ENTITY m4-tmp-du "22 MB">
    … …  
    482482<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
    483483
    484 <!ENTITY meson-version "0.58.0">
    485 <!ENTITY meson-size "1,844 KB">
     484<!ENTITY meson-version "0.58.1">
     485<!ENTITY meson-size "1,852 KB">
    486486<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    487 <!ENTITY meson-md5 "18ac55e3d6a5acb17b5737eb2a15bb5b">
     487<!ENTITY meson-md5 "7e10667e08159a61c4f524b148799ec8">
    488488<!ENTITY meson-home "https://mesonbuild.com">
    489489<!ENTITY meson-fin-du "37 MB">
    … …  
    700700<!ENTITY udev-lfs-home    " ">
    701701
    702 <!ENTITY util-linux-minor "2.36">
    703 <!ENTITY util-linux-version "2.36.2"> <!-- 2.33.x -->
    704 <!ENTITY util-linux-size "5,223 KB">
     702<!ENTITY util-linux-minor "2.37">
     703<!ENTITY util-linux-version "2.37"> <!-- 2.33.x -->
     704<!ENTITY util-linux-size "5,390 KB">
    705705<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
    706 <!ENTITY util-linux-md5 "f78419af679ac9678190ad961eb3cf27">
     706<!ENTITY util-linux-md5 "75eb0a648098332d4042f1646eca4069">
    707707<!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
     708<!ENTITY util-linux-man-url "&anduin-sources;/util-linux-man-pages-&util-linux-version;.tar.xz">
     709<!ENTITY util-linux-man-md5 "882fdfd411f2a8d9fdf6635458539ff4">
     710<!ENTITY util-linux-man-size "149 KB">
    708711<!ENTITY util-linux-tmp-du "134 MB">
    709712<!ENTITY util-linux-tmp-sbu "0.7 SBU">
    … …  
    711714<!ENTITY util-linux-fin-sbu "1.1 SBU">
    712715
    713 <!ENTITY vim-version "8.2.2890">
     716<!ENTITY vim-version "8.2.3001">
    714717<!ENTITY vim-majmin "82">
    715718<!ENTITY vim-docdir "vim/vim82">
    716 <!ENTITY vim-size "15,153 KB">
     719<!ENTITY vim-size "15,177 KB">
    717720<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
    718721<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
    719 <!ENTITY vim-md5 "ec8a8ec5f67b0ad0edba82cad2354d33">
     722<!ENTITY vim-md5 "895ea89021de539256f767d55fb82960">
    720723<!ENTITY vim-home "https://www.vim.org">
    721724<!ENTITY vim-fin-du "208 MB">
Note: See TracChangeset for help on using the changeset viewer.