r2390 - in jhalfs/branches/experimental: CLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Wed Mar 22 19:28:54 PST 2006


Author: georgeb
Date: 2006-03-22 20:28:53 -0700 (Wed, 22 Mar 2006)
New Revision: 2390

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/common/common-functions
Log:
CLFS, handle a change from lfs-bootscripts to bootscripts-cross-lfs

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-22 22:52:32 UTC (rev 2389)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-23 03:28:53 UTC (rev 2390)
@@ -8,7 +8,7 @@
 
 
 #----------------------------#
-host_prep_Makefiles() {       # Initialization of the system
+host_prep_Makefiles() {      # Initialization of the system
 #----------------------------#
   local   LFS_HOST
 
@@ -240,7 +240,7 @@
     # Grab the name of the target, strip id number and misc words.
     case $this_script in
       *kernel)        name=linux           ;;
-      *bootscripts)   name=lfs-bootscripts ;;
+      *bootscripts)   name="bootscripts-cross-lfs" ;;
       *)              name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's at -build@@' ` ;;
     esac
 
@@ -731,7 +731,7 @@
                                   -e 's at -64@@' \
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
-    if [[ `_IS_ $name bootscripts` ]]; then name=lfs-bootscripts; fi
+    if [[ `_IS_ $name bootscripts` ]]; then name=bootscripts-cross-lfs; fi
 
     vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
 
@@ -903,10 +903,10 @@
       *fstab*)  if [[ -n "$FSTAB" ]]; then
                   wrt_copy_fstab "${this_script}"
                 else
-                  wrt_run_as_lfs  "${this_script}" "${file}"
+                  wrt_run_as_chroot1  "${this_script}" "${file}"
                 fi
           ;;
-      *)  wrt_run_as_lfs  "${this_script}" "${file}"   ;;
+      *)  wrt_run_as_chroot1  "${this_script}" "${file}"   ;;
     esac
     #
     # Housekeeping...remove any build directory(ies) except if the package build fails.

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-03-22 22:52:32 UTC (rev 2389)
+++ jhalfs/branches/experimental/common/common-functions	2006-03-23 03:28:53 UTC (rev 2390)
@@ -686,7 +686,12 @@
       LOC_add_packages_entry() {
         local fileMATCH aFILE
 
+	  # Deal with a non-standard format
+        if [[ "$1" = "clfs-bootscripts" ]]; then
+	  set -- "bootscripts-cross-lfs" $2
+	fi
         fileMATCH="/$1"
+
         # format.. Filename-Version  or FilenameVersion
         for aFILE in `grep ${fileMATCH}-*[[:digit:]] packageslist_.wget`; do
          # Block vim-x.x-lang file, will add it later based on config flag




More information about the alfs-log mailing list