diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index d591ae91d..8f1c85a90 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1384,7 +1384,7 @@
&testsuites;
- Not run. Requires Man-DB test suite package
+ Util-linux
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 60ffee416..57893afdc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,51 @@
-->
+
+ 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 842b30a91..7fe9d5ee7 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -65,7 +65,6 @@
-
@@ -73,6 +72,7 @@
+
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 6bed1c8e3..f95ce767b 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 96f9a5133..c7424bf0c 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 343b5a17a..4d198ca1b 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -77,21 +77,11 @@ cd ../glibc-build
--prefix=/usr \
--disable-profile \
--enable-kernel=&min-kernel; \
- --libexecdir=/usr/lib/glibc \
--enable-obsolete-rpc
The meaning of the new configure options:
-
- --libexecdir=/usr/lib/glibc
-
- This changes the location of some auxillary files from the
- default of /usr/libexec to
- /usr/lib/glibc.
-
-
-
--enable-obsolete-rpc
@@ -155,9 +145,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 61b94def4..9fef9411a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index 0d6175c5a..1583b4658 100644
--- a/packages.ent
+++ b/packages.ent
@@ -22,7 +22,7 @@
-
+
@@ -385,10 +385,10 @@
-
-
+
+
-
+
@@ -554,10 +554,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)
diff --git a/udev-lfs/ChangeLog b/udev-lfs/ChangeLog
index 130678d95..0604f6f30 100644
--- a/udev-lfs/ChangeLog
+++ b/udev-lfs/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-16
+ * Makefile.lfs: Adjust warning flags. Adjust linking rules to
+ allow build with util-linux in LFS's /tools directory.
+
2010-01-26 Matt Burgess
* 55-lfs.rules: Remove lots of rules that have been merged upstream.
* 61-cdrom.rules: Remove as upstream has a replacement.
diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs
index 1b1909bd5..12ca65559 100644
--- a/udev-lfs/Makefile.lfs
+++ b/udev-lfs/Makefile.lfs
@@ -5,7 +5,7 @@
SHELL=/bin/bash
SYSTEMD_VERSION=208
-VERSION=$(SYSTEMD_VERSION)-1
+VERSION=$(SYSTEMD_VERSION)-3
ifeq ($(V),)
VB = @
@@ -21,7 +21,7 @@ WARN = -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 \
-Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align \
-Wstrict-aliasing=2 -Wwrite-strings -Wno-overlength-strings \
-Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result \
--Werror=overflow -Wp,-D_FORTIFY_SOURCE=2 -Wno-long-long
+-Werror=overflow -Wp,-D_FORTIFY_SOURCE=2 -Wno-long-long -Wno-vla
OPTIONS = -O2 -pipe -ffast-math -fno-common -fdiagnostics-show-option \
-fno-strict-aliasing -ffunction-sections -fdata-sections -fPIC -std=gnu99
@@ -29,7 +29,7 @@ OPTIONS = -O2 -pipe -ffast-math -fno-common -fdiagnostics-show-option \
OPTIONS2 := $(OPTIONS) -fvisibility=hidden
LDFLAGS1 = -pthread -lrt -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined
-LDFLAGS2 := $(LDFLAGS1) -lblkid -lkmod
+LDFLAGS2 := $(LDFLAGS1) -L /tools/lib -lblkid -lkmod
DEF = -include cfg.h \
-DSYSCONFDIR=\"/etc\" \
@@ -42,7 +42,7 @@ DEF = -include cfg.h \
-DHAVE_FIRMWARE
INCLUDE = -I src/libudev -I src/shared -I src -I src/login -I src/systemd \
- -I src/core -I udev-lfs-$(SYSTEMD_VERSION)-1
+ -I src/core -I udev-lfs-$(VERSION)
LIBUDEV_SRCS = libudev-device-private.c \
libudev-device.c \
@@ -152,7 +152,6 @@ VPATH = src/login src/udev src/udev/accelerometer \
SED_PROCESS = \
sed -e 's|@VERSION@|$(SYSTEMD_VERSION)|g' \
-e 's|@prefix@|/usr|g' \
- -e 's|@exec_prefix@|/usr|g' \
-e 's|@udevlibexecdir@|/lib/udev|g' \
-e 's|@libdir@|/usr/lib|g' \
-e 's|@includedir@|/usr/include|g' \