Changeset bef0a98

Timestamp:

03/10/2006 03:28:52 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

6aeb5b7

Parents:

3f858ca

Message:

Housekeeping for HLFS.. changes to common/common_funtions to get HLFS running

Files:

• HLFS/config (modified) (1 diff)
• common/common-functions (modified) (10 diffs)

HLFS/config

@@ -28 +28 @@
 
 #--- Files that will be copied to $JHAHLFSDIR
-FILES="hlfs-patcheslist_.xsl"
+FILES="patcheslist.xsl"
 
 #--- Default stylesheet

common/common-functions

@@ -218 +218 @@
         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
         echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
-
         chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
 EOF
@@ -569 +568 @@
 build_patches_file() {       # Supply a suitably formated list of patches.
 #----------------------------#
-  local saveIFS=$IFS
+  local IFS
+  echo -ne "Creating the patch file list "
 
   LOC_add_patches_entry() {
@@ -580 +580 @@
            --xinclude \
            -o patcheslist_.wget \
-           hlfs-patcheslist_.xsl \
-           $BOOK/index.xml > /dev/null 2>&1
+           patcheslist.xsl \
+           $BOOK/index.xml  
+           #> /dev/null 2>&1
 
   rm -f patches
@@ -587 +588 @@
   IFS=$'\x0A'  # Modify the 'internal field separator' to break on 'LF' only
   for f in `cat packages`; do
-    IFS=$saveIFS
     LOC_add_patches_entry \
     `echo $f | sed -e 's/-version//' \
@@ -600 +600 @@
   done
 
-  IFS=$saveIFS
   rm -f patcheslist_.wget
+  echo "...OK"
 }
 
@@ -621 +621 @@
     mkdir -v commands
   fi
-  echo -n "Extracting commands..."
+  echo -n "Extracting commands for"
 
   # Dump the commands in shell script form from the HLFS book.
   case ${PROGNAME} in
     clfs)
-        echo "${tab_}Extracting commands for ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
+        echo -n "${tab_} ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
         xsltproc --xinclude \
                  --nonet \
@@ -633 +633 @@
       ;;
     hlfs)
-        echo "${tab_}Extracting commands for ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS architecture"
+        echo -n "${tab_} ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS architecture"
         xsltproc  --nonet \
                   --xinclude \
                   --stringparam model $MODEL \
                   --stringparam testsuite $TEST \
+                  --stringparam testchaintest 0 \
                   --stringparam vim-lang $VIMLANG \
                   -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
     lfs)
-        echo "${tab_}Extracting commands for ${L_arrow}${BOLD}LFS${R_arrow} build"
+        echo -n "${tab_} ${L_arrow}${BOLD}LFS${R_arrow} build"
         xsltproc --nonet \
                  --xinclude \
@@ -650 +651 @@
       ;;
     blfs)
-        echo "${tab_}Extracting commands for ${L_arrow}${BOLD}BLFS${R_arrow} build"
+        echo -n "${tab_} ${L_arrow}${BOLD}BLFS${R_arrow} build"
         xsltproc --nonet \
                  --xinclude \
@@ -660 +661 @@
   esac
     
-
+  echo " ...OK"
 
   # Make the scripts executable.
@@ -687 +688 @@
   esac
   
-
   # Done. Moving on...
-  echo -ne "    ... done\n"
   get_sources
 }