Changeset a241c33 for LFS/master.sh

Timestamp:

04/06/2006 10:41:47 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

775945f

Parents:

877cc6a

Message:

Fixed locales creation when running chapter05 test suites.
Fixed the run of changingowner script on udev_update branch.

File:

• LFS/master.sh (modified) (3 diffs)

LFS/master.sh

@@ -70 +70 @@
 
     # 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 ;;
@@ -75 +76 @@
       *dejagnu)   [[ "${TEST}" = "0" ]] && continue ;;
       *stripping) [[ "${STRIP}" = "0" ]] && continue ;;
+      *glibc)     [[ "${TEST}" = "3" ]] && \
+                  sed -i 's@/usr/lib/locale@/tools&@' $file
     esac
 
@@ -115 +118 @@
     # 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