diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml index f7a9d1efa..70b9b5e44 100644 --- a/chapter01/askforhelp.xml +++ b/chapter01/askforhelp.xml @@ -38,7 +38,9 @@ - The version of the book being used (in this case &version;) + The version of the book being used (in this case + &version; + &versiond;) The host distribution and version being used to create LFS diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 2bdeeb707..6d5aeb5e1 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -10,7 +10,10 @@ Changelog - This is version &version; of the Linux From Scratch book, dated + This is version + &version; + &versiond; + of the Linux From Scratch book, dated &releasedate;. If this book is more than six months old, a newer and better version is probably already available. To find out, please check one of the mirrors via . @@ -39,6 +42,58 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2016-05-27 + + + [dj] - Update to dbus-1.10.8. Fixes + #3938. + + + [dj] - Update to e2fsprogs-1.43. Fixes + #3935. + + + [dj] - Update to gdbm-1.12. Fixes + #3933. + + + [dj] - Update to iproute2-4.6.0. Fixes + #3934. + + + [dj] - Update to make-4.2. Fixes + #3936. + + + [dj] - Update to systemd-230. Fixes + #3937. + + + + + + 2016-05-20 + + + [dj] - Add additional explanatory text for sytemctl and + journalctl commands. + + + + + + 2016-05-19 + + + [dj] - Adjust hosts file instructions to account for hosts + using automatic configuration. Ajusted eplanatory text to account +for + additional configurations. + + + + 2016-05-16 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 04b2f10c0..118e30d07 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -1,4 +1,5 @@ + @@ -58,18 +59,18 @@ DejaGNU &dejagnu-version; - + - + Expat-&expat-version; @@ -91,9 +92,9 @@ GCC &gcc-version; - + @@ -157,9 +158,9 @@ - + @@ -202,9 +203,9 @@ - + @@ -276,6 +277,10 @@ mpfr-3.1.3-upstream_fixes-2.patch + + systemd-229-compat-1.patch + + diff --git a/chapter03/packages.xml b/chapter03/packages.xml index a510929c8..97e1c6948 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -633,7 +633,7 @@ - + Udev-lfs Tarball (&udev-lfs-version;) - &udev-lfs-size;: Download: diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 3d678ff0e..2228819aa 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -90,14 +90,6 @@ - - Systemd Compat Patch - &systemd-compat-patch-size;: - - Download: - MD5 sum: &systemd-compat-patch-md5; - - - Sysvinit Consolidated Patch - &sysvinit-consolidated-patch-size;: diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 5ded6fe9f..34c071103 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -31,15 +31,12 @@ - - - @@ -50,32 +47,33 @@ + + - - - - + + - - + + + + + - - @@ -86,14 +84,12 @@ - - - - + + diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 76ed51378..922017a01 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -45,11 +45,11 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h") - Apply the following patch so that compat - pkg-config files get installed without installing compat - libs which are useless on LFS: + Fix a potential security issue with framebuffer devices: -patch -Np1 -i ../&systemd-compat-patch; +sed -e 's@DRI and frame buffer@DRI@' \ + -e '/SUBSYTEM==\"graphics\", KERNEL==\"fb\*\"/d' \ + -i src/login/70-uaccess.rules Disable two tests that always fail: @@ -87,17 +87,18 @@ EOF Prepare systemd for compilation: -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --config-cache \ - --with-rootprefix= \ - --with-rootlibdir=/lib \ - --enable-split-usr \ - --disable-firstboot \ - --disable-ldconfig \ - --disable-sysusers \ - --without-python \ +./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --config-cache \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --enable-split-usr \ + --disable-firstboot \ + --disable-ldconfig \ + --disable-sysusers \ + --without-python \ + --with-default-dnssec=no \ --docdir=/usr/share/doc/systemd-&systemd-version; @@ -171,6 +172,13 @@ EOF + + --with-default-dnssec=no + + This switch turns off the experimental DNSSEC suport. + + + Compile the package: diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml index e3cdcd721..e40e9c627 100644 --- a/chapter07/chapter07.xml +++ b/chapter07/chapter07.xml @@ -11,6 +11,7 @@ System Configuration and Bootscripts + diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml index 3f2f84f3f..26f29beb4 100644 --- a/chapter07/systemd-custom.xml +++ b/chapter07/systemd-custom.xml @@ -86,7 +86,7 @@ EOF Overriding Default Services Behavior - A systemd service contents can be overriden by creating a directory + The parameter of a unit can be overriden by creating a directory and a configuration file in /etc/systemd/system. For example: @@ -109,7 +109,7 @@ EOF Debugging the Boot Sequence Rather than plain shell scripts used in SysVinit or BSD style init - systems, systemd uses a unified format for different type of startup + systems, systemd uses a unified format for different types of startup files (or units). The command systemctl is used to enable, disable, controll state, and obtain status of unit files. Here are some examples of frequently used commands: @@ -143,12 +143,13 @@ EOF Working with the Systemd Journal - Logging on a system booted with systemd is handled by - systemd-journald (default), rather than a typical unix syslog daemon. - systemd-journald write log entries to a binary file format, rather than - a plain text log file. To assist with parsing the file, the command - journalctl is provided. Here are some examples of - frequently used commands: + Logging on a system booted with systemd is handled with + systemd-journald (by default), rather than a typical unix syslog daemon. + You can also add a normal syslog daemon and have both work side by + side if desired. The systemd-journald program stores journal entries in a + binary format rather than a plain text log file. To assist with + parsing the file, the command journalctl is provided. + Here are some examples of frequently used commands: diff --git a/chapter08/grub.xml b/chapter08/grub.xml index a8e484bd8..71d1d4c23 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -128,7 +128,7 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.isoGenerate /boot/grub/grub.cfg: - cat > /boot/grub/grub.cfg << "EOF" + cat > /boot/grub/grub.cfg << "EOF" # Begin /boot/grub/grub.cfg set default=0 set timeout=5 @@ -141,6 +141,20 @@ menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" { } EOF + cat > /boot/grub/grub.cfg << "EOF" +# Begin /boot/grub/grub.cfg +set default=0 +set timeout=5 + +insmod ext2 +set root=(hd0,2) + +menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" { + linux /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro +} +EOF + + From GRUB's perspective, the kernel files are relative to the partition used. If you used a separate /boot partition, remove /boot from the above diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index d955625d7..75f9f63f7 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -209,7 +209,9 @@ File systems ---> the automatic setup of the boot process described in the next section. The following command assumes an x86 architecture: -cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version; +cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version; + +cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond; System.map is a symbol file for the kernel. It maps the function entry points of every function in the kernel API, @@ -318,8 +320,9 @@ EOF config-&linux-version;, - vmlinuz-&linux-version;-lfs-&version;, and - System.map-&linux-version; + vmlinuz-&linux-version;-lfs-&version;, + vmlinuz-&linux-version;-lfs-&versiond;, + and System.map-&linux-version; /lib/modules, /usr/share/doc/linux-&linux-version; @@ -340,7 +343,8 @@ EOF - vmlinuz-&linux-version;-lfs-&version; + vmlinuz-&linux-version;-lfs-&version; + vmlinuz-&linux-version;-lfs-&versiond; The engine of the Linux system. When turning on the computer, the kernel is the first part of the operating system that gets loaded. diff --git a/chapter09/theend.xml b/chapter09/theend.xml index 2d29242b0..3818a7b83 100644 --- a/chapter09/theend.xml +++ b/chapter09/theend.xml @@ -49,7 +49,7 @@ EOF us if you need to ask for help at some point) to find out which LFS version is installed on the system. Create this file by running: -echo &version; > /etc/lfs-release +echo &versiond; > /etc/lfs-release It is also a good idea to create a file to show the status of your new system with respect to the Linux Standards Base (LSB). To create diff --git a/general.ent b/general.ent index 2a0eb55f7..d4fca24f9 100644 --- a/general.ent +++ b/general.ent @@ -1,9 +1,9 @@ - + - + @@ -22,6 +22,7 @@ + diff --git a/packages.ent b/packages.ent index 485ddb409..5815ef135 100644 --- a/packages.ent +++ b/packages.ent @@ -106,10 +106,10 @@ - - + + - + @@ -135,10 +135,10 @@ - - + + - + @@ -220,10 +220,10 @@ - - + + - + @@ -325,10 +325,10 @@ - - + + - + @@ -366,7 +366,7 @@ - + @@ -419,10 +419,10 @@ - - + + - + @@ -438,7 +438,7 @@ - + @@ -549,13 +549,13 @@ - - + + - + - - + + @@ -585,7 +585,7 @@ - + diff --git a/patches.ent b/patches.ent index f3632da58..b150d8c67 100644 --- a/patches.ent +++ b/patches.ent @@ -42,7 +42,3 @@ - - - - diff --git a/prologue/errata.xml b/prologue/errata.xml index e5c3f5969..07b80d672 100644 --- a/prologue/errata.xml +++ b/prologue/errata.xml @@ -14,8 +14,10 @@ and enhanced. Security warnings and bug fixes may become available after the LFS book has been released. To check whether the package versions or instructions in this release of LFS need any modifications to accommodate - security vulnerabilities or other bug fixes, please visit before proceeding with your build. You should note any + security vulnerabilities or other bug fixes, please visit + + + before proceeding with your build. You should note any changes shown and apply them to the relevant section of the book as you progress with building the LFS system. diff --git a/prologue/why.xml b/prologue/why.xml index 387e4d55e..7a302f636 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -107,15 +107,15 @@ command line file management, and are necessary for the installation procedures of every package in LFS. - + DejaGNU @@ -139,7 +139,7 @@ tested file systems that Linux supports. - + Eudev This package is a device manager. It dynamically controls the entries @@ -465,15 +465,15 @@ in a secure way. - + Sysklogd This package contains programs for logging system messages, such as those given by the kernel or daemon processes when unusual events occur. - - + + Sysvinit This package provides the init