From 3f06eb53eaa047b17b15e14edb9f48f58f4b2649 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 2 Mar 2012 16:41:39 +0000 Subject: [PATCH] LFS-7.1 git-svn-id: http://svn.linuxfromscratch.org/LFS/tags/7.1@9758 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- bootscripts/lfs/init.d/mountfs | 4 ++- bootscripts/lfs/sbin/ifup | 21 ++++++++---- chapter01/changelog.xml | 61 +++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 4 +++ chapter02/creatingpartition.xml | 9 +++++ chapter03/patches.xml | 8 +++++ chapter06/glibc.xml | 3 +- chapter06/m4.xml | 6 ++-- general.ent | 6 ++-- packages.ent | 4 +-- patches.ent | 4 +++ prologue/hostreqs.xml | 13 +++---- prologue/why.xml | 4 +-- 13 files changed, 122 insertions(+), 25 deletions(-) diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs index 74e87baff..40a69eefa 100644 --- a/bootscripts/lfs/init.d/mountfs +++ b/bootscripts/lfs/init.d/mountfs @@ -64,7 +64,9 @@ case "${1}" in log_info_msg "Unmounting all other currently mounted file systems..." umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs >/dev/null evaluate_retval - exit 0 + + # Make all LVM volume groups unavailable, if appropriate + if [ -x /sbin/vgchange ]; then /sbin/vgchange -an; fi ;; *) diff --git a/bootscripts/lfs/sbin/ifup b/bootscripts/lfs/sbin/ifup index 744b4cea2..2facbe8be 100755 --- a/bootscripts/lfs/sbin/ifup +++ b/bootscripts/lfs/sbin/ifup @@ -58,27 +58,27 @@ file=/etc/sysconfig/ifconfig.${1} log_info_msg "Bringing up the ${1} interface... " if [ ! -r "${file}" ]; then - log_warning_msg "\n${file} is missing or cannot be accessed." + log_failure_msg2 "${file} is missing or cannot be accessed." exit 1 fi . $file if [ "$IFACE" = "" ]; then - log_failure_msg "\n${file} does not define an interface [IFACE]." + log_failure_msg2 "${file} does not define an interface [IFACE]." exit 1 fi # Do not process this service if started by boot, and ONBOOT # is not set to yes if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then - log_info_msg2 "skipped\n" + log_info_msg2 "skipped" exit 0 fi for S in ${SERVICE}; do if [ ! -x "/lib/services/${S}" ]; then - MSG="\nUnable to process ${file}. Either " + MSG="\n Unable to process ${file}. Either " MSG="${MSG}the SERVICE '${S} was not present " MSG="${MSG}or cannot be executed." log_failure_msg "$MSG" @@ -102,11 +102,20 @@ if [ -z "${CHECK_LINK}" -o \ fi else - log_warning_msg "\nInterface ${IFACE} doesn't exist." - exit 0 + log_failure_msg2 "Interface ${IFACE} doesn't exist." + exit 1 fi fi +# Set MTU if requested. Check if MTU has a "good" value. +if test -n "${MTU}"; then + if [[ ${MTU} =~ ^[0-9]+$ ]] && [[ $MTU -ge 68 ]] ; then + ip link set dev ${IFACE} mtu $MTU + else + log_info_msg2 "Invalid MTU $MTU" + fi +fi + for S in ${SERVICE}; do IFCONFIG=${file} /lib/services/${S} ${IFACE} up done diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 59ffb66a5..ec0a19da1 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,67 @@ --> + + 2012-03-02 + + + [bdubbs] - LFS-7.1 released. + + + + + + 2012-02-24 + + + [bdubbs] - Minor changes to ifup boot script. + + + + + + 2012-02-24 + + + [bdubbs] - Add a patch for glibc that fixes a problem + (segfault) for dlopen() in some cases. + + + + + + 2012-02-23 + + + [bdubbs] - Add a note in section about partitioning using + advanced techniques (e.g. RAID and LVM). + + + + + + 2012-02-20 + + + [bdubbs] - LFS-7.1-rc1 released. + + + + + + 2012-02-19 + + + [bdubbs] - Add sed to the m4 package to fix a false test + error. Fixes #3022. + + + [bdubbs] - Update mountfs script to support LVM volumes when + stopping. + + + + 2012-02-15 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 0ab59263f..a67293735 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -219,6 +219,10 @@ Added: + + &glibc-sort-patch; + + Kmod-&kmod-version; diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml index 6ccf0aa4b..d235a8bdc 100644 --- a/chapter02/creatingpartition.xml +++ b/chapter02/creatingpartition.xml @@ -57,6 +57,15 @@ refer to cfdisk(8) or fdisk(8) if you do not yet know how to use the programs. + For experienced users, other partitioning schemes are possible. + The new LFS system can be on a software RAID array or an LVM logical volume. + However, some of these options require an initramfs, which is + an advanced topic. These partitioning methodologies are not recommended for + first time LFS users. + Remember the designation of the new partition (e.g., hda5). This book will refer to this as the LFS partition. Also remember the designation of the + + Glibc Bug Sort Relocatable Objects Patch - &glibc-sort-patch-size;: + + Download: + MD5 sum: &glibc-sort-patch-md5; + + + Glibc GCC Build Fix Patch - &glibc-gcc_fix-patch-size;: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 33beee5bf..37ec19105 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -102,7 +102,8 @@ unset DL Fix a couple of bugs in Glibc that can cause crashes and core dumps: -patch -Np1 -i ../&glibc-fixes-patch; +patch -Np1 -i ../&glibc-fixes-patch; +patch -Np1 -i ../&glibc-sort-patch; Fix a bug that prevents Glibc from building with GCC-&gcc-version;: diff --git a/chapter06/m4.xml b/chapter06/m4.xml index c22282c1d..fcbb8f672 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -48,9 +48,11 @@ make - To test the results, issue: + + To test the results, first fix a test program and then run the test programs: -make check +sed -i -e '41s/ENOENT/& || errno == EINVAL/' tests/test-readlink.h +make check Install the package: diff --git a/general.ent b/general.ent index d26a776d9..cc314583c 100644 --- a/general.ent +++ b/general.ent @@ -1,8 +1,8 @@ - - + + - + diff --git a/packages.ent b/packages.ent index 4a14c75a2..450105b0c 100644 --- a/packages.ent +++ b/packages.ent @@ -305,7 +305,7 @@ - + @@ -535,7 +535,7 @@ - + diff --git a/patches.ent b/patches.ent index 3cfc4eee6..ec40be708 100644 --- a/patches.ent +++ b/patches.ent @@ -51,6 +51,10 @@ + + + + diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml index 5961b773a..cf7c711e0 100644 --- a/prologue/hostreqs.xml +++ b/prologue/hostreqs.xml @@ -146,18 +146,16 @@ To see whether your host system has all the appropriate versions, and the ability to compile programs, run the following: - + cat > version-check.sh << "EOF" #!/bin/bash -export LC_ALL=C - # Simple script to list version numbers of critical development tools +export LC_ALL=C bash --version | head -n1 | cut -d" " -f2-4 echo "/bin/sh -> `readlink -f /bin/sh`" echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3- bison --version | head -n1 - if [ -e /usr/bin/yacc ]; then echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; else echo "yacc not found"; fi @@ -167,7 +165,6 @@ echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2 diff --version | head -n1 find --version | head -n1 gawk --version | head -n1 - if [ -e /usr/bin/awk ]; then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; else echo "awk not found"; fi @@ -187,10 +184,10 @@ echo "Texinfo: `makeinfo --version | head -n1`" xz --version | head -n1 echo 'main(){}' > dummy.c && gcc -o dummy dummy.c -if [ -x dummy ]; then echo "gcc compilation OK"; +if [ -x dummy ] + then echo "gcc compilation OK"; else echo "gcc compilation failed"; fi -rm -f dummy.c dummy - +rm -f dummy.c dummy EOF bash version-check.sh diff --git a/prologue/why.xml b/prologue/why.xml index d603fba62..9de025bc0 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -327,7 +327,7 @@ by the diff program. It is needed by the build procedure for several LFS packages. - + Perl