r54 - in trunk/text: chapter05 chapter06

robert at linuxfromscratch.org robert at linuxfromscratch.org
Wed Jan 5 23:34:30 PST 2005


Author: robert
Date: 2005-01-06 00:34:29 -0700 (Thu, 06 Jan 2005)
New Revision: 54

Modified:
   trunk/text/chapter05/15-diffutils.txt
   trunk/text/chapter05/18-grep.txt
   trunk/text/chapter05/24-bzip2.txt
   trunk/text/chapter05/27-bash.txt
   trunk/text/chapter06/33-autoconf.txt
   trunk/text/chapter06/34-automake.txt
   trunk/text/chapter06/35-bash.txt
   trunk/text/chapter06/36-file.txt
   trunk/text/chapter06/37-libtool.txt
   trunk/text/chapter06/38-bzip2.txt
   trunk/text/chapter06/39-diffutils.txt
   trunk/text/chapter06/40-kbd.txt
   trunk/text/chapter06/41-e2fsprogs.txt
   trunk/text/chapter06/42-grep.txt
   trunk/text/chapter06/43-grub.txt
   trunk/text/chapter06/44-gzip.txt
   trunk/text/chapter06/46-man.txt
   trunk/text/chapter06/47-make.txt
   trunk/text/chapter06/48-module-init-tools.txt
   trunk/text/chapter06/49-patch.txt
   trunk/text/chapter06/51-psmisc.txt
   trunk/text/chapter06/52-shadow.txt
   trunk/text/chapter06/53-libol.txt
   trunk/text/chapter06/54-syslog-ng.txt
   trunk/text/chapter06/55-sysvinit.txt
   trunk/text/chapter06/56-tar.txt
   trunk/text/chapter06/58-util-linux.txt
   trunk/text/chapter06/59-stripping.txt
   trunk/text/chapter06/60-revisedchroot.txt
Log:
finished updating chapter 6

Modified: trunk/text/chapter05/15-diffutils.txt
===================================================================
--- trunk/text/chapter05/15-diffutils.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter05/15-diffutils.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,5 @@
 - Chapter 5 - Installing Diffutils 2.8.1
 
-env CC="gcc -pie -fPIE" \
 ./configure --prefix=/tools ${disable_nls} &&
 make &&
 make install

Modified: trunk/text/chapter05/18-grep.txt
===================================================================
--- trunk/text/chapter05/18-grep.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter05/18-grep.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,5 @@
 - Chapter 5 - Installing Grep 2.5.1a
 
-env CC="gcc -pie -fPIE" \
 ./configure --prefix=/tools ${disable_nls} \
 	--disable-perl-regexp --with-included-regex &&
 make &&

Modified: trunk/text/chapter05/24-bzip2.txt
===================================================================
--- trunk/text/chapter05/24-bzip2.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter05/24-bzip2.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -3,6 +3,6 @@
 # This is installed late to work around the uClibc bug in Tar-1.14* which may
 # exist on the host system.
 
-make &&
+make CC="gcc -pie -fPIE" &&
 make PREFIX=/tools install
 

Modified: trunk/text/chapter05/27-bash.txt
===================================================================
--- trunk/text/chapter05/27-bash.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter05/27-bash.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -6,7 +6,6 @@
 
 # Then build and install Bash.
 
-env CC="gcc -pie -fPIE" \
 ./configure --prefix=/tools ${disable_nls} \
 	--without-bash-malloc &&
 make &&

Modified: trunk/text/chapter06/33-autoconf.txt
===================================================================
--- trunk/text/chapter06/33-autoconf.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/33-autoconf.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,6 @@
 - Chapter 6 - Autoconf 2.59
 
-./configure --prefix=/usr --disable-nls &&
+./configure --prefix=/usr ${disable_nls} &&
 make
 
 # Run the tests if you like, they should all pass.

Modified: trunk/text/chapter06/34-automake.txt
===================================================================
--- trunk/text/chapter06/34-automake.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/34-automake.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,6 @@
-- Chapter 6 - Installing Automake 1.9.3
+- Chapter 6 - Installing Automake 1.9.4
 
-./configure --prefix=/usr --disable-nls &&
+./configure --prefix=/usr ${disable_nls} &&
 make
 
 # Run the tests if you like, they should all pass.

Modified: trunk/text/chapter06/35-bash.txt
===================================================================
--- trunk/text/chapter06/35-bash.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/35-bash.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,7 +1,11 @@
 - Chapter 6 - Installing Bash 3.0
 
-# First patch Bash for known bugs.
+# Use this patch if you are using Glibc.
 
+patch -Np1 -i ../bash-3.0-avoid_WCONTINUED-1.patch
+
+# This patch fixes various issues with Bash.
+
 patch -Np1 -i ../bash-3.0-fixes-1.patch
 
 # We have a few options on how to install Bash. Bash is needed to preform
@@ -23,7 +27,7 @@
 # with useradd.
 
 ./configure --prefix=/usr --bindir=/bin --enable-static-link \
-    --without-bash-malloc --with-installed-readline --disable-nls &&
+	--without-bash-malloc --with-installed-readline ${disable_nls} &&
 make
 
 # If you want to run the testsuite do that here. All tests should pass.
@@ -37,7 +41,8 @@
 mv /bin/bash /bin/bash-static &&
 ln -sf bash-static /bin/sh &&
 ./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline --disable-nls &&
+	--without-bash-malloc --with-installed-readline \
+	${disable_nls} &&
 make
 
 # You may also want to run the tests on this Bash. All tests should pass.
@@ -53,7 +58,7 @@
 # Option B: Build and install a static version of Bash.
 
 ./configure --prefix=/usr --bindir=/bin --enable-static-link \
-    --without-bash-malloc --with-installed-readline --disable-nls &&
+    --without-bash-malloc --with-installed-readline ${disable_nls} &&
 make
 
 # Run the testsuite if you like. All tests should pass.
@@ -68,7 +73,7 @@
 # Option C: Build and install a shared version of Bash.
 
 ./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline --disable-nls &&
+    --without-bash-malloc --with-installed-readline ${disable_nls} &&
 make
 
 # Run the testsuite if you like. All tests should pass.

Modified: trunk/text/chapter06/36-file.txt
===================================================================
--- trunk/text/chapter06/36-file.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/36-file.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,6 @@
 - Chapter 6 - Installing File 4.12
 
-./configure --prefix=/usr --disable-nls &&
+./configure --prefix=/usr ${disable_nls} &&
 make &&
 make install
 

Modified: trunk/text/chapter06/37-libtool.txt
===================================================================
--- trunk/text/chapter06/37-libtool.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/37-libtool.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,6 @@
 - Chapter 6 - Installing Libtool 1.5.10
 
-./configure --prefix=/usr --disable-nls &&
+./configure --prefix=/usr ${disable_nls} &&
 make
 
 # Run the testsuite if you like. All tests should pass.

Modified: trunk/text/chapter06/38-bzip2.txt
===================================================================
--- trunk/text/chapter06/38-bzip2.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/38-bzip2.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -2,7 +2,7 @@
 
 make -f Makefile-libbz2_so &&
 make clean &&
-make &&
+make CC="gcc -pie -fPIE" &&
 make install &&
 install bzip2-shared /bin/bzip2 &&
 cp -a libbz2.so* /lib &&

Modified: trunk/text/chapter06/39-diffutils.txt
===================================================================
--- trunk/text/chapter06/39-diffutils.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/39-diffutils.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,6 @@
 - Chapter 6 - Installing Diffutils 2.8.1
 
-./configure --prefix=/usr --disable-nls &&
+./configure --prefix=/usr ${disable_nls} &&
 make &&
 make install
 

Modified: trunk/text/chapter06/40-kbd.txt
===================================================================
--- trunk/text/chapter06/40-kbd.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/40-kbd.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,6 @@
 - Chapter 6 - Installing Kbd 1.12
 
 ./configure &&
-make &&
+make CC="gcc -pie -fPIE" &&
 make install
 

Modified: trunk/text/chapter06/41-e2fsprogs.txt
===================================================================
--- trunk/text/chapter06/41-e2fsprogs.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/41-e2fsprogs.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -7,7 +7,7 @@
 install -d build &&
 cd build &&
 ../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs --disable-evms --disable-nls &&
+	--enable-elf-shlibs --disable-evms ${disable_nls} &&
 make
 
 # Run the testsuite if you like. All the tests should pass.

Modified: trunk/text/chapter06/42-grep.txt
===================================================================
--- trunk/text/chapter06/42-grep.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/42-grep.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -5,12 +5,12 @@
 
 env LDFLAGS=-static \
 ./configure --prefix=/usr --bindir=/bin --with-included-regex \
-	--disable-nls
+	${disable_nls}
 
 # If you prefer to link Grep dynamically use this command.
 
 ./configure --prefix=/usr --bindir=/bin --with-included-regex \
-        --disable-nls
+	${disable_nls}
 
 # Then compile Grep.
 

Modified: trunk/text/chapter06/43-grub.txt
===================================================================
--- trunk/text/chapter06/43-grub.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/43-grub.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -4,8 +4,8 @@
 # statically linked instead. Grub can not be built with the stack guard
 # either.
 
-env CFLAGS="-fno-stack-protector -no-pie -static -O2" \
-./configure --prefix=/usr --disable-nls &&
+env CC="gcc -fno-stack-protector -no-pie" \
+./configure --prefix=/usr ${disable_nls} &&
 make
 
 # Run the testsuite if you like. The ffs test is known to always fail.

Modified: trunk/text/chapter06/44-gzip.txt
===================================================================
--- trunk/text/chapter06/44-gzip.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/44-gzip.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -2,8 +2,8 @@
 
 # See chapter 5's Gzip page for an explaination to the DEFS variable.
 
-env DEFS=NO_ASM \
-./configure --prefix=/usr --disable-nls &&
+env DEFS=NO_ASM CC="gcc -pie -fPIE" \
+./configure --prefix=/usr ${disable_nls} &&
 sed -i 's@"BINDIR"@/bin at g' gzexe.in &&
 make &&
 make install &&

Modified: trunk/text/chapter06/46-man.txt
===================================================================
--- trunk/text/chapter06/46-man.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/46-man.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,11 +1,22 @@
 - Chapter 6 - Installing Man 1.5o1
 
-# "+lang none" is like --disable-nls.
-
 patch -Np1 -i ../man-1.5o1-80cols-1.patch &&
 sed -i 's at -is@&R at g' configure &&
-sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in &&
-./configure -confdir=/etc +lang none &&
+sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in
+
+# "+lang none" is like --disable-nls. If you want to disable native language
+# support use this command.
+
+CC="gcc -pie -fPIE" \
+./configure -confdir=/etc +lang none
+
+# Else use this one.
+
+CC="gcc -pie -fPIE" \
+./configure -confdir=/etc
+
+# Then make Man.
+
 make &&
 make install
 

Modified: trunk/text/chapter06/47-make.txt
===================================================================
--- trunk/text/chapter06/47-make.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/47-make.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,7 @@
 - Chapter 6 - Installing Make 3.80
 
-./configure --prefix=/usr --disable-nls &&
+env CC="gcc -pie -fPIE" \
+./configure --prefix=/usr ${disable_nls} &&
 make
 
 # Run the testsuite if you like. All the tests should pass.

Modified: trunk/text/chapter06/48-module-init-tools.txt
===================================================================
--- trunk/text/chapter06/48-module-init-tools.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/48-module-init-tools.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,6 @@
 - Chapter 6 - Module-Init-Tools 3.1
 
-./configure --prefix="" --enable-zlib --disable-nls &&
+./configure --prefix="" --enable-zlib ${disable_nls} &&
 make DOCBOOKTOMAN=""
 
 # Run the testsuite if you like. The one test should pass.

Modified: trunk/text/chapter06/49-patch.txt
===================================================================
--- trunk/text/chapter06/49-patch.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/49-patch.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,7 @@
 - Chapter 6 - Patch 2.5.9
 
-./configure --prefix=/usr --disable-nls &&
+env CC="gcc -pie -fPIE" \
+./configure --prefix=/usr ${disable_nls} &&
 make &&
 make install
 

Modified: trunk/text/chapter06/51-psmisc.txt
===================================================================
--- trunk/text/chapter06/51-psmisc.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/51-psmisc.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,8 @@
 - Chapter 6 - Installing Psmisc 21.5
 
-./configure --prefix=/usr --exec-prefix="" --disable-nls &&
+env CC="gcc -pie -fPIE" \
+./configure --prefix=/usr --exec-prefix="" \
+	${disable_nls} &&
 make &&
 make install &&
 mv /bin/pstree* /usr/bin &&

Modified: trunk/text/chapter06/52-shadow.txt
===================================================================
--- trunk/text/chapter06/52-shadow.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/52-shadow.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,18 +1,26 @@
 - Chapter 6 - Installing Shadow 4.0.6
 
-patch -Np1 -i ../shadow-4.0.6-uclibc-1.patch &&
-./configure --libdir=/usr/lib --enable-shared --disable-nls &&
+# This patch is needed for uClibc.
+
+patch -Np1 -i ../shadow-4.0.6-uclibc-1.patch
+
+#
+
+./configure --libdir=/lib --enable-shared ${disable_nls} &&
+sed -i 's/groups$(EXEEXT) //' src/Makefile &&
+sed -i '/groups/d' man/Makefile &&
 make &&
+make install &&
 install -m644 etc/{limits,login.access} /etc &&
 sed -e's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
-        -e 's@/var/spool/mail@/var/mail@' \
-        < etc/login.defs.linux > etc/login.defs.new &&
+	-e 's@/var/spool/mail@/var/mail@' \
+	< etc/login.defs.linux > etc/login.defs.new &&
 install -m644 etc/login.defs.new /etc/login.defs &&
 mv /usr/bin/passwd /bin &&
-mv /usr/lib/libshadow.so.0* /lib &&
+mv /lib/libshadow.*a /usr/lib &&
+rm /lib/libshadow.so &&
 ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &&
-install -d /etc/default &&
-rm /bin/groups
+install -d /etc/default
 
 # Then configure shadow. If you don't plan to use group passwords then
 # don't enable them.

Modified: trunk/text/chapter06/53-libol.txt
===================================================================
--- trunk/text/chapter06/53-libol.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/53-libol.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,7 @@
 - Chapter 6 - Installing Libol 0.3.14
 
-./configure --prefix=/usr --enable-shared --disable-nls &&
+./configure --prefix=/usr --enable-shared \
+	${disable_nls} &&
 make &&
 make install
 

Modified: trunk/text/chapter06/54-syslog-ng.txt
===================================================================
--- trunk/text/chapter06/54-syslog-ng.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/54-syslog-ng.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,6 +1,8 @@
 - Chapter 6 - Installing Syslog-ng 1.6.5
 
-./configure --prefix=/usr --sysconfdir=/etc --disable-nls &&
+env CC="gcc -pie -fPIE" \
+./configure --prefix=/usr --sysconfdir=/etc \
+	${disable_nls} &&
 make &&
 make install
 

Modified: trunk/text/chapter06/55-sysvinit.txt
===================================================================
--- trunk/text/chapter06/55-sysvinit.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/55-sysvinit.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,9 +1,8 @@
-- Chapter 6 - Installing Sysvinit 2.85
+- Chapter 6 - Installing Sysvinit 2.86
 
-patch -Np1 -i ../sysvinit-2.85-proclen-1.patch &&
 sed -i 's at Sending processes@& started by init at g' \
     src/init.c &&
-make -C src &&
+make -C src CC="gcc -pie -fPIE" &&
 make -C src install
 
 # Then create a configuration file.

Modified: trunk/text/chapter06/56-tar.txt
===================================================================
--- trunk/text/chapter06/56-tar.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/56-tar.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,8 +1,8 @@
-- Chapter 6 - Installing Tar 1.14
+- Chapter 6 - Installing Tar 1.15.1
 
-patch -Np1 -i ../tar-1.14-bzip2uClibc-1.patch &&
-./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin \
-	--disable-nls &&
+env CC="gcc -pie -fPIE" \
+./configure --prefix=/usr --bindir=/bin \
+	--libexecdir=/usr/sbin ${disable_nls} &&
 make
 
 # Run the testsuite if you like. 3 of 24 tests may fail.

Modified: trunk/text/chapter06/58-util-linux.txt
===================================================================
--- trunk/text/chapter06/58-util-linux.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/58-util-linux.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -1,13 +1,17 @@
-- Chapter 6 - Installing Util-linux 2.12j
+- Chapter 6 - Installing Util-linux 2.12p
 
 # First apply this patch. This is needed regardless whether you will
 # link Util-linux statically or not because our GCC compiles PIC by
 # default. Also reset the path to 'adjtime' and create the directory.
 
-patch -Np1 -i ../util-linux-2.12j-fPIC-1.patch &&
+patch -Np1 -i ../util-linux-2.12p-fPIC-1.patch &&
 sed -i 's at etc/adjtime at var/lib/hwclock/adjtime at g' hwclock/hwclock.c &&
 install -d /var/lib/hwclock
 
+# This patch fixes a problem util-linux has with newer libc-linux-headers.
+
+patch -Np1 -i ../util-linux-2.12p-cramfs-1.patch
+
 # We suggest that you install this package with static linking because
 # some of these programs are critical for booting. If you would like
 # to compile this package with static linking use the following command.
@@ -16,7 +20,7 @@
 
 # If you would like to use dynamic linking use this command.
 
-./configure
+env CC="gcc -pie -fPIE" ./configure
 
 # Then compile Util-linux.
 

Modified: trunk/text/chapter06/59-stripping.txt
===================================================================
--- trunk/text/chapter06/59-stripping.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/59-stripping.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -6,14 +6,14 @@
 # Chroot back in using /tools/bin/bash as the shell.
 
 chroot $LFS /tools/bin/env -i \
-    HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-    /tools/bin/bash --login
+	HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+	/tools/bin/bash --login
 
 # Then strip the new system.
 
 /tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'
+	-exec /tools/bin/strip --strip-debug '{}' ';'
 
 # The system should be about 1.1GB including /tools and /sources.
 # About 800MB without /tools and /sources.

Modified: trunk/text/chapter06/60-revisedchroot.txt
===================================================================
--- trunk/text/chapter06/60-revisedchroot.txt	2005-01-05 21:26:06 UTC (rev 53)
+++ trunk/text/chapter06/60-revisedchroot.txt	2005-01-06 07:34:29 UTC (rev 54)
@@ -7,7 +7,7 @@
 # Then chroot back in.
 
 chroot "$LFS" /usr/bin/env -i \
-    HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-    /bin/bash --login
+	HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+	/bin/bash --login
 




More information about the hlfs-dev mailing list