From cc519cf82d1e7e1237f29c6c8284a5bfc997e98a Mon Sep 17 00:00:00 2001 From: Krejzi Date: Sat, 18 May 2013 10:18:42 +0000 Subject: [PATCH] Sync development and systemd branches. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10276 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 34 ++++++++++++++++++++++ chapter01/whatsnew.xml | 8 +++--- chapter06/createfiles.xml | 10 +++++-- chapter06/flex.xml | 2 +- chapter06/gawk.xml | 59 ++++----------------------------------- general.ent | 4 +-- packages.ent | 40 +++++++++++++------------- 7 files changed, 74 insertions(+), 83 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 486cd776a..08d1f21dd 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,40 @@ --> + + 2013-05-12 + + + [matthew] - Upgrade to Linux-3.9.2. Fixes + #3345. + + + + + + 2013-05-11 + + + [bdubbs] - Upgrade to gawk-4.1.0. Fixes + #3343. + + + + + + 2013-05-10 + + + [bdubbs] - Upgrade to linux-3.9.1. Fixes + #3342. + + + [bdubbs] - Upgrade to gettext-0.18.2.1. Fixes + #3298. + + + + 2013-05-04 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index d041a06c7..23fdb0771 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -73,18 +73,18 @@ - + GCC &gcc-version; - + diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index e2d2526f8..a163fb9ba 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -46,9 +46,12 @@ ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la ln -sv bash /bin/sh - A proper Linux system maintains a list of the mounted file systems in - the file /etc/mtab. Systemd requires it to be a - symbolic link to /proc/self/mounts: + Historically, Linux maintains a list of the mounted file systems in the + file /etc/mtab. Modern kernels maintain this list + internally and exposes it to the user via the /proc filesystem. To satisfy utilities that + expect the presence of /etc/mtab, create the following + symbolic link: ln -s /proc/self/mounts /etc/mtab @@ -92,6 +95,7 @@ usb:x:14: cdrom:x:15: adm:x:16: messagebus:x:18: +systemd-journal:x:23: mail:x:34: nogroup:x:99: EOF diff --git a/chapter06/flex.xml b/chapter06/flex.xml index a331d669c..79773a9fd 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -47,7 +47,7 @@ Prepare Flex for compilation: -./configure --prefix=/usr \ +./configure --prefix=/usr \ --docdir=/usr/share/doc/flex-&flex-version; Compile the package: diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index 832def654..068cccfc8 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -68,12 +68,15 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version; Installed programs + Installed libraries Installed directories - awk (link to gawk), dgawk, gawk, gawk-&gawk-version;, grcat, igawk, - pgawk, pgawk-&gawk-version;, and pwcat - /usr/lib/awk, /usr/share/awk + awk (link to gawk), gawk, gawk-&gawk-version;, and igawk + filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so, + readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so, + testext.so, and time.so + /usr/lib/{,g}awk, /usr/share/awk @@ -92,16 +95,6 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version; - - dgawk - - An awk debugger - - dgawk - - - - gawk @@ -123,16 +116,6 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version; - - grcat - - Dumps the group database /etc/group - - grcat - - - - igawk @@ -143,36 +126,6 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version; - - pgawk - - The profiling version of gawk - - pgawk - - - - - - pgawk-&gawk-version; - - Hard link to pgawk - - pgawk-&gawk-version; - - - - - - pwcat - - Dumps the password database /etc/passwd - - pwcat - - - - diff --git a/general.ent b/general.ent index fcbed754d..1809fe4f0 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index 6428175c8..f139e6ba6 100644 --- a/packages.ent +++ b/packages.ent @@ -45,7 +45,7 @@ - + @@ -188,10 +188,10 @@ - - + + - + @@ -220,15 +220,15 @@ - - + + - + - + - + @@ -379,12 +379,12 @@ - - - - + + + + - +