r2787 - jhalfs/trunk/CLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Fri Jun 16 16:52:18 PDT 2006


Author: georgeb
Date: 2006-06-16 17:52:18 -0600 (Fri, 16 Jun 2006)
New Revision: 2787

Modified:
   jhalfs/trunk/CLFS/master.sh
Log:
CLFS, had to use a ..small ugly.. (tm) to deal with the linux-headers-xxxx naming scheme

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-06-16 22:59:42 UTC (rev 2786)
+++ jhalfs/trunk/CLFS/master.sh	2006-06-16 23:52:18 UTC (rev 2787)
@@ -127,8 +127,15 @@
     esac
     #
     # Find the version of the command files, if it corresponds with the building of a specific package
-    vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
 
+    # oh-oh.. This small ugly is necessary to handle the LFS headers naming scheme
+    if [ "${name}" = "linux-headers" ]; then
+      linux_vrs=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+      vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+      vrs=${linux_vrs}-${vrs##*-}
+    else
+      vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+    fi
     #--------------------------------------------------------------------#
     #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #
     #--------------------------------------------------------------------#
@@ -519,8 +526,16 @@
     # Find the version of the command files, if it corresponds with the building of
     # a specific package. We need this here to can skip scripts not needed for
     # iterations rebuilds
-    vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
 
+    # oh-oh.. This small ugly is necessary to handle the LFS headers naming scheme
+    if [ "${name}" = "linux-headers" ]; then
+      linux_vrs=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+      vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+      vrs=${linux_vrs}-${vrs##*-}
+    else
+      vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
+    fi
+
     if [[ "$vrs" = "" ]] && [[ -n "$N" ]] ; then
       case "${this_script}" in
         *stripping*) ;;




More information about the alfs-log mailing list