Changes in / [d887817:0bf23c8]
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
rd887817 r0bf23c8 1 1 lfs-bootscripts-*.tar.xz 2 conditional.ent 2 3 version.ent 3 4 appendices/*.script -
Makefile
rd887817 r0bf23c8 190 190 191 191 version: 192 $(Q)./git-version.sh 192 $(Q)./git-version.sh $(REV) 193 193 194 194 #dump-commands: validate -
chapter01/askforhelp.xml
rd887817 r0bf23c8 39 39 <itemizedlist> 40 40 <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> 44 42 </listitem> 45 43 <listitem> -
chapter01/changelog.xml
rd887817 r0bf23c8 11 11 <title>Changelog</title> 12 12 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 17 14 &releasedate;. If this book is more than six months old, a newer and better 18 15 version is probably already available. To find out, please check one of the -
chapter07/cleanup.xml
rd887817 r0bf23c8 128 128 </note> 129 129 130 <screen role="nodump" revision="sysv"><userinput>cd $LFS130 <screen role="nodump"><userinput>cd $LFS 131 131 tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen> 132 133 <screen role="nodump" revision="systemd"><userinput>cd $LFS134 tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>135 132 136 133 </sect2> … … 158 155 your entire host system. YOU ARE WARNED.</para></warning> 159 156 160 <screen role="nodump" revision="sysv"><computeroutput>cd $LFS157 <screen role="nodump"><computeroutput>cd $LFS 161 158 rm -rf ./* 162 159 tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen> 163 164 <screen role="nodump" revision="systemd"><computeroutput>cd $LFS165 rm -rf ./*166 tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen>167 160 168 161 <para> -
chapter10/grub.xml
rd887817 r0bf23c8 157 157 set root=(hd0,2) 158 158 159 menuentry "GNU/Linux, Linux &linux-version;-lfs-&version d;" {160 linux /boot/vmlinuz-&linux-version;-lfs-&version d; root=/dev/sda2 ro159 menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" { 160 linux /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro 161 161 }</literal> 162 162 EOF</userinput></screen> -
chapter10/kernel.xml
rd887817 r0bf23c8 228 228 <screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen> 229 229 230 <screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version d;</userinput></screen>230 <screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen> 231 231 232 232 <para><filename>System.map</filename> is a symbol file for the kernel. … … 337 337 <seglistitem> 338 338 <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; 341 340 and System.map-&linux-version;</seg> 342 341 <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg> … … 360 359 361 360 <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> 364 362 <listitem> 365 363 <para>The engine of the Linux system. When turning on the computer, -
chapter11/reboot.xml
rd887817 r0bf23c8 21 21 <itemizedlist> 22 22 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> 26 25 will allow you to easily view the BLFS book in one virtual terminal, while 27 26 building packages in another.</para></listitem> 28 27 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 32 30 will allow you to set up local trusted anchor certificates, allowing 33 31 the system to verify SSL certificates provided by remote servers (for 34 32 example, a website using HTTPS).</para></listitem> 35 33 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 39 36 you to perform copy/paste actions in your virtual 40 37 terminals.</para></listitem> … … 48 45 useful.</para></listitem> 49 46 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 53 49 building packages as a non-root user and easily installing the resulting 54 50 packages in your new system.</para></listitem> 55 51 56 52 <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> 61 55 62 56 <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> 67 58 68 59 <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>. 73 62 </para></listitem> 74 63 -
chapter11/theend.xml
rd887817 r0bf23c8 32 32 running:</para> 33 33 34 <screen revision="sysv"><userinput>echo &version; > /etc/lfs-release</userinput></screen>34 <screen><userinput>echo &version; > /etc/lfs-release</userinput></screen> 35 35 36 <screen revision="systemd"><userinput>echo &versiond; > /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 40 38 them.</para> 41 39 … … 44 42 this file, run:</para> 45 43 46 <screen revision="sysv"><userinput>cat > /etc/lsb-release << "EOF"44 <screen><userinput>cat > /etc/lsb-release << "EOF" 47 45 DISTRIB_ID="Linux From Scratch" 48 46 DISTRIB_RELEASE="&version;" 49 DISTRIB_CODENAME="<your name here>"50 DISTRIB_DESCRIPTION="Linux From Scratch"51 EOF</userinput></screen>52 53 <screen revision="systemd"><userinput>cat > /etc/lsb-release << "EOF"54 DISTRIB_ID="Linux From Scratch"55 DISTRIB_RELEASE="&versiond;"56 47 DISTRIB_CODENAME="<your name here>" 57 48 DISTRIB_DESCRIPTION="Linux From Scratch" … … 62 53 this file, run:</para> 63 54 64 <screen revision="sysv"><userinput>cat > /etc/os-release << "EOF"55 <screen><userinput>cat > /etc/os-release << "EOF" 65 56 NAME="Linux From Scratch" 66 57 VERSION="&version;" 67 58 ID=lfs 68 59 PRETTY_NAME="Linux From Scratch &version;" 69 VERSION_CODENAME="<your name here>"70 EOF</userinput></screen>71 72 <screen revision="systemd"><userinput>cat > /etc/os-release << "EOF"73 NAME="Linux From Scratch"74 VERSION="&versiond;"75 ID=lfs76 PRETTY_NAME="Linux From Scratch &versiond;"77 60 VERSION_CODENAME="<your name here>" 78 61 EOF</userinput></screen> -
chapter11/whatnow.xml
rd887817 r0bf23c8 58 58 <para>The Beyond Linux From Scratch book covers installation 59 59 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;"/>. 62 61 </para> 63 62 </listitem> -
general.ent
rd887817 r0bf23c8 1 <!-- Automatically generated by git-version.sh --> 2 <!ENTITY % conditional-entities SYSTEM "conditional.ent"> 3 %conditional-entities; 4 1 5 <!-- version info automatically generated by git 2 comment the following two lines for release -->6 comment out the following two lines for release --> 3 7 <!ENTITY % version-entities SYSTEM "version.ent"> 4 8 %version-entities; … … 7 11 for releases (including -rc) --> 8 12 <!-- 13 <![ %sysv; [ 9 14 <!ENTITY version "10.2-rc1"> 10 <!ENTITY versiond "10.2-systemd-rc1"> 15 ]]> 16 <![ %systemd; [ 17 <!ENTITY version "10.2-systemd-rc1"> 18 ]]> 11 19 <!ENTITY releasedate "August 26th, 2021"> 12 20 <!ENTITY copyrightdate "1999-2021"> 13 21 --> 14 22 23 <![ %sysv; [ 15 24 <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; 16 25 Change to x.y for release but not -rc releases --> 26 ]]> 27 <![ %systemd; [ 28 <!ENTITY short-version "systemd"> <!--Change to stable-systemd for release --> 29 ]]> 17 30 <!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">21 31 22 32 <!ENTITY lfs-root "https://www.linuxfromscratch.org/"> 23 33 <!ENTITY blfs-root "&lfs-root;blfs/"> 24 34 <!ENTITY blfs-book "&blfs-root;view/&short-version;/"> 25 <!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">26 35 <!ENTITY faq-root "&lfs-root;faq/"> 27 36 <!ENTITY hints-root "&lfs-root;hints/downloads/files/"> … … 31 40 <!ENTITY livecd-root "&lfs-root;livecd/"> 32 41 <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/"> 42 <![ %sysv; [ 33 43 <!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/"> 44 ]]> 45 <![ %systemd; [ 46 <!ENTITY errata "&lfs-root;lfs/errata/&short-version;/"> 47 ]]> 34 48 <!ENTITY secadv "&lfs-root;lfs/advisories/"> 35 49 <!ENTITY min-kernel "3.2"> 36 50 <!-- 37 51 <!ENTITY patches-rootd "&lfs-root;patches/lfs/&generic-versiond;/"> 38 52 <!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/"> 39 53 <!ENTITY test-resultsd "&lfs-root;lfs/build-logs/&generic-versiond;/"> 40 54 <!ENTITY erratad "&lfs-root;lfs/errata/&generic-versiond;/"> 41 55 --> 42 56 <!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/"> 43 57 -
git-version.sh
rd887817 r0bf23c8 1 1 #!/bin/sh 2 3 if [ "$1" = sysv ]; then 4 SYSV="INCLUDE" 5 SYSTEMD="IGNORE " 6 elif [ "$1" = systemd ]; then 7 SYSV="IGNORE " 8 SYSTEMD="INCLUDE" 9 else 10 echo You must provide either \"sysv\" or \"systemd\" as argument 11 exit 1 12 fi 13 14 echo "<!ENTITY % sysv \"$SYSV\">" > conditional.ent 15 echo "<!ENTITY % systemd \"$SYSTEMD\">" >> conditional.ent 2 16 3 17 if ! git status > /dev/null; then 4 18 # Either it's not a git repository, or git is unavaliable. 5 19 # 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 8 26 echo "<!ENTITY releasedate \"unknown\">" >> version.ent 9 27 echo "<!ENTITY copyrightdate \"1999-2021\">" >> version.ent … … 42 60 fi 43 61 44 echo "<!ENTITY version \"$version\">" > version.ent 45 echo "<!ENTITY versiond \"$versiond\">" >> version.ent 62 echo "<![ %sysv; [" > version.ent 63 echo "<!ENTITY version \"$version\">" >> version.ent 64 echo "]]>" >> version.ent 65 echo "<![ %systemd; [" >> version.ent 66 echo "<!ENTITY version \"$versiond\">" >> version.ent 67 echo "]]>" >> version.ent 46 68 echo "<!ENTITY releasedate \"$full_date\">" >> version.ent 47 69 echo "<!ENTITY copyrightdate \"1999-$year\">" >> version.ent -
make-aux-files.sh
rd887817 r0bf23c8 4 4 5 5 # Get base file name and move bootscripts directory to that name 6 version=`grep "ENTITY lfs-bootscripts-version" packages.ent | cut -d'"' -f2`6 version=`grep "ENTITY lfs-bootscripts-version" packages.ent | head -n1| cut -d'"' -f2` 7 7 mv bootscripts lfs-bootscripts-$version 8 8 -
patches.ent
rd887817 r0bf23c8 73 73 <!ENTITY perl-fix-patch-size "1.6 KB"> 74 74 75 <![ %sysv; [ 75 76 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch"> 76 77 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc"> 77 78 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB"> 79 ]]> 78 80 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; [ 79 88 <!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch"> 80 89 <!ENTITY systemd-upstream-fixes-patch-md5 "a4449dedf514486b8995ee501d1bb8cc"> 81 90 <!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
rd887817 r0bf23c8 8 8 <bookinfo> 9 9 <title>Linux From Scratch</title> 10 <subtitle revision='sysv' >Version &version; </subtitle> 11 <subtitle revision='systemd'>Version &versiond;</subtitle> 10 <subtitle>Version &version; </subtitle> 12 11 <subtitle>Published &releasedate;</subtitle> 13 12 -
prologue/errata.xml
rd887817 r0bf23c8 16 16 instructions in this release of LFS need any modifications to accommodate 17 17 security vulnerabilities or other bug fixes, please visit 18 <ulink revision="sysv" url="&errata;"/> 19 <ulink revision="systemd" url="&erratad;"/> 18 <ulink url="&errata;"/> 20 19 before proceeding with your build. You should note any 21 20 changes shown and apply them to the relevant section of the book as you
Note:
See TracChangeset
for help on using the changeset viewer.