r3729 - in jhalfs/branches/ablfs: . CLFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Fri Sep 27 13:47:05 PDT 2013


Author: pierre
Date: Fri Sep 27 13:47:05 2013
New Revision: 3729

Log:
Merge trunk r3728

Modified:
   jhalfs/branches/ablfs/CLFS/master.sh
   jhalfs/branches/ablfs/Config.in

Modified: jhalfs/branches/ablfs/CLFS/master.sh
==============================================================================
--- jhalfs/branches/ablfs/CLFS/master.sh	Fri Sep 27 13:43:43 2013	(r3728)
+++ jhalfs/branches/ablfs/CLFS/master.sh	Fri Sep 27 13:47:05 2013	(r3729)
@@ -120,6 +120,7 @@
     # If $pkg_tarball isn't empty, we've got a package...
     #
     [[ "$pkg_tarball" != "" ]] && LUSER_wrt_unpack "$pkg_tarball"
+    [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" = 3 ]] && wrt_makeflags "${name}"
     #
     LUSER_wrt_RunAsUser "${file}"
     #
@@ -178,7 +179,7 @@
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
     #
     [[ "$pkg_tarball" != "" ]] && LUSER_wrt_unpack "$pkg_tarball"
-    [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+    [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     #
     LUSER_wrt_RunAsUser "${file}"
     #
@@ -231,7 +232,7 @@
       *util-linux)
          LUSER_wrt_target "${this_script}" "$PREV"
          LUSER_wrt_unpack "$pkg_tarball"
-         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
          LUSER_wrt_RunAsUser "${file}"
          LUSER_RemoveBuildDirs "${name}"
          wrt_touch
@@ -240,7 +241,7 @@
       *util-linux-ng)
          LUSER_wrt_target "${this_script}" "$PREV"
          LUSER_wrt_unpack "$pkg_tarball"
-         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
          LUSER_wrt_RunAsUser "${file}"
          LUSER_RemoveBuildDirs "${name}"
          wrt_touch
@@ -249,7 +250,7 @@
       *util-linux-libs)
          LUSER_wrt_target "${this_script}" "$PREV"
          LUSER_wrt_unpack "$pkg_tarball"
-         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
          LUSER_wrt_RunAsUser "${file}"
          LUSER_RemoveBuildDirs "${name}"
          wrt_touch
@@ -258,7 +259,7 @@
       *e2fsprogs)
          LUSER_wrt_target "${this_script}" "$PREV"
          LUSER_wrt_unpack "$pkg_tarball"
-         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
          LUSER_wrt_RunAsUser "${file}"
          LUSER_RemoveBuildDirs "${name}"
          wrt_touch
@@ -267,7 +268,7 @@
       *e2fsprogs-libs)
          LUSER_wrt_target "${this_script}" "$PREV"
          LUSER_wrt_unpack "$pkg_tarball"
-         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
          LUSER_wrt_RunAsUser "${file}"
          LUSER_RemoveBuildDirs "${name}"
          wrt_touch
@@ -289,7 +290,7 @@
     #
     if [ "$pkg_tarball" != "" ] ; then
       CHROOT_Unpack "$pkg_tarball"
-      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+      [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     fi
     #
     # Select a script execution method
@@ -377,7 +378,7 @@
     # Insert instructions for unpacking the package and changing directories
     #
     [[ "$pkg_tarball" != "" ]] && LUSER_wrt_unpack "$pkg_tarball"
-    [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+    [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     #
     # Select a script execution method
     case $this_script in
@@ -448,7 +449,7 @@
     CHROOT_wrt_target "${this_script}" "$PREV"
     #
     CHROOT_Unpack "$pkg_tarball"
-    [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+    [[ "$OPTIMIZE" -ge "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     #
     CHROOT_wrt_RunAsRoot "${file}"
     #

Modified: jhalfs/branches/ablfs/Config.in
==============================================================================
--- jhalfs/branches/ablfs/Config.in	Fri Sep 27 13:43:43 2013	(r3728)
+++ jhalfs/branches/ablfs/Config.in	Fri Sep 27 13:47:05 2013	(r3729)
@@ -1096,6 +1096,9 @@
 
 		config	OPT_2
 			bool	"Both temp tools and final system"
+
+		config	OPT_3
+			bool	"Cross tools (only MAKEFLAGS), temp tools and final system" if BOOK_CLFS
 	endchoice
 
 	config	OPTIMIZE
@@ -1103,6 +1106,7 @@
 		default	"0"	if !CONFIG_OPTIMIZE
 		default	"1"	if OPT_1
 		default	"2"	if OPT_2
+		default	"3"	if OPT_3
 endif
 	#--- End Optimizations
 



More information about the alfs-log mailing list