Changeset 9382de3


Ignore:
Timestamp:
03/31/2021 10:41:37 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
725ef3b
Parents:
9697135
git-author:
Thomas Trepl <thomas@…> (01/12/2020 08:06:52 AM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:37 AM)
Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11724 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    r9697135 r9382de3  
    404404
    405405        <seglistitem>
    406          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
    407          Patch, Perl, Sed, and Texinfo</seg>
     406         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap,
     407         Make, Patch, Perl, Sed, and Texinfo</seg>
    408408        </seglistitem>
    409409      </segmentedlist>

  • chapter01/changelog.xml

    r9697135 r9382de3  
    4646       -->
    4747    <listitem revision="sysv">
     48      <para>2020-01-09</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[bdubbs] - Update to meson-0.53.0. Fixes
     52          <ulink url="&lfs-ticket-root;4571">#4571</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[bdubbs] - Update to e2fsprogs-1.45.5. Fixes
     56          <ulink url="&lfs-ticket-root;4570">#4570</ulink>.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[bdubbs] - Update to grep-3.4. Fixes
     60          <ulink url="&lfs-ticket-root;4568">#4568</ulink>.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[bdubbs] - Update to libpipeline-1.5.2. Fixes
     64          <ulink url="&lfs-ticket-root;4567">#4567</ulink>.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[bdubbs] - Update to linux-5.4.8. Fixes
     68          <ulink url="&lfs-ticket-root;4566">#4566</ulink>.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[pierre] - Add <filename>/etc/os-release</filename> to
     72          the sysV version, as it is required by some packages in BLFS.</para>
     73        </listitem>
     74      </itemizedlist>
     75    </listitem>
     76
     77    <listitem>
     78      <para>2020-01-06</para>
     79      <itemizedlist>
     80        <listitem>
     81          <para>[pierre] - Update to libcap-2.30. Fixes
     82          <ulink url="&lfs-ticket-root;4569">#4569</ulink>.</para>
     83        </listitem>
     84      </itemizedlist>
     85    </listitem>
     86
     87    <listitem>
     88      <para>2020-01-04</para>
     89      <itemizedlist>
     90        <listitem>
     91          <para>[pierre] - Fix various issues in libcap-2.29, and
     92          update dependencies.</para>
     93        </listitem>
     94      </itemizedlist>
     95    </listitem>
     96
     97    <listitem>
     98      <para>2020-01-01</para>
     99      <itemizedlist>
     100        <listitem>
     101          <para>[bdubbs] - Update to libcap-2.29. Fixes
     102          <ulink url="&lfs-ticket-root;4564">#4564</ulink>.</para>
     103        </listitem>
     104      </itemizedlist>
     105    </listitem>
     106
     107    <listitem>
    48108      <para>2019-12-22</para>
    49109      <itemizedlist>

  • chapter01/whatsnew.xml

    r9697135 r9382de3  
    111111      <para>Gperf-&gperf-version;</para>
    112112    </listitem>-->
    113     <!--<listitem>
     113    <listitem>
    114114      <para>Grep-&grep-version;</para>
    115     </listitem>-->
     115    </listitem>
    116116    <!--<listitem>
    117117      <para>Groff-&groff-version;</para>
    … …  
    156156      <para>Libffi-&libffi-version;</para>
    157157   </listitem>
    158    <!--<listitem>
     158   <listitem>
    159159      <para>Libpipeline-&libpipeline-version;</para>
    160    </listitem>-->
     160   </listitem>
    161161    <!--<listitem>
    162162      <para>Libtool-&libtool-version;</para>

  • chapter06/libcap.xml

    r9697135 r9382de3  
    4646    <para>Prevent a static library from being installed:</para>
    4747
    48 <screen><userinput remap="pre">sed -i '/install.*STALIBNAME/d' libcap/Makefile</userinput></screen>
     48<screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
    4949
    5050    <para>Compile the package:</para>
    5151
    52 <screen><userinput remap="make">make</userinput></screen>
    53 
    54     <para>This package does not come with a test suite.</para>
    55 
    56     <para>Install the package:</para>
    57 
    58 <screen><userinput remap="install">make RAISE_SETFCAP=no lib=lib prefix=/usr install
    59 chmod -v 755 /usr/lib/libcap.so.&libcap-version;</userinput></screen>
     52<screen><userinput remap="make">make lib=lib</userinput></screen>
    6053
    6154    <variablelist>
    … …  
    6356
    6457      <varlistentry>
    65         <term><parameter>RAISE_SETFCAP=no</parameter></term>
    66         <listitem>
    67           <para>This parameter skips trying to use <command>setcap</command>
    68           on itself. This avoids an installation error if the kernel or file
    69           system does not support extended capabilities.</para>
    70         </listitem>
    71       </varlistentry>
    72 
    73       <varlistentry>
    7458        <term><parameter>lib=lib</parameter></term>
    7559        <listitem>
    76           <para>This parameter installs the library in
    77           <filename>$prefix/lib</filename> rather than
    78           <filename>$prefix/lib64</filename> on x86_64. It has no effect on
     60          <para>This parameter sets the library directory to
     61          <filename>/lib</filename> rather than
     62          <filename>/lib64</filename> on x86_64. It has no effect on
    7963          x86.</para>
    8064        </listitem>
    8165      </varlistentry>
    82  
    8366    </variablelist>
    8467
    85     <para>The shared library needs to be moved to
    86     <filename class="directory">/lib</filename>, and as a result the
    87     <filename class="extension">.so</filename> file in
    88     <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
    89 
    90 <screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
    91 ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput></screen>
     68    <para>To test the results, issue:</para>
     69
     70<screen><userinput remap="test">make test</userinput></screen>
     71
     72    <para>Install the package:</para>
     73
     74<screen><userinput remap="install">make lib=lib install
     75chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
    9276
    9377  </sect2>
    … …  
    140124      <seglistitem>
    141125        <seg>capsh, getcap, getpcaps, and setcap</seg>
    142         <seg>libcap.so</seg>
     126        <seg>libcap.so and libpsx.a</seg>
    143127      </seglistitem>
    144128    </segmentedlist>
    … …  
    200184      </varlistentry>
    201185
     186      <varlistentry id="libpsx">
     187        <term><filename class="libraryfile">libpsx</filename></term>
     188        <listitem>
     189          <para>Contains functions to support POSIX semantics for syscalls
     190          associated with the pthread library</para>
     191          <indexterm zone="ch-system-libcap libpsx">
     192            <primary sortas="c-libpsx">libpsx</primary>
     193          </indexterm>
     194        </listitem>
     195      </varlistentry>
     196
    202197    </variablelist>
    203198

  • chapter06/meson.xml

    r9697135 r9382de3  
    4040  <sect2 role="installation">
    4141    <title>Installation of Meson</title>
    42 
     42<!--
    4343    <para>Apply a fix from upstream to fix a regression:</para>
    4444
    4545<screen><userinput remap="pre">sed -i "s@isfile(a)@&amp; and not a.startswith('/dev')@" mesonbuild/interpreter.py</userinput></screen>
    46 
     46-->
    4747    <para>Compile Meson with the following command:</para>
    4848

  • chapter06/systemd.xml

    r9697135 r9382de3  
    5252
    5353    <para>Because we have not yet installed the final version of Util-Linux,
    54     create links to the libraries in the approprite location:</para>
     54    create links to the libraries in the appropriate location:</para>
    5555
    5656<screen><userinput remap="pre">for file in /tools/lib/lib{blkid,mount,uuid}.so*; do

  • general.ent

    r9697135 r9382de3  
    1 <!ENTITY version         "SVN-20191222">
     1<!ENTITY version         "SVN-20200109">
    22<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    33                                      Change to x.y for release but not -rc releases -->
    44<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    55
    6 <!ENTITY versiond        "20191222-systemd">
     6<!ENTITY versiond        "20200109-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "December 22nd, 2019">
     10<!ENTITY releasedate     "January 9th, 2020">
    1111
    12 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
     12<!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
    1313<!ENTITY milestone       "9.0">
    1414

  • packages.ent

    r9697135 r9382de3  
    1111<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz">
    1212<!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
    13 <!ENTITY acl-home " ">
     13<!ENTITY acl-home "&savannah-nongnu;/projects/acl">
    1414<!ENTITY acl-ch6-du "6.4 MB">
    1515<!ENTITY acl-ch6-sbu "0.1 SBU">
    … …  
    145145<!ENTITY diffutils-ch6-sbu "0.4 SBU">
    146146
    147 <!ENTITY e2fsprogs-version "1.45.4">
    148 <!ENTITY e2fsprogs-size "7,746 KB">
     147<!ENTITY e2fsprogs-version "1.45.5">
     148<!ENTITY e2fsprogs-size "7,753 KB">
    149149<!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
    150 <!ENTITY e2fsprogs-md5 "2c2f9d4bcd0be54b3b3b8d5feec7b0ff">
     150<!ENTITY e2fsprogs-md5 "6d35428e4ce960cb7e875afe5849c0f3">
    151151<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
    152152<!ENTITY e2fsprogs-ch6-du "108 MB">
    … …  
    290290<!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
    291291
    292 <!ENTITY grep-version "3.3">
    293 <!ENTITY grep-size "1,440 KB">
     292<!ENTITY grep-version "3.4">
     293<!ENTITY grep-size "1,520 KB">
    294294<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
    295 <!ENTITY grep-md5 "05d0718a1b7cc706a4bdf8115363f1ed">
     295<!ENTITY grep-md5 "111b117d22d6a7d049d6ae7505e9c4d2">
    296296<!ENTITY grep-home "&gnu-software;grep/">
    297297<!ENTITY grep-ch5-du "24 MB">
    … …  
    398398<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
    399399
    400 <!ENTITY libcap-version "2.28">
    401 <!ENTITY libcap-size "93 KB">
     400<!ENTITY libcap-version "2.30">
     401<!ENTITY libcap-size "96 KB">
    402402<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
    403 <!ENTITY libcap-md5 "4066ddca53fb7e146f98372c8e43afc4">
     403<!ENTITY libcap-md5 "ea531f37a30a61dce8bf8544537a46e3">
    404404<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
    405 <!ENTITY libcap-ch6-du "1.5 MB">
     405<!ENTITY libcap-ch6-du "8.5 MB">
    406406<!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
    407407
    … …  
    414414<!ENTITY libffi-ch6-sbu "0.4 SBU">
    415415
    416 <!ENTITY libpipeline-version "1.5.1">
    417 <!ENTITY libpipeline-size "965 KB">
     416<!ENTITY libpipeline-version "1.5.2">
     417<!ENTITY libpipeline-size "971 KB">
    418418<!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
    419 <!ENTITY libpipeline-md5 "4c8fe6cd85422baafd6e060f896c61bc">
     419<!ENTITY libpipeline-md5 "169de4cc1f6f7f7d430a5bed858b2fd3">
    420420<!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
    421421<!ENTITY libpipeline-ch6-du "9.0 MB">
    … …  
    432432<!ENTITY linux-major-version "5">
    433433<!ENTITY linux-minor-version "4">
    434 <!ENTITY linux-patch-version "6">
     434<!ENTITY linux-patch-version "8">
    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 "106,889 KB">
     437<!ENTITY linux-size "106,892 KB">
    438438<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    439 <!ENTITY linux-md5 "d77c45902ea8cdbbffed46ae92ae5ec8">
     439<!ENTITY linux-md5 "2f44c832e1d59ebe766731f9c215aca6">
    440440<!ENTITY linux-home "https://www.kernel.org/">
    441441<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
    … …  
    494494<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
    495495
    496 <!ENTITY meson-version "0.52.1">
    497 <!ENTITY meson-size "1,473 KB">
     496<!ENTITY meson-version "0.53.0">
     497<!ENTITY meson-size "1,512 KB">
    498498<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    499 <!ENTITY meson-md5 "a5f0c99567d772508f649a28ded7f8ad">
     499<!ENTITY meson-md5 "3a0313d040ded973d84cbec368c2e1d3">
    500500<!ENTITY meson-home "https://mesonbuild.com">
    501501<!ENTITY meson-ch6-du "28 MB">
    … …  
    601601<!ENTITY python-ch6-du "399 MB">
    602602<!ENTITY python-ch6-sbu "1.3 SBU">
    603 <!ENTITY python-docs-url "https://docs.python.org/3/archives/python-&python-version;-docs-html.tar.bz2">
    604 <!ENTITY python-docs-md5 "f0a1899d5cecee5a3ba507878040bd86">
    605 <!ENTITY python-docs-size "6,429 KB">
     603<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
     604<!ENTITY python-docs-md5 "edc8c97f9680373fcc1dd952f0ea7fcc">
     605<!ENTITY python-docs-size "6,374 KB">
    606606
    607607<!ENTITY readline-version "8.0">
Note: See TracChangeset for help on using the changeset viewer.