r2360 - in jhalfs/branches/experimental: CLFS HLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Fri Mar 17 19:46:55 PST 2006


Author: georgeb
Date: 2006-03-17 20:46:54 -0700 (Fri, 17 Mar 2006)
New Revision: 2360

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/HLFS/master.sh
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/config
Log:
corrections to hlfs group, build makefile

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-17 21:40:15 UTC (rev 2359)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-18 03:46:54 UTC (rev 2360)
@@ -287,7 +287,7 @@
     #
     # If $vrs isn't empty, we've got a package...
     #
-    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar"
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar" &&  echo -e '\ttrue' >> $MKFILE.tmp
     #
     wrt_run_as_lfs "${this_script}" "${file}"
     #
@@ -339,7 +339,7 @@
     # If $vrs isn't empty, we've got a package...
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
     #
-    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar"
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar" && echo -e '\ttrue' >> $MKFILE.tmp
     #
     wrt_run_as_lfs "${this_script}" "${file}"
     #
@@ -488,8 +488,11 @@
     #
     if [ "$vrs" != "" ] ; then
       case $this_script in
-        *util-linux)    wrt_unpack  "$name-$vrs.tar"   ;;
-        *)              wrt_unpack2 "$name-$vrs.tar.*" ;;
+        *util-linux)    wrt_unpack  "$name-$vrs.tar"
+                        echo -e '\ttrue' >> $MKFILE.tmp
+            ;;
+        *)              wrt_unpack2 "$name-$vrs.tar.*"
+            ;;
       esac
     fi
     #

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-03-17 21:40:15 UTC (rev 2359)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-03-18 03:46:54 UTC (rev 2360)
@@ -176,6 +176,8 @@
       *tcl* )     [[ "$TEST" = "0" ]] && continue; ;;
       *expect* )  [[ "$TEST" = "0" ]] && continue; ;;
       *dejagnu* ) [[ "$TEST" = "0" ]] && continue; ;;
+        # Nothing interestin in this script
+      *introduction* ) continue ;;
         # Test if the stripping phase must be skipped
       *stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
         # Select the appropriate library
@@ -500,7 +502,7 @@
       wrt_unpack2 "$FILE"
 (
 cat  << EOF
-	echo "\$(MOUNT_PT)\$(SRC)/blfs-bootscripts-$vrs" > sources-dir
+	@echo "\$(MOUNT_PT)\$(SRC)/blfs-bootscripts-$vrs" > sources-dir
 EOF
 ) >> $MKFILE.tmp
     fi
@@ -648,10 +650,10 @@
 restore-hlfs-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/lfs/.bashrc.XXX ]; then \\
-		mv -fv /home/lfs/.bashrc.XXX /home/hlfs/.bashrc; \\
+		mv -fv /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\
 	fi;
-	@if [ -f /home/hlfs/.bash_profile.XXX ]; then \\
-		mv -v /home/lfs/.bash_profile.XXX /home/hlfs/.bash_profile; \\
+	@if [ -f /home/lfs/.bash_profile.XXX ]; then \\
+		mv -v /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
 	fi;
 	@chown lfs:lfs /home/lfs/.bash* && \\
 	touch \$@

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-03-17 21:40:15 UTC (rev 2359)
+++ jhalfs/branches/experimental/common/common-functions	2006-03-18 03:46:54 UTC (rev 2360)
@@ -222,7 +222,7 @@
 	@\$(call unpack,$FILE)
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
-	chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT  && \\
+	chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
 EOF
 ) >> $MKFILE.tmp
 }
@@ -237,7 +237,6 @@
 	@\$(call unpack3,$FILE)
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
-
 	chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
 EOF
 ) >> $MKFILE.tmp
@@ -278,7 +277,7 @@
 #----------------------------------#
 (
 cat  << EOF
-	echo "export target=$(uname -m)-${TARGET}" >> envars && \\
+	@echo "export target=$(uname -m)-${TARGET}" >> envars && \\
 	echo "export ldso=/lib/${LOADER}" >> envars
 EOF
 ) >> $MKFILE.tmp

Modified: jhalfs/branches/experimental/common/config
===================================================================
--- jhalfs/branches/experimental/common/config	2006-03-17 21:40:15 UTC (rev 2359)
+++ jhalfs/branches/experimental/common/config	2006-03-18 03:46:54 UTC (rev 2360)
@@ -13,7 +13,7 @@
 
 #--- The local repository for packages/file
 #    Any downloaded files will be archived here
-SRC_ARCHIVE=
+SRC_ARCHIVE=/mnt/SourceFiles/Source_Warehouse
 
 #--- Download the source packages 0(no)/1(yes)
 HPKG=0
@@ -26,10 +26,10 @@
 #  1 = only chapter06 Glibc, GCC and Binutils testsuites
 #  2 = all chapter06 testsuites
 #  3 = all chapter05 and chapter06 testsuites
-TEST=1
+TEST=0
 
 #--- Run the stripping phases  0(no)/1(yes)
-STRIP=1
+STRIP=0
 
 #--- page definition for groff letter/A4
 PAGE=letter




More information about the alfs-log mailing list