Changeset c044e3c for CLFS/master.sh

Timestamp:

06/19/2006 07:12:37 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

a160d86

Parents:

2eb1f44

Message:

slight rewrite to the handling of the clfs-bootscripts issue.

File:

• CLFS/master.sh (modified) (6 diffs)

CLFS/master.sh

@@ -257 +257 @@
       *)              name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's@-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 <<<<<<<<          #
@@ -402 +407 @@
     case $name in
       tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
-      tree)   wrt_unpack2 "$name-$vrs.tgz"      ;;
       *)      wrt_unpack2 "$name-$vrs.tar.*"    ;;
     esac
@@ -458 +462 @@
     case $name in
       tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
-      tree)   wrt_unpack3 "$name-$vrs.tgz"      ;;
       *)      wrt_unpack3 "$name-$vrs.tar.*"    ;;
     esac
@@ -735 +738 @@
                                   -e 's@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
 
@@ -784 +791 @@
 
     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
       *)  ;;
@@ -800 +807 @@
                                   -e 's@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
 
     #--------------------------------------------------------------------#