Changeset 21dab83

Timestamp:

07/28/2006 03:55:40 AM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

a82bbc0

Parents:

65a2be6

Message:

Tweaking the hlfs code.. stomping on bugs

Files:

• Config.in (modified) (4 diffs)
• HLFS/master.sh (modified) (7 diffs)

Config.in

@@ -277 +277 @@
 
         config  CONFIG_RUNMAKE
-                bool "Run the makefile"
+                bool    "Run the makefile"
                 default n
                 help
                         #--- Automatically run the makefile once it has been created
+
+        config  CONFIG_REBUILD
+                bool    "Rebuild files"
+                default n
+                help
+                        Clean the build directory before performing any other task. The directory
+                        is cleaned only if it was populated by a previous JHALFS run.
 
         config  CONFIG_STRIP
@@ -388 +395 @@
            config       TEST
                 int
-                default "0"     if !CONFIG_TEST
+                default "0"     if !CONFIG_TESTS
                 default "1"     if TST_1
                 default "2"     if TST_2
@@ -432 +439 @@
                 default "letter"        if PAGE_LETTER
                 default "A4"            if PAGE_A4
-
-
-
 
         config BUILDDIR
@@ -525 +529 @@
                 default 1       if  CONFIG_FARCE
 
+        config  CLEAN
+                int
+                default 0       if !CONFIG_REBUILD
+                default 1       if  CONFIG_REBUILD

HLFS/master.sh

@@ -44 +44 @@
 }
 
+#----------------------------------#
+wrt_RunAsRoot() {                  # Some scripts must be run as root..
+#----------------------------------#
+  local user_ACCT=$(echo $1 | tr [a-z] [A-Z])
+  local this_script=$2
+  local file=$3
+
+(
+cat << EOF
+        @( time { export ${user_ACCT}=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
+        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
+EOF
+) >> $MKFILE.tmp
+}
+
+
 #----------------------------#
 process_toolchain() {        # embryo,cocoon and butterfly need special handling
@@ -59 +75 @@
   pkg_tarball=$(get_package_tarball_name "gcc-g++")
   wrt_Unpack_SetOwner "hlfs" "$pkg_tarball" 1
+
+  case ${toolchain} in
+    *butterfly*)
+      [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
+(
+cat << EOF
+        @echo "export PKGDIR=\$(SRC)" > envars
+EOF
+) >> $MKFILE.tmp
+      wrt_run_as_chroot1 "$toolchain" "$this_script"
+      ;;
+    *)
 (
 cat << EOF
@@ -64 +92 @@
 EOF
 ) >> $MKFILE.tmp
-  if [[ ${toolchain} = "butterfly-toolchain" ]]; then
-    [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
-    wrt_run_as_chroot1 "$toolchain" "$this_script"
-  else
-    wrt_ExecuteAsUser "hlfs" "$toolchain" "$this_script"
-  fi
+      wrt_ExecuteAsUser "hlfs" "$toolchain" "$this_script"
+      ;;
+  esac
 
   pkg_tarball=$(get_package_tarball_name "binutils")
@@ -75 +100 @@
   pkg_tarball=$(get_package_tarball_name "gcc-core")
   wrt_remove_existing_dirs  "$pkg_tarball"
-
+  #
   # Manually remove the toolchain directories..
   tc_phase=`echo $toolchain | sed -e 's@[0-9]\{3\}-@@' -e 's@-toolchain@@'`
-  case $tc_phase in 
-    embryo | cocoon)  # toolchain phase
 (
 cat << EOF
@@ -86 +109 @@
 EOF
 ) >> $MKFILE.tmp
-    ;;    
-    butterfly ) # system phase
-(
-cat << EOF
-        @rm -r \$(SRC)/butterfly-toolchain && \\
-        rm -r \$(SRC)/butterfly-build
-EOF
-) >> $MKFILE.tmp
-    ;;
-  esac
 
 }
@@ -377 +390 @@
     case "${this_script}" in
       *kernfs*)
-        wrt_run_as_root "${this_script}" "${file}"
+        wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
         ;;
       *)   # The rest of Chapter06
@@ -422 +435 @@
       *usage)   continue  ;; # Contains example commands
       *grub)    continue  ;;
-      *reboot)  continue  ;;
       *console) continue  ;; # Use the file generated by lfs-bootscripts