From 3e2ac00fcbfdedb3304812af7d3be7920692c984 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Mon, 17 Feb 2014 01:11:29 +0000 Subject: [PATCH] Final sync from lfs svn. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10472 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 2 +- chapter01/changelog.xml | 55 +++++++++++++++++++++++++++++++++++++ chapter06/automake.xml | 14 +++++++--- chapter06/chapter06.xml | 2 +- chapter06/coreutils.xml | 1 - chapter06/creatingdirs.xml | 4 +-- chapter06/findutils.xml | 1 - chapter06/flex.xml | 5 ++-- chapter06/gawk.xml | 2 +- chapter06/gcc.xml | 1 - chapter06/glibc.xml | 18 +++++------- chapter06/grub.xml | 1 + chapter06/inetutils.xml | 1 - chapter06/man-db.xml | 1 - chapter06/tar.xml | 3 +- general.ent | 4 +-- packages.ent | 8 +++--- prologue/standards.xml | 5 ++-- 18 files changed, 90 insertions(+), 38 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 260ed14d3..a76aefce0 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1492,7 +1492,7 @@ &testsuites; - Not run. Requires Man-DB test suite package + Util-linux diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 402a696c8..6961afade 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,61 @@ --> + + 2014-02-17 + + + [krejzi] - Merge LFS SVN-20140216 book. + + + + + + 2014-02-16 + + + [bdubbs] - Update to man-pages-3.5.9. + + + [bdubbs] - Incorporate beta FHS. Add + /usr/share/ppd, /usr/libexec, /usr/share/color, + /usr/local/share/color, /var/lib/color, and /usr/share/dict. + + + + [bdubbs] - Incorporate beta FHS. Remove overrides + for /usr/libexec: coreutils, findutils, gawk, gcc, glibc, + inetutils, man-db, and tar. Also fixes + #3498. + + + + [bdubbs] - Incorporate beta FHS. Move grub sbin + executables from /usr/sbin to /sbin. + + + + [bdubbs] - Document two new glibc errors in the + regression tests. + + + + [bdubbs] - Move man-db after util-linux to satisfy + a test dependency. + + + + [bdubbs] - Update automake tests to accomodate util-linux + in /tools and to speed the test up. + + + + [bdubbs] - Restore building the flex static library. + + + + + 2014-02-14 diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 64323dfe7..e4c862f4e 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -49,11 +49,17 @@ make - The tests take a very long time: over 30 SBUs. + There are a couple of tests that incorrectly link to the + wrong version of the flex library, so we temporarily work around + the problem. Also, using the -j4 make option speeds up the tests, even on + systems with only one processor due to internal delays in individual + tests. To test the results, issue: - To test the results, issue: - -make check +mv -v /usr/lib/libfl.{so,save} +ln -sv libfl.a /usr/lib/libfl.so +make -j4 check +rm -v /usr/lib/libfl.so +mv -v /usr/lib/libfl.{save,so} Install the package: diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 9e69a42bd..01c7f9d4e 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -72,12 +72,12 @@ - + diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 3adc10127..86cdaaa51 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -61,7 +61,6 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib \ --enable-no-install-program=kill,uptime diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml index 65553e8d5..9a3713ebf 100644 --- a/chapter06/creatingdirs.xml +++ b/chapter06/creatingdirs.xml @@ -18,7 +18,7 @@ mkdir -pv /{media/{floppy,cdrom},sbin,srv,var} install -dv -m 0750 /root install -dv -m 1777 /tmp /var/tmp mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} -mkdir -pv /usr/{,local/}share/{doc,info,locale,man} +mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man} mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo} mkdir -pv /usr/{,local/}share/man/man{1..8} for dir in /usr /usr/local; do @@ -30,7 +30,7 @@ esac mkdir -v /var/{log,mail,spool} ln -sv /run /var/run ln -sv /run/lock /var/lock -mkdir -pv /var/{opt,cache,lib/{misc,locate},local} +mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local} Directories are, by default, created with permission mode 755, but this is not desirable for all directories. In the commands above, two diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 00828af11..c04beab46 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -46,7 +46,6 @@ Prepare Findutils for compilation: ./configure --prefix=/usr \ - --libexecdir=/usr/lib/findutils \ --localstatedir=/var/lib/locate diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 4f6cef1f4..45364de3f 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -48,7 +48,6 @@ Prepare Flex for compilation: ./configure --prefix=/usr \ - --disable-static \ --docdir=/usr/share/doc/flex-&flex-version; Compile the package: @@ -98,7 +97,7 @@ chmod -v 755 /usr/bin/lex flex, flex++ (link to flex), and lex - libfl.so and libfl_pic.so + libfl.{so,a} and libfl_pic.{so.a} /usr/share/doc/flex-&flex-version; @@ -143,7 +142,7 @@ chmod -v 755 /usr/bin/lex - libfl.a + libfl.so The flex library diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index 3db79a01c..6328b2c4c 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -42,7 +42,7 @@ Prepare Gawk for compilation: -./configure --prefix=/usr --libexecdir=/usr/lib +./configure --prefix=/usr Compile the package: diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index a418f43a7..7fe9fe94d 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -72,7 +72,6 @@ cd ../gcc-build SED=sed \ ../gcc-&gcc-version;/configure --prefix=/usr \ - --libexecdir=/usr/lib \ --enable-shared \ --enable-threads=posix \ --enable-__cxa_atexit \ diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 9fccea41c..58105b854 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -84,21 +84,11 @@ cd ../glibc-build --prefix=/usr \ --disable-profile \ --enable-kernel=&min-kernel; \ - --libexecdir=/usr/lib \ --enable-obsolete-rpc The meaning of the new configure options: - - --libexecdir=/usr/lib - - This changes the location of some auxillary files from the - default of /usr/libexec to - /usr/lib. - - - --enable-obsolete-rpc @@ -162,9 +152,15 @@ grep Error glibc-check-log connection when the test is run. + + libio/tst-ftell-partial-wide.out fails because it needs a locale + that has not yet been generated. + + Other tests known to fail on some architectures are posix/bug-regex32, - misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, and stdio-common/bug22. + misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, nptl/tst-robust8, + and stdio-common/bug22. diff --git a/chapter06/grub.xml b/chapter06/grub.xml index 6354a4777..7941debd6 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -47,6 +47,7 @@ Prepare GRUB for compilation: ./configure --prefix=/usr \ + --sbindir=/sbin \ --sysconfdir=/etc \ --disable-grub-emu-usb \ --disable-efiemu \ diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index 136b6383f..639d04da9 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -48,7 +48,6 @@ Prepare Inetutils for compilation: ./configure --prefix=/usr \ - --libexecdir=/usr/sbin \ --localstatedir=/var \ --disable-logger \ --disable-syslogd \ diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 196f41dd3..372ee08aa 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -44,7 +44,6 @@ Prepare Man-DB for compilation: ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ --docdir=/usr/share/doc/man-db-&man-db-version; \ --sysconfdir=/etc \ --disable-setuid \ diff --git a/chapter06/tar.xml b/chapter06/tar.xml index f02d88867..c3c3c0738 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -48,8 +48,7 @@ FORCE_UNSAFE_CONFIGURE=1 \ ./configure --prefix=/usr \ - --bindir=/bin \ - --libexecdir=/usr/sbin + --bindir=/bin The meaning of the configure options: diff --git a/general.ent b/general.ent index 0ac04d530..5bec10934 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index ff38dc698..6037b3a86 100644 --- a/packages.ent +++ b/packages.ent @@ -38,7 +38,7 @@ - + @@ -441,10 +441,10 @@ - - + + - + diff --git a/prologue/standards.xml b/prologue/standards.xml index 21a70d191..863e4e3bc 100644 --- a/prologue/standards.xml +++ b/prologue/standards.xml @@ -22,8 +22,9 @@ POSIX.1-2008. - Filesystem - Hierarchy Standard (FHS) + + Filesystem Hierarchy Standard version 3.0 Draft 1 (FHS)