Changes in / [8e7be49:b17714a9]


Ignore:
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

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

    r8e7be49 rb17714a9  
    190190
    191191version:
    192         $(Q)./git-version.sh
     192        $(Q)./git-version.sh $(REV)
    193193
    194194#dump-commands: validate
  • chapter01/askforhelp.xml

    r8e7be49 rb17714a9  
    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>)</para>
     41        <para>The version of the book being used (in this case &version;</para>
    4442      </listitem>
    4543      <listitem>
  • chapter01/changelog.xml

    r8e7be49 rb17714a9  
    1111  <title>Changelog</title>
    1212
    13   <para>This is version
    14         <phrase revision="sysv">&version;</phrase>
    15         <phrase revision="systemd">&versiond;</phrase>
    16   of the Linux From Scratch book, dated
     13  <para>This is version &version; of the Linux From Scratch book, dated
    1714  &releasedate;. If this book is more than six months old, a newer and better
    1815  version is probably already available. To find out, please check one of the
  • chapter07/cleanup.xml

    r8e7be49 rb17714a9  
    128128    </note>
    129129
    130 <screen role="nodump" revision="sysv"><userinput>cd $LFS
     130<screen role="nodump"><userinput>cd $LFS
    131131tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
    132 
    133 <screen role="nodump" revision="systemd"><userinput>cd $LFS
    134 tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
    135132
    136133  </sect2>
     
    158155    your entire host system.  YOU ARE WARNED.</para></warning>
    159156
    160 <screen role="nodump" revision="sysv"><computeroutput>cd $LFS
     157<screen role="nodump"><computeroutput>cd $LFS
    161158rm -rf ./*
    162159tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen>
    163 
    164 <screen role="nodump" revision="systemd"><computeroutput>cd $LFS
    165 rm -rf ./*
    166 tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen>
    167160
    168161    <para>
  • chapter10/grub.xml

    r8e7be49 rb17714a9  
    157157set root=(hd0,2)
    158158
    159 menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" {
    160         linux   /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro
     159menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
     160        linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
    161161}</literal>
    162162EOF</userinput></screen>
  • chapter10/kernel.xml

    r8e7be49 rb17714a9  
    228228<screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
    229229
    230 <screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
     230<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
    231231
    232232    <para><filename>System.map</filename> is a symbol file for the kernel.
     
    337337      <seglistitem>
    338338        <seg>config-&linux-version;,
    339         <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
    340         <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
     339        vmlinuz-&linux-version;-lfs-&version;,
    341340        and System.map-&linux-version;</seg>
    342341        <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
     
    360359
    361360      <varlistentry id="lfskernel">
    362         <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
    363         <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
     361        <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
    364362        <listitem>
    365363          <para>The engine of the Linux system. When turning on the computer,
  • chapter11/reboot.xml

    r8e7be49 rb17714a9  
    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

    r8e7be49 rb17714a9  
    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

    r8e7be49 rb17714a9  
    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

    r8e7be49 rb17714a9  
    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

    r8e7be49 rb17714a9  
    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
     
    4260fi
    4361
    44 echo "<!ENTITY version           \"$version\">"            >  version.ent
    45 echo "<!ENTITY versiond          \"$versiond\">"           >> version.ent
     62echo "<![ %sysv; ["                                        >  version.ent
     63echo "<!ENTITY version           \"$version\">"            >> version.ent
     64echo "]]>"                                                 >> version.ent
     65echo "<![ %systemd; ["                                     >> version.ent
     66echo "<!ENTITY version          \"$versiond\">"            >> version.ent
     67echo "]]>"                                                 >> version.ent
    4668echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
    4769echo "<!ENTITY copyrightdate     \"1999-$year\">"          >> version.ent
  • make-aux-files.sh

    r8e7be49 rb17714a9  
    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
  • patches.ent

    r8e7be49 rb17714a9  
    7373<!ENTITY perl-fix-patch-size "1.6 KB">
    7474
     75<![ %sysv; [
    7576<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
    7677<!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
    7778<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
     79]]>
    7880
     81<![ %systemd; [
     82<!ENTITY sysvinit-consolidated-patch "not-used">
     83<!ENTITY sysvinit-consolidated-patch-md5 "not-used">
     84<!ENTITY sysvinit-consolidated-patch-size "not-used">
     85]]>
     86
     87<![ %systemd; [
    7988<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
    8089<!ENTITY systemd-upstream-fixes-patch-md5 "a4449dedf514486b8995ee501d1bb8cc">
    8190<!ENTITY systemd-upstream-fixes-patch-size "4 KB">
     91]]>
     92
     93<![ %sysv; [
     94<!ENTITY systemd-upstream-fixes-patch "not-used">
     95<!ENTITY systemd-upstream-fixes-patch-md5 "not-used">
     96<!ENTITY systemd-upstream-fixes-patch-size "not-used">
     97]]>
  • prologue/bookinfo.xml

    r8e7be49 rb17714a9  
    88<bookinfo>
    99  <title>Linux From Scratch</title>
    10   <subtitle revision='sysv'   >Version &version; </subtitle>
    11   <subtitle revision='systemd'>Version &versiond;</subtitle>
     10  <subtitle>Version &version;</subtitle>
    1211  <subtitle>Published &releasedate;</subtitle>
    1312
  • prologue/errata.xml

    r8e7be49 rb17714a9  
    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.