Changeset 1ba5024 for CLFS/master.sh

Timestamp:

09/03/2006 03:56:19 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

03b3eba

Parents:

d14903f

Message:

Remove unnecessary flow tests. Added missing function, wrt_report. Added restore-luser-env to chroot build

File:

• CLFS/master.sh (modified) (2 diffs)

CLFS/master.sh

@@ -330 +330 @@
     pkg_tarball=$(get_package_tarball_name $name)
     
-    # This is very ugly:: util-linux is in /chroot but should be run under LUSER
-    # A custom collection of routines.
+    # This is very ugly:: util-linux is in /chroot but must be run under LUSER
+    # .. Customized makefile entry 
     case "${this_script}" in
       *util-linux) 
          LUSER_wrt_target "${this_script}" "$PREV"
-         [[ "$pkg_tarball" != "" ]] && LUSER_wrt_unpack "$pkg_tarball"
-         [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         LUSER_wrt_unpack "$pkg_tarball"
+         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
          LUSER_wrt_RunAsUser "${file}"
          LUSER_RemoveBuildDirs "${name}"
@@ -1182 +1182 @@
 cat << EOF
 
-all: mk_SETUP mk_CROSS mk_TEMP mk_SYSTOOLS mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE do-housekeeping
+all: mk_SETUP mk_CROSS mk_TEMP restore_luser_env mk_SYSTOOLS mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE do-housekeeping
         @\$(call echo_finished,$VERSION)