Changeset 08a6368


Ignore:
Timestamp:
10/15/2021 10:21:18 AM (7 weeks ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
57e2684d
Parents:
0b5f7d87 (diff), fa32551 (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 upstream

Files:
24 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r0b5f7d87 r08a6368  
    11lfs-bootscripts-*.tar.xz
     2conditional.ent
    23version.ent
    34appendices/*.script
  • Makefile

    r0b5f7d87 r08a6368  
    205205
    206206version:
    207         $(Q)./git-version.sh
     207        $(Q)./git-version.sh $(REV)
    208208
    209209#dump-commands: validate
  • chapter01/askforhelp.xml

    r0b5f7d87 r08a6368  
    3939    <itemizedlist>
    4040      <listitem>
    41         <para>The version of the book being used (in this case
    42               <phrase revision="sysv">&version;</phrase>
    43               <phrase revision="systemd">&versiond;</phrase>)
    44               <phrase arch="default" revision="sysv">&version;</phrase>
    45               <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
    46               <phrase arch="default" revision="systemd">&versiond;</phrase>
    47               <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase>)</para>
     41        <para>The version of the book being used (in this case &version;<phrase arch="ml_32,ml_x32,ml_all">-multilib</phrase>)</para>
    4842      </listitem>
    4943      <listitem>
  • chapter01/changelog.xml

    r0b5f7d87 r08a6368  
    1111  <title>Changelog</title>
    1212
    13   <para>This is version
    14         <phrase arch="default" revision="sysv">&version;</phrase>
    15         <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
    16         <phrase arch="default" revision="systemd">&versiond;</phrase>
    17         <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase>
    18   of the Linux From Scratch book, dated
     13  <para>This is version &version;<phrase arch="ml_32,ml_x32,ml_all">&version;-multilib</phrase> of the Linux From Scratch book, dated
    1914  &releasedate;. If this book is more than six months old, a newer and better
    2015  version is probably already available. To find out, please check one of the
     
    4540    appropriate for the entry or if needed the entire day's listitem.
    4641    -->
     42    <listitem>
     43      <para>2021-10-15</para>
     44      <itemizedlist>
     45        <listitem>
     46          <para>[bdubbs] - Update to vim-8.2.3508. Addresses
     47          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
     48        </listitem>
     49        <listitem>
     50          <para>[bdubbs] - Update to tzdata-2021c. Fixes
     51          <ulink url="&lfs-ticket-root;4934">#4934</ulink>.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[bdubbs] - Update to Python-3.10.0. Fixes
     55          <ulink url="&lfs-ticket-root;4938">#4938</ulink>.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[bdubbs] - Update to Jinja2-3.0.2. Fixes
     59          <ulink url="&lfs-ticket-root;4937">#4937</ulink>.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[bdubbs] - Update to linux-5.14.12. Fixes
     63          <ulink url="&lfs-ticket-root;4932">#4932</ulink>.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[bdubbs] - Update to iana-etc-20211004. Fixes
     67          <ulink url="&lfs-ticket-root;4933">#4933</ulink>.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[bdubbs] - Update to bc-5.1.1. Fixes
     71          <ulink url="&lfs-ticket-root;4936">#4936</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[bdubbs] - Update to automake-1.16.5. Fixes
     75          <ulink url="&lfs-ticket-root;4935">#4935</ulink>.</para>
     76        </listitem>
     77      </itemizedlist>
     78    </listitem>
     79
    4780    <listitem>
    4881      <para>2021-10-01</para>
  • chapter01/resources.xml

    r0b5f7d87 r08a6368  
    5858    question is not already answered in the LFS FAQ or the mailing list
    5959    archives. You can find the IRC network at <uri>irc.libera.chat</uri>.
    60     The support channel is named #LFS-support.</para>
     60    The support channel is named #lfs-support.</para>
    6161
    6262  </sect2>
  • chapter01/whatsnew.xml

    r0b5f7d87 r08a6368  
    4040      <para>Autoconf-&autoconf-version;</para>
    4141    </listitem>-->
    42    <!--<listitem>
     42   <listitem>
    4343      <para>Automake-&automake-version;</para>
    44     </listitem>-->
     44    </listitem>
    4545   <!--<listitem>
    4646      <para>Bash &bash-version;</para>
     
    139139      <para>IPRoute2-&iproute2-version;</para>
    140140    </listitem>
    141     <!--<listitem revision="systemd">
     141    <listitem revision="systemd">
    142142      <para>Jinja2-&jinja2-version;</para>
    143     </listitem>-->
     143    </listitem>
    144144    <!--<listitem>
    145145      <para>Kbd-&kbd-version;</para>
  • chapter07/cleanup.xml

    r0b5f7d87 r08a6368  
    131131    </note>
    132132
    133 <screen role="nodump" revision="sysv"><userinput>cd $LFS
     133<screen role="nodump"><userinput>cd $LFS
    134134tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
    135 
    136 <screen role="nodump" revision="systemd"><userinput>cd $LFS
    137 tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
    138135
    139136  </sect2>
     
    161158    your entire host system.  YOU ARE WARNED.</para></warning>
    162159
    163 <screen role="nodump" revision="sysv"><computeroutput>cd $LFS
     160<screen role="nodump"><computeroutput>cd $LFS
    164161rm -rf ./*
    165162tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen>
    166 
    167 <screen role="nodump" revision="systemd"><computeroutput>cd $LFS
    168 rm -rf ./*
    169 tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen>
    170163
    171164    <para>
  • chapter08/automake.xml

    r0b5f7d87 r08a6368  
    5959
    6060<screen><userinput remap="test">make -j4 check</userinput></screen>
    61 <!--
    62     <para>The tests t/subobj.sh, t/deprecated-acinit.sh, and t/init.sh are known to
    63     fail in the LFS environment.</para>
    64 -->
     61
     62    <para>The test t/subobj.sh is known to fail.</para>
     63
    6564    <para>Install the package:</para>
    6665
  • chapter08/gawk.xml

    r0b5f7d87 r08a6368  
    6363    <para>If desired, install the documentation:</para>
    6464
    65 <screen><userinput remap="install">mkdir -v /usr/share/doc/gawk-&gawk-version;
     65<screen><userinput remap="install">mkdir -pv                                  /usr/share/doc/gawk-&gawk-version;
    6666cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
    6767
  • chapter08/iproute2.xml

    r0b5f7d87 r08a6368  
    8080    <para>If desired, install the documentation:</para>
    8181
    82 <screen><userinput remap="install">mkdir -v              /usr/share/doc/iproute2-&iproute2-version;
     82<screen><userinput remap="install">mkdir -pv             /usr/share/doc/iproute2-&iproute2-version;
    8383cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></screen>
    8484
  • chapter08/kbd.xml

    r0b5f7d87 r08a6368  
    9898    <para>If desired, install the documentation:</para>
    9999
    100 <screen><userinput remap="install">mkdir -v            /usr/share/doc/kbd-&kbd-version;
     100<screen><userinput remap="install">mkdir -pv           /usr/share/doc/kbd-&kbd-version;
    101101cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
    102102
  • chapter08/ncurses.xml

    r0b5f7d87 r08a6368  
    125125    <para>If desired, install the Ncurses documentation:</para>
    126126
    127 <screen><userinput remap="install">mkdir -v       /usr/share/doc/ncurses-&ncurses-version;
     127<screen><userinput remap="install">mkdir -pv      /usr/share/doc/ncurses-&ncurses-version;
    128128cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen>
    129129
  • chapter10/grub.xml

    r0b5f7d87 r08a6368  
    136136    <para>Generate <filename>/boot/grub/grub.cfg</filename>:</para>
    137137
    138     <screen revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
     138    <screen><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
    139139<literal># Begin /boot/grub/grub.cfg
    140140set default=0
     
    148148}</literal>
    149149EOF</userinput></screen>
    150 
    151     <screen revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
    152 <literal># Begin /boot/grub/grub.cfg
    153 set default=0
    154 set timeout=5
    155 
    156 insmod ext2
    157 set root=(hd0,2)
    158 
    159 menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" {
    160         linux   /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro
    161 }</literal>
    162 EOF</userinput></screen>
    163 
    164150
    165151    <note><para>From <application>GRUB</application>'s perspective, the
  • chapter10/kernel.xml

    r0b5f7d87 r08a6368  
    259259    following command assumes an x86 architecture:</para>
    260260
    261 <screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
    262 
    263 <screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
     261<screen><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
    264262
    265263    <para><filename>System.map</filename> is a symbol file for the kernel.
     
    370368      <seglistitem>
    371369        <seg>config-&linux-version;,
    372         <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
    373         <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
     370        vmlinuz-&linux-version;-lfs-&version;,
    374371        and System.map-&linux-version;</seg>
    375372        <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
     
    393390
    394391      <varlistentry id="lfskernel">
    395         <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
    396         <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
     392        <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
    397393        <listitem>
    398394          <para>The engine of the Linux system. When turning on the computer,
  • chapter11/reboot.xml

    r0b5f7d87 r08a6368  
    2121  <itemizedlist>
    2222
    23     <listitem><para>A text mode browser such as <ulink revision="sysv"
    24     url='&blfs-book;basicnet/lynx.html'>Lynx</ulink><ulink revision="systemd"
    25     url='&blfs-systemd-book;basicnet/lynx.html'>Lynx</ulink>
     23    <listitem><para>A text mode browser such as <ulink
     24    url='&blfs-book;basicnet/lynx.html'>Lynx</ulink>
    2625    will allow you to easily view the BLFS book in one virtual terminal, while
    2726    building packages in another.</para></listitem>
    2827
    29     <listitem><para>The <ulink revision="sysv"
    30     url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink><ulink revision="systemd"
    31     url='&blfs-systemd-book;postlfs/make-ca.html'>make-ca</ulink> package
     28    <listitem><para>The <ulink
     29    url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink> package
    3230    will allow you to set up local trusted anchor certificates, allowing
    3331    the system to verify SSL certificates provided by remote servers (for
    3432    example, a website using HTTPS).</para></listitem>
    3533
    36     <listitem><para>The <ulink revision="sysv"
    37     url='&blfs-book;general/gpm.html'>GPM</ulink><ulink revision="systemd"
    38     url='&blfs-systemd-book;general/gpm.html'>GPM</ulink> package will allow
     34    <listitem><para>The <ulink
     35    url='&blfs-book;general/gpm.html'>GPM</ulink> package will allow
    3936    you to perform copy/paste actions in your virtual
    4037    terminals.</para></listitem>
     
    4845    useful.</para></listitem>
    4946
    50     <listitem><para>Installing <ulink revision="sysv"
    51     url='&blfs-book;postlfs/sudo.html'>sudo</ulink><ulink revision="systemd"
    52     url='&blfs-systemd-book;postlfs/sudo.html'>sudo</ulink> may be useful for
     47    <listitem><para>Installing <ulink
     48    url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
    5349    building packages as a non-root user and easily installing the resulting
    5450    packages in your new system.</para></listitem>
    5551
    5652    <listitem><para>If you want to access your new system from a remote system
    57     within a comfortable GUI environment, install <ulink revision="sysv"
    58     url='&blfs-book;postlfs/openssh.html'>openssh</ulink><ulink revision="systemd"
    59     url='&blfs-systemd-book;postlfs/openssh.html'>openssh</ulink>.
    60     </para></listitem>
     53    within a comfortable GUI environment, install <ulink
     54    url='&blfs-book;postlfs/openssh.html'>openssh</ulink>.</para></listitem>
    6155
    6256    <listitem><para>To make fetching files over the internet easier, install
    63     <ulink
    64     revision="sysv" url='&blfs-book;basicnet/wget.html'>wget</ulink><ulink
    65     revision="systemd" url='&blfs-systemd-book;basicnet/wget.html'>wget</ulink>.
    66     </para></listitem>
     57    <ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.</para></listitem>
    6758
    6859    <listitem><para>To connect to a wireless access point for networking,
    69     install <ulink revision="sysv"
    70     url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink><ulink
    71     revision="systemd"
    72     url='&blfs-systemd-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
     60    install <ulink
     61    url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
    7362    </para></listitem>
    7463
  • chapter11/theend.xml

    r0b5f7d87 r08a6368  
    3232  running:</para>
    3333
    34 <screen revision="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
     34<screen><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
    3535
    36 <screen revision="systemd"><userinput>echo &versiond; &gt; /etc/lfs-release</userinput></screen>
    37 
    38   <para>Two files describing the installed system may be used by packages
    39   that can be installed on the system later, either in binary form or by building
     36  <para>Two files describing the installed system may be used by packages that
     37  can be installed on the system later, either in binary form or by building
    4038  them.</para>
    4139
     
    4442  this file, run:</para>
    4543
    46 <screen revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
     44<screen><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
    4745DISTRIB_ID="Linux From Scratch"
    4846DISTRIB_RELEASE="&version;"
    49 DISTRIB_CODENAME="&lt;your name here&gt;"
    50 DISTRIB_DESCRIPTION="Linux From Scratch"
    51 EOF</userinput></screen>
    52 
    53 <screen revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
    54 DISTRIB_ID="Linux From Scratch"
    55 DISTRIB_RELEASE="&versiond;"
    5647DISTRIB_CODENAME="&lt;your name here&gt;"
    5748DISTRIB_DESCRIPTION="Linux From Scratch"
     
    6253  this file, run:</para>
    6354
    64 <screen revision="sysv"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
     55<screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
    6556NAME="Linux From Scratch"
    6657VERSION="&version;"
    6758ID=lfs
    6859PRETTY_NAME="Linux From Scratch &version;"
    69 VERSION_CODENAME="&lt;your name here&gt;"
    70 EOF</userinput></screen>
    71 
    72 <screen revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
    73 NAME="Linux From Scratch"
    74 VERSION="&versiond;"
    75 ID=lfs
    76 PRETTY_NAME="Linux From Scratch &versiond;"
    7760VERSION_CODENAME="&lt;your name here&gt;"
    7861EOF</userinput></screen>
  • chapter11/whatnow.xml

    r0b5f7d87 r08a6368  
    5858      <para>The Beyond Linux From Scratch book covers installation
    5959      procedures for a wide range of software beyond the scope of the LFS
    60       Book. The BLFS project is located at <ulink revision="sysv"
    61       url="&blfs-book;"/><ulink revision="systemd" url="&blfs-systemd-book;"/>.
     60      Book. The BLFS project is located at <ulink url="&blfs-book;"/>.
    6261      </para>
    6362    </listitem>
  • general.ent

    r0b5f7d87 r08a6368  
    1 <!-- version info automatically generated by git
    2      comment the following two lines for release -->
     1<!-- Editing  up to the line of ==== should be enough
     2     to generate a book for development, release, or rc-->
     3<!ENTITY % development "INCLUDE"><!-- set to INCLUDE for development,
     4                                      set to IGNORE for release or rc -->
     5<!ENTITY % release     "IGNORE"> <!-- set to INCLUDE for release,
     6                                      set to IGNORE for development or rc -->
     7<!ENTITY % rc          "IGNORE"> <!-- set to INCLUDE for rc,
     8                                      set to IGNORE for development or
     9                                       release -->
     10<!ENTITY % relnum "11.1"><!-- must be given for release or rc -->
     11<!ENTITY % reldate "March 1st, 2022"><!-- must ve given for release or rc -->
     12<!ENTITY % crdate "1999-2022"><!-- must ve given for release or rc -->
     13<!ENTITY % rcnum  "2"><!-- must be given only for rc -->
     14<!-- ================================================================== -->
     15<!-- Do not change anything below unless the www or book layouts change -->
     16
     17<!-- Automatically generated by git-version.sh. Used for release or dev -->
     18<!ENTITY % conditional-entities SYSTEM "conditional.ent">
     19%conditional-entities;
     20
     21<![ %development; [
     22<!-- version info automatically generated by git -->
    323<!ENTITY % version-entities SYSTEM "version.ent">
    424%version-entities;
     25<![ %sysv; [
     26<!ENTITY short-version   "svn">    <!-- Used below in &blfs-book; -->
     27<!ENTITY errata          "&lfs-root;lfs/errata/development/">
     28]]>
     29<![ %systemd; [
     30<!ENTITY short-version  "systemd"> <!-- Used below in &blfs-book; -->
     31<!ENTITY errata          "&lfs-root;lfs/errata/systemd/">
     32]]>
     33<!ENTITY generic-version "development"> <!-- Used below in
     34                                             &patches-root;,
     35                                             &donwloads-root;, and
     36                                             &test-results; -->
     37]]><!-- End %development -->
    538
    6 <!-- uncomment and edit the following four lines
    7      for releases (including -rc) -->
    8 <!--
    9 <!ENTITY version         "10.2-rc1">
    10 <!ENTITY versiond        "10.2-systemd-rc1">
    11 <!ENTITY releasedate     "August 26th, 2021">
    12 <!ENTITY copyrightdate   "1999-2021">
    13 -->
     39<![ %release; [
     40<![ %sysv; [
     41<!ENTITY version         "%relnum;">
     42<!ENTITY short-version   "%relnum;">  <!-- Used below in &blfs-book; -->
     43]]>
     44<![ %systemd; [
     45<!ENTITY version         "%relnum;-systemd">
     46<!ENTITY short-version   "stable-systemd"> <!-- Used below in &blfs-book; -->
     47]]>
     48<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
     49<!ENTITY generic-version "%relnum;"> <!-- Used below in
     50                                          &patches-root;,
     51                                          &donwloads-root;, and
     52                                          &test-results; -->
     53<!ENTITY releasedate     "%reldate;">
     54<!ENTITY copyrightdate   "%crdate;">
     55]]>
    1456
    15 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    16                                       Change to x.y for release but not -rc releases -->
    17 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    18 
    19 <!ENTITY short-versiond  "systemd">  <!--Change to stable-systemd for release  -->
    20 <!ENTITY generic-versiond "systemd">
     57<![ %rc; [
     58<![ %sysv; [
     59<!ENTITY version         "%relnum;-rc%rcnum;">
     60<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
     61]]>
     62<![ %systemd; [
     63<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
     64<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
     65]]>
     66<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
     67<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
     68                                                    &patches-root;,
     69                                                    &downloads-root;, and
     70                                                    &test-results; -->
     71<!ENTITY releasedate     "%reldate;">
     72<!ENTITY copyrightdate   "%crdate;">
     73]]>
    2174
    2275<!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
    2376<!ENTITY blfs-root       "&lfs-root;blfs/">
    2477<!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
    25 <!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
    2678<!ENTITY faq-root        "&lfs-root;faq/">
    2779<!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
    2880<!ENTITY hints-index     "&lfs-root;hints/list.html">
    2981<!ENTITY patches-root    "&lfs-root;patches/lfs/&generic-version;/">
     82<!-- Only used for sysv (lfs-bootscripts): -->
    3083<!ENTITY downloads-root  "&lfs-root;lfs/downloads/&generic-version;/">
    3184<!ENTITY livecd-root     "&lfs-root;livecd/">
    3285<!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
    33 <!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
    3486<!ENTITY secadv          "&lfs-root;lfs/advisories/">
    3587<!ENTITY min-kernel      "3.2">
    36 
     88<!--
    3789<!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
    3890<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
    3991<!ENTITY test-resultsd   "&lfs-root;lfs/build-logs/&generic-versiond;/">
    4092<!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
    41 
     93-->
    4294<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
    4395
  • git-version.sh

    r0b5f7d87 r08a6368  
    11#!/bin/sh
     2
     3if [ "$1" = sysv ]; then
     4        SYSV="INCLUDE"
     5        SYSTEMD="IGNORE "
     6elif [ "$1" = systemd ]; then
     7        SYSV="IGNORE "
     8        SYSTEMD="INCLUDE"
     9else
     10        echo You must provide either \"sysv\" or \"systemd\" as argument
     11        exit 1
     12fi
     13
     14echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
     15echo "<!ENTITY % systemd \"$SYSTEMD\">"  >> conditional.ent
    216
    317if ! git status > /dev/null; then
    418        # Either it's not a git repository, or git is unavaliable.
    519        # Just workaround.
    6         echo "<!ENTITY version           \"unknown\">"         >  version.ent
    7         echo "<!ENTITY versiond          \"unknown-systemd\">" >> version.ent
     20        echo "<![ %sysv; ["                                    >  version.ent
     21        echo "<!ENTITY version           \"unknown\">"         >> version.ent
     22        echo "]]>"                                             >> version.ent
     23        echo "<![ %systemd; ["                                 >> version.ent
     24        echo "<!ENTITY version           \"unknown-systemd\">" >> version.ent
     25        echo "]]>"                                             >> version.ent
    826        echo "<!ENTITY releasedate       \"unknown\">"         >> version.ent
    927        echo "<!ENTITY copyrightdate     \"1999-2021\">"       >> version.ent
     
    3149
    3250sha="$(git describe --abbrev=1)"
    33 if [ "$(git branch --show-current)" = "trunk" ]; then
    34         sha=$(echo "$sha" | sed 's/-g[^-]*$//')
    35 fi
    36 version="$sha"
    37 versiond="$sha-systemd"
     51rev=$(echo "$sha" | sed 's/-g[^-]*$//')
     52version="$rev"
     53versiond="$rev-systemd"
    3854
    3955if [ "$(git diff HEAD | wc -l)" != "0" ]; then
     
    4258fi
    4359
    44 echo "<!ENTITY version           \"$version\">"            >  version.ent
    45 echo "<!ENTITY versiond          \"$versiond\">"           >> version.ent
     60echo "<![ %sysv; ["                                        >  version.ent
     61echo "<!ENTITY version           \"$version\">"            >> version.ent
     62echo "]]>"                                                 >> version.ent
     63echo "<![ %systemd; ["                                     >> version.ent
     64echo "<!ENTITY version          \"$versiond\">"            >> version.ent
     65echo "]]>"                                                 >> version.ent
    4666echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
    4767echo "<!ENTITY copyrightdate     \"1999-$year\">"          >> version.ent
  • lfs-latest-git.php

    r0b5f7d87 r08a6368  
    319319   # Make version.ent
    320320   chdir( "$tmpdir/LFS" );
    321    exec ( "./git-version.sh" );
     321   exec ( "./git-version.sh systemd" );
    322322
    323323   chdir( $cdir );
  • make-aux-files.sh

    r0b5f7d87 r08a6368  
    44
    55# Get base file name and move bootscripts directory to that name
    6 version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2`
     6version=`grep "ENTITY lfs-bootscripts-version" packages.ent | head -n1| cut -d'"' -f2`
    77mv bootscripts lfs-bootscripts-$version
    88
  • packages.ent

    r0b5f7d87 r08a6368  
    3939<!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
    4040
    41 <!ENTITY automake-version "1.16.4">
     41<!ENTITY automake-version "1.16.5">
    4242<!ENTITY am-minor-version "1.16">
    43 <!ENTITY automake-size "1,564 KB">
     43<!ENTITY automake-size "1,565 KB">
    4444<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
    45 <!ENTITY automake-md5 "86e8e682bd74e6390a016c4d9c11267c">
     45<!ENTITY automake-md5 "4017e96f89fca45ca946f1c5db6be714">
    4646<!ENTITY automake-sha256 "80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d">
    4747<!ENTITY automake-home "&gnu-software;automake/">
     
    5959<!ENTITY bash-fin-sbu "1.6 SBU">
    6060
    61 <!ENTITY bc-version "5.0.2">
    62 <!ENTITY bc-size "420 KB">
     61<!ENTITY bc-version "5.1.1">
     62<!ENTITY bc-size "424 KB">
    6363<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
    64 <!ENTITY bc-md5 "3b521d29aa4af4c4d5e96f7c3db3c607">
     64<!ENTITY bc-md5 "1af1e124e5d1734e8770dc85e0af5cd6">
    6565<!ENTITY bc-home "https://git.yzena.com/gavin/bc">
    6666<!ENTITY bc-fin-du "6.7 MB">
     
    322322<!ENTITY gzip-fin-sbu "0.1 SBU">
    323323
    324 <!ENTITY iana-etc-version "20210924">
     324<!ENTITY iana-etc-version "20211004">
    325325<!ENTITY iana-etc-size "580 KB">
    326326<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
    327 <!ENTITY iana-etc-md5 "e4e8ab089948c1cbb2f9003087fa2ac7">
     327<!ENTITY iana-etc-md5 "7f174923f490329e2665ded727b1cc5c">
    328328<!ENTITY iana-etc-home "https://www.iana.org/protocols">
    329329<!ENTITY iana-etc-fin-du "4.7 MB">
     
    363363<!ENTITY isl-fin-sbu "0.1 SBU">
    364364
    365 <!ENTITY jinja2-version "3.0.1">
    366 <!ENTITY jinja2-size "264 KB">
     365<!ENTITY jinja2-version "3.0.2">
     366<!ENTITY jinja2-size "263 KB">
    367367<!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
    368 <!ENTITY jinja2-md5 "25ba6ef98c164878acff1036fbd72a1d">
     368<!ENTITY jinja2-md5 "059f89375d7ea60eb7013f341f0b89e7">
    369369<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
    370370<!ENTITY jinja2-fin-du "3.7 MB">
     
    437437<!ENTITY linux-major-version "5">
    438438<!ENTITY linux-minor-version "14">
    439 <!ENTITY linux-patch-version "8">
     439<!ENTITY linux-patch-version "12">
    440440<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    441441<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    442 <!ENTITY linux-size "117,869 KB">
     442<!ENTITY linux-size "117,880 KB">
    443443<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    444 <!ENTITY linux-md5 "ce6434b646ade20e292fb28c1aacde58">
     444<!ENTITY linux-md5 "a52286fe206a3f7664ca5a6c5995b9ed">
    445445<!ENTITY linux-home "https://www.kernel.org/">
    446446<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
     
    601601     meson pages will be needed: python3.6 and python3.6m -->
    602602
    603 <!ENTITY python-version "3.9.7">
    604 <!ENTITY python-minor "3.9">
    605 <!ENTITY python-size "18,676 KB">
     603<!ENTITY python-version "3.10.0">
     604<!ENTITY python-minor "3.10">
     605<!ENTITY python-size "18,288 KB">
    606606<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    607 <!ENTITY python-md5 "fddb060b483bc01850a3f412eea1d954">
     607<!ENTITY python-md5 "3e7035d272680f80e3ce4e8eb492d580">
    608608<!ENTITY python-home "https://www.python.org/">
    609609<!ENTITY python-tmp-du "347 MB">
     
    612612<!ENTITY python-fin-sbu "4.4 SBU">
    613613<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
    614 <!ENTITY python-docs-md5 "ef3ea6141ed362e4d12467b136ee70fe">
    615 <!ENTITY python-docs-size "6,791 KB">
     614<!ENTITY python-docs-md5 "157696412c0abede82024c91ec22f562">
     615<!ENTITY python-docs-size "7,093 KB">
    616616
    617617<!ENTITY readline-version "8.1">
     
    706706<!ENTITY texinfo-fin-sbu "0.6 SBU">
    707707
    708 <!ENTITY tzdata-version "2021b">
    709 <!ENTITY tzdata-size "411 KB">
     708<!ENTITY tzdata-version "2021c">
     709<!ENTITY tzdata-size "412 KB">
    710710<!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
    711 <!ENTITY tzdata-md5 "f3b7d5040127e45ccd7ef0952e03edb2">
     711<!ENTITY tzdata-md5 "8c0ffa5162bca86eaa5ba1b4aec1a0fc">
    712712<!ENTITY tzdata-home "https://www.iana.org/time-zones">
    713713
     
    729729<!ENTITY util-linux-fin-sbu "1.1 SBU">
    730730
    731 <!ENTITY vim-version "8.2.3458">
     731<!ENTITY vim-version "8.2.3508">
    732732<!ENTITY vim-majmin "82">
    733733<!ENTITY vim-docdir "vim/vim82">
    734 <!ENTITY vim-size "15,360 KB">
     734<!ENTITY vim-size "15,386 KB">
    735735<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
    736736<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
    737 <!ENTITY vim-md5 "29bdddab2dc2f6e10b2badba4ffad4bf">
     737<!ENTITY vim-md5 "f6004d3e776040e2301a1967975d00d1">
    738738<!ENTITY vim-home "https://www.vim.org">
    739739<!ENTITY vim-fin-du "199 MB">
  • prologue/bookinfo.xml

    r0b5f7d87 r08a6368  
    88<bookinfo>
    99  <title>Linux From Scratch</title>
    10   <subtitle arch="default" revision='sysv'>Version &version;</subtitle>
    11   <subtitle arch="default" revision='systemd'>Version &versiond;</subtitle>
    12   <subtitle arch="ml_32,ml_x32,ml_all" revision='sysv'>Version &version;-multilib</subtitle>
    13   <subtitle arch="ml_32,ml_x32,ml_all" revision='systemd'>Version &versiond;-multilib</subtitle>
     10  <subtitle>Version &version;<phrase arch="ml_32,ml_x32,ml_all">-multilib</phrase></subtitle>
    1411  <subtitle>Published &releasedate;</subtitle>
    1512
  • prologue/errata.xml

    r0b5f7d87 r08a6368  
    1616  instructions in this release of LFS need any modifications to accommodate
    1717  security vulnerabilities or other bug fixes, please visit
    18   <ulink revision="sysv" url="&errata;"/>
    19   <ulink revision="systemd" url="&erratad;"/>
     18  <ulink url="&errata;"/>
    2019  before proceeding with your build. You should note any
    2120  changes shown and apply them to the relevant section of the book as you
Note: See TracChangeset for help on using the changeset viewer.