From 053b2060bbedf5187f62affe9ed61961940e46fa Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 21 Jan 2014 18:49:14 +0000 Subject: [PATCH] Moved util-linux final build to be after udev. Fixed up e2fsprogs and udev to use the Chapter 5 build of util-linux. Changed umount instructions in Chapter 9 to be compatible with changes in mounting /run as a tmpfs. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10448 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 2 +- chapter01/changelog.xml | 22 +++++++++++++++++----- chapter06/chapter06.xml | 2 +- chapter06/e2fsprogs.xml | 23 ++++++++++++++--------- chapter06/systemd.xml | 15 ++++++++++++++- chapter09/reboot.xml | 10 +--------- general.ent | 4 ++-- packages.ent | 4 ++-- 8 files changed, 52 insertions(+), 30 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 6b39cfc7d..d591ae91d 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -2055,7 +2055,7 @@ Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, - Kmod, Make, and Sed + Kmod, Make, Sed, and Util-linux diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8a2d666db..842d3d9ea 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,13 +39,25 @@ 2014-01-15 - [bdubbs] - Added a Chapter 5 build of util-linux after - udev to satify a circular dependency. This is not the - complete fix as this build has not yet been incorporated into - Chapter 6. + [bdubbs] - Moved util-linux final build to be after + udev. Fixed up e2fsprogs and udev to use the Chapter 5 + build of util-linux. Fixes + #3467. + + + + + + 2014-01-15 + + + [bdubbs] - Added a Chapter 5 build of util-linux in + preparation for moving the Chapter 6 build to after udev. + This is not the complete fix as this build has not yet + been incorporated into Chapter 6. - [bdubbs] - Moutn /run as a tmpfs for Chapter 6. + [bdubbs] - Mount /run as a tmpfs for Chapter 6. diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index b984f1a11..842b30a91 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -33,7 +33,6 @@ - @@ -73,6 +72,7 @@ + diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 6efb07619..bf4332ba9 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -52,7 +52,11 @@ cd build Prepare E2fsprogs for compilation: -../configure --prefix=/usr \ +export PKG_CONFIG_PATH=/tools/lib/pkgconfig + +LIBS=-L/tools/lib \ +CFLAGS=-I/tools/include \ +../configure --prefix=/usr \ --with-root-prefix="" \ --enable-elf-shlibs \ --disable-libblkid \ @@ -61,16 +65,16 @@ cd build --disable-fsck - The meaning of the configure options: - + --with-root-prefix="" @@ -127,9 +131,10 @@ cd build make install - Install the static libraries and headers: + Install the static libraries and headers and do some clean up: -make install-libs +make install-libs +unset PKG_CONFIG_PATH Make the installed static libraries writable so debugging symbols can be removed later: diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index ca1fa4b43..3af23cc38 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -53,7 +53,14 @@ tar -xvf ../&udev-lfs;.tar.bz2 - Compile the package: + Create two symbolic links to header files and set an + environment variable to properly use . + +ln -svf /tools/include/blkid /usr/include +ln -svf /tools/include/uuid /usr/include +export LD_LIBRARY_PATH=/tools/lib + + Install the package: make -f &udev-lfs;/Makefile.lfs @@ -80,6 +87,12 @@ following script to work. bash &udev-lfs;/init-net-rules.sh + + Do some cleanup: + +rm -fv /usr/include/{uuid,blkid} +unset LD_LIBRARY_PATH + diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml index d8d4aa00d..cf95c024f 100644 --- a/chapter09/reboot.xml +++ b/chapter09/reboot.xml @@ -87,16 +87,8 @@ Then unmount the virtual file systems: umount -v $LFS/dev/pts - -if [ -h $LFS/dev/shm ]; then - link=$(readlink $LFS/dev/shm) - umount -v $LFS/$link - unset link -else - umount -v $LFS/dev/shm -fi - umount -v $LFS/dev +umount -v $LFS/run umount -v $LFS/proc umount -v $LFS/sys diff --git a/general.ent b/general.ent index 5c98a5afe..f1254b5f9 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index 331b3e472..2df50fb4a 100644 --- a/packages.ent +++ b/packages.ent @@ -554,10 +554,10 @@ - + - +