r2792 - jhalfs/trunk/CLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Jun 18 03:09:54 PDT 2006


Author: manuel
Date: 2006-06-18 04:09:53 -0600 (Sun, 18 Jun 2006)
New Revision: 2792

Modified:
   jhalfs/trunk/CLFS/master.sh
Log:
Dirty hack to fix CLFS bootscripts unpacking.
Fixed also udev-rules installation when METHOD=boot.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-06-17 14:53:59 UTC (rev 2791)
+++ jhalfs/trunk/CLFS/master.sh	2006-06-18 10:09:53 UTC (rev 2792)
@@ -734,10 +734,14 @@
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
     case $name in
-      *bootscripts*) name=bootscripts-cross-lfs ;;
+      *bootscripts*) name=clfs-bootscripts ;; # Very dirty hack
       *udev-rules)   name=udev-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 <<<<<<<<          #
@@ -779,7 +783,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
@@ -795,10 +799,14 @@
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
     case $name in
-      *bootscripts*) name=bootscripts-cross-lfs
-       ;;
+      *bootscripts*) name=clfs-bootscripts ;; # Very dirty hack
+      *udev-rules)   name=udev-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