Changeset 81ef690


Ignore:
Timestamp:
03/31/2021 10:41:36 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
3ca4306
Parents:
8b0e0da8
git-author:
Thomas Trepl <thomas@…> (12/09/2019 07:38:51 AM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:36 AM)
Message:

MultiLib: Merge changes from trunk

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

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r8b0e0da8 r81ef690  
    4646       -->
    4747    <listitem revision="sysv">
     48      <para>2019-12-05</para>
     49      <itemizedlist>
     50        <listitem revision="systemd">
     51          <para>[renodr] - Update to systemd-244. Fixes
     52          <ulink url="&lfs-ticket-root;4554">#4554</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[renodr] - Update to bc-2.4.0. Fixes
     56          <ulink url="&lfs-ticket-root;4556">#4556</ulink>.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[renodr] - Update to shadow-4.8. Fixes
     60          <ulink url="&lfs-ticket-root;4557">#4557</ulink>.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[renodr] - Update to linux-5.4.2. Fixes
     64          <ulink url="&lfs-ticket-root;4558">#4558</ulink>.</para>
     65        </listitem>
     66      </itemizedlist>
     67    </listitem>
     68
     69    <listitem revision="sysv">
    4870      <para>2019-12-02</para>
    4971      <itemizedlist>
    … …  
    5779    </listitem>
    5880
    59     <listitem revision="sysv">
     81    <listitem>
    6082      <para>2019-12-01</para>
    6183      <itemizedlist>

  • chapter03/patches.xml

    r8b0e0da8 r81ef690  
    117117      </listitem>
    118118    </varlistentry>
    119 
     119<!--
    120120    <varlistentry revision="systemd">
    121121      <term>Systemd Consolidated Patch - <token>&systemd-consolidated-patch-size;</token>:</term>
    … …  
    125125      </listitem>
    126126    </varlistentry>
    127 
     127-->
    128128  </variablelist>
    129129

  • chapter06/shadow.xml

    r8b0e0da8 r81ef690  
    5151
    5252    <para>Disable the installation of the <command>groups</command> program
    53     and its man pages, as Coreutils provides a better version. Also 
    54     Prevent the installation of manual pages that were already installed in
     53    and its man pages, as Coreutils provides a better version. Also,
     54    prevent the installation of manual pages that were already installed in
    5555    <xref linkend="ch-system-man-pages"/>:</para>
    5656
    … …  
    108108
    109109<screen><userinput remap="install">make install</userinput></screen>
    110 
     110    <!--
    111111    <para>Move a misplaced program to its proper location:</para>
    112112
    113113<screen><userinput remap="install">mv -v /usr/bin/passwd /bin</userinput></screen>
     114    -->
    114115
    115116    <!-- <para>Move Shadow's libraries to more appropriate locations:</para>

  • chapter06/systemd.xml

    r8b0e0da8 r81ef690  
    4040  <sect2 role="installation">
    4141    <title>Installation of systemd</title>
    42 
     42<!--
    4343    <para>First, apply a patch to fix various bugs since the release
    4444    of systemd-243.</para>
    4545
    4646<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-2.patch</userinput></screen>
     47-->
    4748
    4849    <para>Create a symlink to work around missing xsltproc:</para>
    … …  
    6970    rules:</para>
    7071
    71 <screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules/50-udev-default.rules.in</userinput></screen>
     72<screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules.d/50-udev-default.rules.in</userinput></screen>
    7273
    7374    <para>Prepare systemd for compilation:</para>

  • general.ent

    r8b0e0da8 r81ef690  
    1 <!ENTITY version         "SVN-20191201">
     1<!ENTITY version         "SVN-20191205">
    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        "20191201-systemd">
     6<!ENTITY versiond        "20191205-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "December 1st, 2019">
     10<!ENTITY releasedate     "December 5th, 2019">
    1111
    1212<!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->

  • packages.ent

    r8b0e0da8 r81ef690  
    5151<!ENTITY bash-ch6-sbu "2.1 SBU">
    5252
    53 <!ENTITY bc-version "2.3.2">
    54 <!ENTITY bc-size "242 KB">
     53<!ENTITY bc-version "2.4.0">
     54<!ENTITY bc-size "244 KB">
    5555<!ENTITY bc-url "https://github.com/gavinhoward/bc/archive/&bc-version;/bc-&bc-version;.tar.gz">
    56 <!ENTITY bc-md5 "89e9063e852b3f84b010b836f815f88f">
     56<!ENTITY bc-md5 "7cd18d7658216df1340beecbb5bfa610">
    5757<!ENTITY bc-home "https://github.com/gavinhoward/bc">
    58 <!ENTITY bc-ch6-du "2.8 MB">
     58<!ENTITY bc-ch6-du "2.9 MB">
    5959<!ENTITY bc-ch6-sbu "0.1 SBU">
    6060
    … …  
    431431<!ENTITY linux-major-version "5">
    432432<!ENTITY linux-minor-version "4">
    433 <!ENTITY linux-patch-version "1">
     433<!ENTITY linux-patch-version "2">
    434434<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    435435<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    436 <!ENTITY linux-size "106,871 KB">
     436<!ENTITY linux-size "106,884 KB">
    437437<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    438 <!ENTITY linux-md5 "1e62d81b5da8df7c45f6ca159edeeb17">
     438<!ENTITY linux-md5 "07a4df090466eb7b24eec5fe4fbd5500">
    439439<!ENTITY linux-home "https://www.kernel.org/">
    440440<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
    … …  
    622622<!ENTITY sed-ch6-sbu "0.4 SBU">
    623623
    624 <!ENTITY shadow-version "4.7">
    625 <!ENTITY shadow-size "1,587 KB">
     624<!ENTITY shadow-version "4.8">
     625<!ENTITY shadow-size "1,572 KB">
    626626<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
    627 <!ENTITY shadow-md5 "f7ce18c8dfd05f1a009266cb604d58b7">
     627<!ENTITY shadow-md5 "723ebb19b06e2f52d9ed7f0653483851">
    628628<!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/">
    629629<!ENTITY shadow-ch6-du "46 MB">
    … …  
    638638<!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
    639639
    640 <!ENTITY systemd-version  "243">
     640<!ENTITY systemd-version  "244">
    641641<!--<!ENTITY systemd-stable   "6b4878d">-->
    642642<!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
    643643     change that is incompatible, we will switch to the backport branch until the next stable release. -->
    644 <!ENTITY systemd-size     "8,052 KB">
     644<!ENTITY systemd-size     "8,252 KB">
    645645<!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
    646646<!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
    647 <!ENTITY systemd-md5      "ca2403fa7dff73afd2e896b4cb25021b">
     647<!ENTITY systemd-md5      "413121fe918b252ae62310f6fc7c4b32">
    648648<!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
    649 <!ENTITY systemd-man-size "504 KB">
     649<!ENTITY systemd-man-size "508 KB">
    650650<!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
    651651<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
    652 <!ENTITY systemd-man-md5  "22278b3c8fa27323b5baafffb093f0f0">
     652<!ENTITY systemd-man-md5  "1839ad557eb376d22853cac54d00de77">
    653653<!ENTITY systemd-ch6-du   "228 MB">
    654654<!ENTITY systemd-ch6-sbu  "1.8 SBU">

  • patches.ent

    r8b0e0da8 r81ef690  
    5858<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
    5959
     60<!-- Use if there is a need to create another consolidated patch.
     61     So far, with 244, all is quiet.
    6062<!ENTITY systemd-consolidated-patch "systemd-&systemd-version;-consolidated_fixes-2.patch">
    6163<!ENTITY systemd-consolidated-patch-md5 "2bad2992f4373eb925885f2ea2fb8d14">
    6264<!ENTITY systemd-consolidated-patch-size "64 KB">
    63 
     65-->
Note: See TracChangeset for help on using the changeset viewer.