Changeset 08a4953 for HLFS

Timestamp:

08/30/2006 07:51:33 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

0cc18f7

Parents:

50fb011

Message:

corrections to HLFS code, makefile creation

File:

• HLFS/master.sh (modified) (7 diffs)

HLFS/master.sh

@@ -13 +13 @@
 #----------------------------#
   local toolchain=$1
-  local this_script=$2
+  local this_file=$2
   local tc_phase
   local binutil_tarball
@@ -19 +19 @@
   local TC_MountPT
   local remove_existing
-  
+
   tc_phase=`echo $toolchain | sed -e 's@[0-9]\{3\}-@@' -e 's@-toolchain@@'`
   case $tc_phase in
@@ -62 +62 @@
   case ${tc_phase} in
     butterfly)
-        [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
-        CHROOT_wrt_RunAsRoot "$toolchain" "$this_script"
+        [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${toolchain}"
+        CHROOT_wrt_RunAsRoot "$this_file"
       ;;
-    *)  LUSER_wrt_RunAsUser "$toolchain" "$this_script"
+    *)  LUSER_wrt_RunAsUser  "$this_file"
       ;;
   esac
@@ -128 +128 @@
         fi;
         @chown \$(LUSER) \$(MOUNT_PT)/tools && \\
+        chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\
         chown \$(LUSER) \$(MOUNT_PT)/sources && \\
         touch \$@ && \\
@@ -154 +155 @@
         chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bashrc && \\
         touch envars && \\
+        chown \$(LUSER) envars && \\
         touch \$@ && \\
         echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -554 +556 @@
   cat << EOF
 
-all:    mk_SETUP mk_LUSER mk_CHROOT mk_BOOT
+all:    mk_SETUP mk_LUSER mk_CHROOT mk_BOOT do-housekeeping
         @\$(call echo_finished,$VERSION)
 
@@ -591 +593 @@
 BOOT:   $chapter7
 
-
-
-  
-all:  chapter3 chapter5 chapter6 chapter7 do-housekeeping
-        @\$(call echo_finished,$VERSION)
-
-chapter3:  020-creatingtoolsdir 021-addinguser 022-settingenvironment
-
-chapter5:  chapter3 $chapter5 restore-luser-env
-
-chapter6:  chapter5 $chapter6
-
-chapter7:  chapter6 $chapter7
 
 clean-all:  clean