r2486 - in jhalfs/branches/experimental: . LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Apr 7 10:27:23 PDT 2006


Author: manuel
Date: 2006-04-07 11:27:23 -0600 (Fri, 07 Apr 2006)
New Revision: 2486

Modified:
   jhalfs/branches/experimental/LFS/master.sh
   jhalfs/branches/experimental/README
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/master.sh
Log:
Merged r2481:2485 from trunk.

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-04-07 17:23:31 UTC (rev 2485)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-04-07 17:27:23 UTC (rev 2486)
@@ -69,11 +69,14 @@
     this_script=`basename $file`
 
     # If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
+    # Fix also locales creation when running chapter05 testsuites (ugly)
     case "${this_script}" in
       *tcl)       [[ "${TEST}" = "0" ]] && continue ;;
       *expect)    [[ "${TEST}" = "0" ]] && continue ;;
       *dejagnu)   [[ "${TEST}" = "0" ]] && continue ;;
       *stripping) [[ "${STRIP}" = "0" ]] && continue ;;
+      *glibc)     [[ "${TEST}" = "3" ]] && \
+                  sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
     esac
 
     # First append each name of the script files to a list (this will become
@@ -114,7 +117,11 @@
 
     # Insert date and disk usage at the top of the log file, the script run
     # and date and disk usage again at the bottom of the log file.
-    wrt_run_as_su "${this_script}" "$file"
+    # The changingowner script must be run as root.
+    case "${this_script}" in
+      *changingowner)  wrt_run_as_root    "${this_script}" "$file" ;;
+      *)               wrt_run_as_su      "${this_script}" "$file" ;;
+    esac
 
     # Remove the build directory(ies) except if the package build fails
     # (so we can review config.cache, config.log, etc.)

Modified: jhalfs/branches/experimental/README
===================================================================
--- jhalfs/branches/experimental/README	2006-04-07 17:23:31 UTC (rev 2485)
+++ jhalfs/branches/experimental/README	2006-04-07 17:27:23 UTC (rev 2486)
@@ -77,12 +77,12 @@
     A. Yes it does..
 
     Q. "What is the function of the SRC_ARCHIVE variable
-    A. When the makefile runs it creates a local copy of the necessary packages
-       in BUILDDIR/sources by downloading the files. If the variable SRC_ARCHIVE
-       is defined the software will first look in this location for the file and,
-       if found, will copy it to BUILDDIR/sources. If the files are not found in 
-       SRC_ARCHIVE _and_ you have write priv to the directory any downloaded 
-       files will be mirrored there.
+    A. When then symlinked master.sh runs it creates a local copy of the
+       necessary packages in BUILDDIR/sources by downloading the files. If 
+       the variable SRC_ARCHIVE is defined the software will first look in 
+       this location for the file and, if found, will copy it to BUILDDIR/sources.
+       If the files are not found in SRC_ARCHIVE _and_ you have write priv to 
+       the directory any downloaded files will be mirrored there.
 
     Q. "Why have 2 copies of the files."
     A. The package files must be visible during the chroot phase and this is a 

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-04-07 17:23:31 UTC (rev 2485)
+++ jhalfs/branches/experimental/common/common-functions	2006-04-07 17:27:23 UTC (rev 2486)
@@ -49,7 +49,6 @@
 ${BOLD}  -B, --book VER${OFF}
         checkout VER version of the book. Supported versions at this time are:
         dev* | trunk | SVN     aliases for Development {C,H,B}LFS
-        alpha*                 aliases for the LFS alphabetical branch
         udev*                  aliases for the LFS udev_update branch
 
 ${BOLD}  -D  --directory DIR${OFF}

Modified: jhalfs/branches/experimental/master.sh
===================================================================
--- jhalfs/branches/experimental/master.sh	2006-04-07 17:23:31 UTC (rev 2485)
+++ jhalfs/branches/experimental/master.sh	2006-04-07 17:27:23 UTC (rev 2486)
@@ -113,7 +113,6 @@
                  echo "For stable 6.1.1 book, please use jhalfs-0.2."
                  exit 0
                 ;;
-               alpha*) LFSVRS=alphabetical  ;;
                udev*)  LFSVRS=udev_update   ;;
                * )     echo "$1 is an unsupported version at this time." ;;
              esac




More information about the alfs-log mailing list