Changeset a07a34d


Ignore:
Timestamp:
04/21/2020 01:41:01 PM (4 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
0ce8c18
Parents:
bd67f69
Message:

MultiLib: Merge changes from trunk

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

Files:
1 added
17 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    rbd67f69 ra07a34d  
    4646    -->
    4747    <listitem>
     48      <para>2020-04-20</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[pierre] - Change -isystem to -idirafter in "Adjusting the
     52          toolchain". This allows to search g++ private headers before
     53          the public ones, which is the normal search order, with the
     54          drawback that it includes the headers in /tools if they exist
     55          in both /usr and /tools. Fix most of
     56          <ulink url="&lfs-ticket-root;4641">#4641</ulink>.</para>
     57        </listitem>
     58      </itemizedlist>
     59    </listitem>
     60
     61    <listitem>
     62      <para>2020-04-19</para>
     63      <itemizedlist>
     64        <listitem>
     65          <para>[pierre] - Build util-linux in chapter 5 for both books.
     66          link util-linux libraries and headers from /usr to /tools.
     67          Copy util-linux pkg-config files from /tools to /usr, changing
     68          any occurence of /tools to /usr. Also move eudev before util-linux.
     69          Fixes <ulink url="&lfs-ticket-root;4637">#4637</ulink>,
     70          <ulink url="&lfs-ticket-root;4638">#4638</ulink>, and
     71          <ulink url="&lfs-ticket-root;4642">#4642</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[pierre] - Reinstate flex in chapter 5, so that ar and ranlib
     75          (binutils) link against libfl. This allows to run tests for bison,
     76          too. Fixes
     77          <ulink url="&lfs-ticket-root;4631">#4631</ulink>.</para>
     78        </listitem>
     79        <listitem>
     80          <para>[pierre] - Prevent readline.pc from referencing termcap as
     81          a private library by adding --with-curses to configure switches.
     82          Fixes <ulink url="&lfs-ticket-root;4635">#4635</ulink>.</para>
     83        </listitem>
     84        <listitem>
     85          <para>[pierre] - Allow bison to use the libtextstyle.so library from
     86          gettext, by moving gettext before bison. Fixes
     87          <ulink url="&lfs-ticket-root;4634">#4634</ulink>.</para>
     88        </listitem>
     89        <listitem>
     90          <para>[pierre] - Allow some shadow programs to use "setcap" by
     91          moving libcap before shadow. Fixes
     92          <ulink url="&lfs-ticket-root;4633">#4633</ulink>.</para>
     93        </listitem>
     94        <listitem>
     95          <para>[pierre] - Fix a wrong hardcoded path in some programs
     96          from the shadow package. Fixes
     97          <ulink url="&lfs-ticket-root;4632">#4632</ulink>.</para>
     98        </listitem>
     99      </itemizedlist>
     100    </listitem>
     101
     102    <listitem>
    48103      <para>2020-04-15</para>
    49104      <itemizedlist>

  • chapter05/chapter05.xml

    rbd67f69 ra07a34d  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>

  • chapter05/stripping.xml

    rbd67f69 ra07a34d  
    3939<screen><userinput>rm -rf /tools/{,share}/{info,man,doc}</userinput></screen>
    4040
    41   <para>Remove unneeded files:</para>
     41  <para>The libtool .la files are only useful when linking with static
     42  libraries. They are unneeded, and potentially harmful, when using dynamic
     43  shared libraries, specially when using also non-autotools build systems.
     44  Remove those files now:</para>
    4245
    4346<screen arch="default"><userinput>find /tools/{lib,libexec} -name \*.la -delete</userinput></screen>

  • chapter05/util-linux.xml

    rbd67f69 ra07a34d  
    66]>
    77
    8 <sect1 id="ch-tools-util-linux" role="wrap" revision="systemd">
     8<sect1 id="ch-tools-util-linux" role="wrap">
    99  <?dbhtml filename="util-linux.html"?>
    1010

  • chapter06/adjusting.xml

    rbd67f69 ra07a34d  
    2525ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld</userinput></screen>
    2626
    27   <para>Next, amend the GCC specs file so that it points to the new
    28   dynamic linker. Simply deleting all instances of <quote>/tools</quote> should
    29   leave us with the correct path to the dynamic linker. Also adjust the specs file
    30   so that GCC knows where to find the correct headers and Glibc start files.
     27  <para>the next command amends the GCC specs file to achieve three goals:
     28  first point GCC to the new dynamic linker. Simply deleting all instances of
     29  <quote>/tools</quote> should leave us with the correct path to the dynamic
     30  linker. Second, let GCC know where to find the Glibc start files. Third,
     31  add the /usr/include directory at the end of the default search path, so
     32  that header files added in chapter 6 are found.
    3133  A <command>sed</command> command accomplishes this:</para>
    3234
    3335<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g'                   \
    3436    -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
    35     -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' &gt;      \
     37    -e '/\*cpp:/{n;s@$@ -idirafter /usr/include@}' &gt;      \
    3638    `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
    3739
    … …  
    7375  files:</para>
    7476
    75 <screen><userinput>grep -B1 '^ /usr/include' dummy.log</userinput></screen>
     77<screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
    7678
    7779  <para os="h">This command should return the following output:</para>
    7880
    7981<screen><computeroutput>#include &lt;...&gt; search starts here:
     82 /tools/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
     83 /tools/include
     84 /tools/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include-fixed
    8085 /usr/include</computeroutput></screen>
     86
     87  <note><para>On a 32 bit system, x86_64 is replaced with i686.</para></note>
    8188
    8289  <para os="i">Next, verify that the new linker is being used with the correct search paths:</para>

  • chapter06/bison.xml

    rbd67f69 ra07a34d  
    5959<screen><userinput remap="make">make</userinput></screen>
    6060
    61 <!--
    62     <para>To test the results (about 2.2 SBU), issue:</para>
     61    <para>To test the results (about 5.5 SBU), issue:</para>
    6362
    6463<screen><userinput remap="test">make check</userinput></screen>
    65 -->
    6664
     65    <para>13 tests fail in the "Diagnostics" section, probably because of
     66    missing locales.</para>
     67
     68<!--
    6769    <para>There is a circular dependency between bison and flex with regard to
    6870    the checks.  If desired, after installing flex in the next section, the
    6971    bison package can be rebuilt and the bison checks can be run with
    7072    <command>make check</command>.</para>
     73-->
    7174
    7275    <para>Install the package:</para>

  • chapter06/chapter06.xml

    rbd67f69 ra07a34d  
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
    4141  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
     42  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
    4344  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
    4445  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
    4546  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
    46   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
    4747  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
    4848  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
    4949  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
     50  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
    5051  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
    5152  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
    … …  
    6364  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
    6465  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
    65   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/>
    6767  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
    … …  
    9494  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
    9595
     96  <!-- sysv only -->
     97  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
     98
    9699  <!-- Both sysv on systemd builds -->
    97100  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
    98101  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
    99 
    100   <!-- sysv only -->
    101   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
    102102
    103103  <!-- Both sysv and systemd builds -->

  • chapter06/createfiles.xml

    rbd67f69 ra07a34d  
    4444ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
    4545ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
    46 
    47 ln -sv bash /bin/sh</userinput></screen>
     46ln -sv /tools/lib/libfl.so*                         /usr/lib
     47
     48ln -sv bash /bin/sh
     49for lib in blkid mount uuid fdisk
     50do
     51    ln -sv /tools/lib/lib$lib.so* /usr/lib
     52    sed 's|/tools|/usr|' /tools/lib/pkgconfig/${lib}.pc \
     53        &gt; /usr/lib/pkgconfig/${lib}.pc
     54done
     55for incdir in blkid libmount uuid libfdisk
     56do
     57    ln -svf /tools/include/$incdir    /usr/include
     58done</userinput></screen>
    4859
    4960  <para arch="ml_32,ml_all">32-bit builds also require these links:</para>
    5061
    51 <screen arch="ml_32,ml_all"><userinput arch="ml_32,ml_all">ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
     62<screen arch="ml_32,ml_all"><userinput>ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
    5263ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32</userinput></screen>
    5364
    5465  <para arch="ml_x32,ml_all">x32-bit builds also require these links:</para>
    5566
    56 <screen arch="ml_x32,ml_all"><userinput arch="ml_x32,ml_all">ln -sv /tools/libx32/libgcc_s.so{,.1}              /usr/libx32
     67<screen arch="ml_x32,ml_all"><userinput>ln -sv /tools/libx32/libgcc_s.so{,.1}              /usr/libx32
    5768ln -sv /tools/libx32/libstdc++.{a,so{,.6}}         /usr/libx32
    5869ln -sv /usr/libx32 /</userinput></screen>
    5970
    60 <!--for lib in blkid lzma mount uuid
    61 do
    62     ln -sv /tools/lib/lib$lib.so* /usr/lib
    63 done-->
    64 <!--ln -svf /tools/include/blkid    /usr/include
    65 ln -svf /tools/include/libmount /usr/include
    66 ln -svf /tools/include/uuid     /usr/include-->
    67 <!--for pc in blkid mount uuid
    68 do
    69     sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \
    70         > /usr/lib/pkgconfig/${pc}.pc
    71 done-->
    7271  <variablelist>
    7372    <title>The purpose of each link:</title>
    … …  
    176175      </listitem>
    177176    </varlistentry>
    178 <!--
    179     <varlistentry>
    180       <term><parameter><filename>/usr/lib/libstdc++.la</filename></parameter></term>
    181       <listitem>
    182         <para>This prevents a <filename class="directory">/tools</filename>
    183         reference that would otherwise be in
    184         <filename>/usr/lib/libstdc++.la</filename> after GCC is installed.</para>
    185       </listitem>
    186     </varlistentry>
    187 -->
    188     <!--<varlistentry revision="systemd">-->
    189 <!--    <varlistentry>
    190       <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
    191       <listitem>
    192         <para>These links prevent utilities from acquiring an
    193         unnecessary reference to the
    194         <filename class="directory">/tools</filename> directory.</para>
    195       </listitem>
    196     </varlistentry>-->
    197177
    198178    <varlistentry>
    … …  
    200180      <listitem>
    201181        <para>Many shell scripts hard-code <filename>/bin/sh</filename>.</para>
     182      </listitem>
     183    </varlistentry>
     184
     185    <varlistentry>
     186      <term>
     187        <parameter><filename>/usr/lib/libfl.so*</filename></parameter>
     188      </term>
     189      <listitem>
     190        <para>This link allows binutils to find the flex library, and to
     191        build enhanced versions of ar and ranlib.</para>
     192      </listitem>
     193    </varlistentry>
     194
     195    <varlistentry>
     196      <term>
     197        <parameter>
     198          <filename>/usr/lib/lib{blkid,fdisk,mount,uuid}.so*</filename>,
     199          <filename>/usr/include/{blkid,libfdisk,libmount,uuid}</filename>,
     200          <filename>/usr/lib/pkgconfig/{blkid,fdisk,mount,uuid}.pc</filename>
     201        </parameter>
     202      </term>
     203      <listitem>
     204        <para>These links and files allow
     205        <phrase revision="sysv">eudev</phrase>
     206        <phrase revision="systemd">systemd</phrase> to find the
     207        util-linux libraries installed in chapter 5, without creating
     208        wrong references to /tools. The uuid library is also needed for
     209        building a python module.</para>
    202210      </listitem>
    203211    </varlistentry>

  • chapter06/eudev.xml

    rbd67f69 ra07a34d  
    5050<screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
    5151-->
    52 <!--
    53     <para>First, add a workaround to prevent the /tools directory from being
    54     hard coded into Eudev binary files library locations:</para>
    55 
    56 <screen><userinput remap="pre">cat &gt; config.cache &lt;&lt; "EOF"
    57 HAVE_BLKID=1
    58 BLKID_LIBS="-lblkid"
    59 BLKID_CFLAGS="-I/tools/include"
    60 EOF</userinput></screen>
    61 -->
    62 <para>Prepare Eudev for compilation:</para>
     52
     53    <para>Prepare Eudev for compilation:</para>
    6354
    6455<screen><userinput remap="configure">./configure --prefix=/usr           \
    … …  
    7263            --enable-manpages       \
    7364            --disable-static</userinput></screen>
    74 <!--           - -config-cache</userinput></screen> -->
    75 
    76 <para>Compile the package:</para>
     65
     66    <para>Compile the package:</para>
    7767
    7868<screen><userinput remap="make">make</userinput></screen>
    79 <!--
    80 <screen><userinput remap="make">LIBRARY_PATH=/tools/lib make</userinput></screen>
    81 
    82 <note><para>The LIBRARY_PATH variable here and the LD_LIBRARY_PATH variable
    83 below are needed to allow the use of libraries that were installed in /tools,
    84 but have not yet been installed in the main system.  LIBRARY_PATH is
    85 used to find libraries during the linking process.  LD_LIBRARY_PATH is
    86 used to find libraries during program execution.</para></note>
    87 -->
    88 <para>Create some directories now that are needed for tests, but
    89 will also be used as a part of installation:</para>
     69
     70    <para>Create some directories now that are needed for tests, but
     71    will also be used as a part of installation:</para>
    9072
    9173<screen><userinput remap="test">mkdir -pv /lib/udev/rules.d
    9274mkdir -pv /etc/udev/rules.d</userinput></screen>
    9375
    94 <para>To test the results, issue:</para>
     76    <para>To test the results, issue:</para>
    9577
    9678<screen><userinput remap="test">make check</userinput></screen>
    97 <!--<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
    9879
    9980    <para>Install the package:</para>
    10081
    10182<screen><userinput remap="install">make install</userinput></screen>
    102 <!--<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>-->
    10383
    10484    <para>Install some custom rules and support files useful in an LFS
    … …  
    202182    initial database:</para>
    203183
    204 <!--<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb - -update</userinput></screen>-->
    205184<screen><userinput>udevadm hwdb --update</userinput></screen>
    206185

  • chapter06/gettext.xml

    rbd67f69 ra07a34d  
    7777    <para>Compile the package:</para>
    7878
    79 <screen><userinput remap="make">make</userinput></screen>
     79<screen><userinput remap="make">make BISON_LOCALEDIR=/usr/share/locale</userinput></screen>
     80
     81   <variablelist>
     82      <title>The meaning of the make parameter:</title>
     83
     84      <varlistentry>
     85        <term><parameter>BISON_LOCALEDIR=/usr/share/locale</parameter></term>
     86        <listitem>
     87          <para>Since bison is not yet installed in /usr, configure hardcodes
     88          the directory containing translations for the bison program (the
     89          "locale" directory) as /tools/share/locale. Passing this variable
     90           to make allows overriding the choice made by configure.</para>
     91        </listitem>
     92      </varlistentry>
     93
     94    </variablelist>
    8095
    8196    <para>To test the results (this takes a long time, around 3 SBUs),

  • chapter06/readline.xml

    rbd67f69 ra07a34d  
    5454<screen><userinput remap="configure">./configure --prefix=/usr    \
    5555            --disable-static \
     56            --with-curses    \
    5657            --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
     58
     59     <variablelist>
     60      <title>The meaning of the configure option:</title>
     61
     62      <varlistentry>
     63        <term><parameter>--with-curses"</parameter></term>
     64        <listitem>
     65          <para>This option tells Readline that it can find the termcap
     66           library functions in the curses library, rather than a separate
     67           termcap library. It allows generating a correct
     68           <filename>readline.pc</filename> file.</para>
     69        </listitem>
     70      </varlistentry>
     71
     72    </variablelist>
    5773
    5874    <para>Compile the package:</para>

  • chapter06/revisedchroot.xml

    rbd67f69 ra07a34d  
    6060  <para>There are also several files installed in the /usr/lib and /usr/libexec
    6161  directories with a file name extention of .la. These are "libtool archive"
    62   files and generally unneeded on a linux system. None of these are necessary
    63   at this point. To remove them, run:</para>
     62  files. As already said, they are only useful when linking with static
     63  libraries. They are unneeded, and potentially harmful, when using dynamic
     64  shared libraries, specially when using also non-autotools build systems.
     65  To remove them, run:</para>
    6466
    6567  <screen arch="default"><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>

  • chapter06/shadow.xml

    rbd67f69 ra07a34d  
    8484    <para>Prepare Shadow for compilation:</para>
    8585
    86 <screen><userinput remap="configure">./configure --sysconfdir=/etc --with-group-name-max-length=32</userinput></screen>
     86<screen><userinput remap="configure">touch /usr/bin/passwd
     87./configure --sysconfdir=/etc --with-group-name-max-length=32</userinput></screen>
    8788
    8889    <variablelist>
    8990      <title>The meaning of the configure option:</title>
    9091
     92      <varlistentry>
     93        <term><command>touch /usr/bin/passwd</command></term>
     94        <listitem>
     95          <para>The file <filename>/usr/bin/passwd</filename> needs
     96          to exist because its location is harcoded in some programs, and
     97          the default location if it does not exist is not right.</para>
     98        </listitem>
     99      </varlistentry>
    91100      <varlistentry>
    92101        <term><parameter>--with-group-name-max-length=32</parameter></term>

  • chapter06/systemd.xml

    rbd67f69 ra07a34d  
    5151<screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
    5252
    53     <para>Because we have not yet installed the final version of Util-Linux,
    54     create links to the libraries in the appropriate location:</para>
    55 
    56 <screen><userinput remap="pre">for file in /tools/lib/lib{blkid,mount,uuid}.so*; do
    57     ln -sf $file /usr/lib/
    58 done</userinput></screen>
    59 
    6053    <para>Set up the man pages:</para>
    6154
    … …  
    7770cd       build
    7871
    79 PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib/pkgconfig" \
    8072LANG=en_US.UTF-8                   \
    8173meson --prefix=/usr                \
    … …  
    235227<screen><userinput remap="adjust">rm -f /usr/lib/sysctl.d/50-pid-max.conf</userinput></screen>
    236228
    237     <para>Cleanup symbolic links to Util-Linux libraries:</para>
    238 
    239 <screen><userinput remap="adjust">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>
    240229    <!--
    241230    <para>Prevent systemd from creating <filename>/run/nologin</filename>

  • chapter06/util-linux.xml

    rbd67f69 ra07a34d  
    6161    -i tests/ts/ipcs/limits2</userinput></screen>
    6262-->
    63 <!-- those symlinks are not created anymore
    64     <para revision="systemd">Remove the earlier created symlinks:</para>
    65 
    66 <screen revision="systemd"><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen>
    67 -->
     63
     64    <para>Remove the earlier created symlinks and files:</para>
     65
     66<screen><userinput remap="pre">rm -vf /usr/include/{blkid,libfdisk,libmount,uuid}
     67rm -vf /usr/lib/lib{blkid,fdisk,mount,uuid}.so*
     68rm -vf /usr/lib/pkgconfig/{blkid,fdisk,mount,uuid}.pc</userinput></screen>
     69
    6870    <para>Prepare Util-linux for compilation:</para>
    6971
    … …  
    111113    be run after rebooting into the completed LFS system and running:</para>
    112114
    113 <screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen> 
     115<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
    114116    </warning>
    115117

  • general.ent

    rbd67f69 ra07a34d  
    1 <!ENTITY version         "SVN-20200415">
     1<!ENTITY version         "SVN-20200420">
    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        "20200415-systemd">
     6<!ENTITY versiond        "20200420-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "April 15th, 2020">
     10<!ENTITY releasedate     "April 20th, 2020">
    1111
    1212<!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->

  • packages.ent

    rbd67f69 ra07a34d  
    7878<!ENTITY bison-ch5-du "43 MB">
    7979<!ENTITY bison-ch5-sbu "0.3 SBU">
    80 <!ENTITY bison-ch6-du "43 MB">
    81 <!ENTITY bison-ch6-sbu "0.3 SBU">
     80<!ENTITY bison-ch6-du "52 MB">
     81<!ENTITY bison-ch6-sbu "5.8 SBU">
    8282
    8383<!ENTITY bzip2-version "1.0.8">
    … …  
    210210<!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
    211211<!ENTITY flex-home "&github;/westes/flex">
     212<!ENTITY flex-ch5-du "15 MB">
     213<!ENTITY flex-ch5-sbu "0.1 SBU">
    212214<!ENTITY flex-ch6-du "36 MB">
    213215<!ENTITY flex-ch6-sbu "0.4 SBU">
Note: See TracChangeset for help on using the changeset viewer.