r2797 - jhalfs/trunk/CLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Mon Jun 19 12:12:38 PDT 2006


Author: georgeb
Date: 2006-06-19 13:12:37 -0600 (Mon, 19 Jun 2006)
New Revision: 2797

Modified:
   jhalfs/trunk/CLFS/master.sh
Log:
slight rewrite to the handling of the clfs-bootscripts issue.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-06-18 12:41:38 UTC (rev 2796)
+++ jhalfs/trunk/CLFS/master.sh	2006-06-19 19:12:37 UTC (rev 2797)
@@ -256,9 +256,14 @@
       *lilo-build)    name=lilo                    ;;
       *)              name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's at -build@@' ` ;;
     esac
-
-    vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-
+      # Identify the unique version naming scheme for the clfs bootscripts..(bad boys)
+    case $name in
+      bootscripts-cross-lfs)
+        vrs=`grep "^clfs-bootscripts-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+         ;;
+      *) vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+         ;;
+    esac
     #--------------------------------------------------------------------#
     #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #
     #--------------------------------------------------------------------#
@@ -401,7 +406,6 @@
     #
     case $name in
       tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
-      tree)   wrt_unpack2 "$name-$vrs.tgz"      ;;
       *)      wrt_unpack2 "$name-$vrs.tar.*"    ;;
     esac
     [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -457,7 +461,6 @@
     #
     case $name in
       tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
-      tree)   wrt_unpack3 "$name-$vrs.tgz"      ;;
       *)      wrt_unpack3 "$name-$vrs.tar.*"    ;;
     esac
     [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -734,13 +737,17 @@
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
     case $name in
-      *bootscripts*) name=clfs-bootscripts ;; # Very dirty hack
+      *bootscripts*) name=bootscripts-cross-lfs ;;
       *udev-rules)   name=udev-cross-lfs ;;
     esac
-    vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-    # Very dirty hack
+
+      # Identify the unique version naming scheme for the clfs bootscripts..(bad boys)
     case $name in
-      *bootscripts*) name=bootscripts-cross-lfs ;;
+      bootscripts-cross-lfs)
+	 vrs=`grep "^clfs-bootscripts-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+	 ;;
+      *) vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+         ;;
     esac
 
     #--------------------------------------------------------------------#
@@ -783,7 +790,7 @@
     this_script=`basename $file`
 
     case $this_script in
-      *udev) continue    ;;  # This is not a script but a commentary
+      *udev*) continue    ;;  # This is not a script but a commentary
       *console*) continue ;; # Use the files that came with the bootscripts
       *)  ;;
     esac
@@ -799,14 +806,10 @@
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
     case $name in
-      *bootscripts*) name=clfs-bootscripts ;; # Very dirty hack
-      *udev-rules)   name=udev-cross-lfs ;;
+      *bootscripts*) name=bootscripts-cross-lfs
+       ;;
     esac
     vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-    # Very dirty hack
-    case $name in
-      *bootscripts*) name=bootscripts-cross-lfs ;;
-    esac
 
     #--------------------------------------------------------------------#
     #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #




More information about the alfs-log mailing list