r2800 - jhalfs/trunk/common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Thu Jun 22 08:05:49 PDT 2006


Author: georgeb
Date: 2006-06-22 09:05:49 -0600 (Thu, 22 Jun 2006)
New Revision: 2800

Modified:
   jhalfs/trunk/common/common-functions
Log:
CLFS changed definition of VERSION.. added fix

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-06-20 23:43:07 UTC (rev 2799)
+++ jhalfs/trunk/common/common-functions	2006-06-22 15:05:49 UTC (rev 2800)
@@ -572,12 +572,20 @@
         # Set the canonical book version
         cd $JHALFSDIR
         VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
+         # Another work-around, clfs book has a x.x.x-date versioning system
+         if [ "$PROGNAME" = "clfs" ]; then
+           VERSION=${VERSION##*-}
+         fi
         get_sources
       else
         echo -ne "done\n"
         # Set the canonical book version
         cd $JHALFSDIR
         VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
+         # Another work-around, clfs book has a x.x.x-date versioning system
+         if [ "$PROGNAME" = "clfs" ]; then
+           VERSION=${VERSION##*-}
+         fi
         extract_commands
       fi
     else
@@ -589,6 +597,10 @@
       # Set the canonical book version
       cd $JHALFSDIR
       VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
+      # Another work-around, clfs book has a x.x.x-date versioning system
+      if [ "$PROGNAME" = "clfs" ]; then
+        VERSION=${VERSION##*-}
+      fi
       extract_commands
     fi
   else
@@ -596,6 +608,10 @@
     # Set the canonical book version
     cd $JHALFSDIR
     VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
+    # Another work-around, clfs book has a x.x.x-date versioning system
+    if [ "$PROGNAME" = "clfs" ]; then
+      VERSION=${VERSION##*-}
+    fi
     extract_commands
   fi
 }




More information about the alfs-log mailing list