Changeset 9c90294 for common

Timestamp:

03/20/2006 11:07:53 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

386bc75

Parents:

7161bc9

Message:

CLFS extract_commands now part of common_func. pushd/popd added to master.sh to deal with multitiple files defined in config param FILES. Added to xsl files to CLFS dir

File:

• common/common-functions (modified) (10 diffs)

common/common-functions

@@ -547 +547 @@
   local saveIFS=$IFS
   local IFS
-  echo -ne "Creating the patch file list "
+
+  rm -f patches
 
   LOC_add_patches_entry() {
@@ -555 +556 @@
   }
 
-  xsltproc --nonet \
-           --xinclude \
-           --stringparam model $MODEL \
-           -o patcheslist_.wget \
-           patcheslist.xsl \
-           $BOOK/chapter04/patches.xml
-
-  rm -f patches
+  case ${PROGNAME} in
+    hlfs)
+         echo -n "Creating the ${L_arrow}${BOLD}HLFS${R_arrow} specific patcheslist_.wget file"
+         xsltproc --nonet \
+                  --xinclude \
+                  --stringparam model $MODEL \
+                  -o patcheslist_.wget \
+                  patcheslist.xsl \
+                  $BOOK/chapter04/patches.xml
+                  #> /dev/null 2>&1
+
+         # .... U G L Y .... what to do with the grsecurity patch to the kernel..
+         for f in `grep "/grsecurity-" patcheslist_.wget`; do
+           basename $f >> patches
+         done
+      ;;
+
+    clfs)  # Pull out a list of arch specific patches
+         echo -n "Creating ${L_arrow}${BOLD}$ARCH${R_arrow} specific patcheslist_.wget file"
+         xsltproc -xinclude  \
+                  -o patcheslist_.wget \
+                  patcheslist.xsl \
+                  $BOOK/${ARCH}-index.xml   
+      ;;
+    *)  return
+  esac
+
 
   IFS=$'\x0A'  # Modify the 'internal field separator' to break on 'LF' only
@@ -574 +594 @@
   done
 
-  # .... U G L Y .... what to do with the grsecurity patch to the kernel..
-  for f in `grep "/grsecurity-" patcheslist_.wget`; do
-      basename $f >> patches
-  done
-
-  rm -f patcheslist_.wget
-  echo "...OK"
-}
-
+  echo " ...OK"
+}
 
 
@@ -588 +601 @@
 extract_commands() {         #
 #----------------------------#
+  local saveIFS=$IFS
+  
   # Check for libxslt instead of just letting the script hit 'xsltproc' and fail.
   test `type -p xsltproc` || eval "echo \"This feature requires libxslt.\"
@@ -605 +620 @@
   case ${PROGNAME} in
     clfs)
-        echo -n "${tab_} ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
+        echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
         xsltproc --xinclude \
                  --nonet \
@@ -612 +627 @@
       ;;
     hlfs)
-        echo -n "${tab_} ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS architecture"
+        echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS architecture"
         xsltproc --nonet \
                  --xinclude \
@@ -626 +641 @@
       ;;
     lfs)
-        echo -n "${tab_} ${L_arrow}${BOLD}LFS${R_arrow} build"
+        echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build"
         xsltproc --nonet \
                  --xinclude \
@@ -637 +652 @@
       ;;
     blfs)
-        echo -n "${tab_} ${L_arrow}${BOLD}BLFS${R_arrow} build"
+        echo -n " ${L_arrow}${BOLD}BLFS${R_arrow} build"
         xsltproc --nonet \
                  --xinclude \
@@ -653 +668 @@
 
   # Grab the patches and package names.
-  cd $JHALFSDIR
-  for i in patches packages ; do rm -f $i ; done
-  grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
-  -e '/generic/d' >> packages
+  for i in patches packages ; do 
+    rm -f $i
+  done
+  #
+  case "${PROGNAME}" in
+    clfs)
+      ################################
+      # A LOCAL function
+      # xx_.wget contains arch specific files but in URL format
+      # Build a file with only arch specific files.. small ugly..
+      LOC_add_packages_entry() {
+        local fileMATCH aFILE
+    
+        fileMATCH="/$1"
+        # format.. Filename-Version  or FilenameVersion
+        for aFILE in `grep ${fileMATCH}-*[[:digit:]] packageslist_.wget`; do
+         # The aFILE%\?* is necessary to strip the "?download" appended to sourceforge files
+         echo "$1-version \"$2\"" >> packages
+        done
+      }
+      #################################
+ 
+      # We only want a list arch specific files..
+      # Unfortunately this script produces URL's which must be converted to a std format
+      echo -n "Creating CLFS ${L_arrow}${BOLD}${ARCH}${R_arrow} specific packageslist_.wget file"
+      xsltproc -xinclude  \
+               -o packageslist_.wget \
+               packageslist.xsl \
+               $BOOK/${ARCH}-index.xml   
+
+      # This has the correct format but contains packages from every book  
+      grep "\-version " $BOOK/packages.ent | sed -e 's@<!ENTITY @@' \
+                                                 -e 's@">@"@' \
+                                                 -e '/generic/d' > packages.tmp
+      # This variable is necessary to make sure the `cat $JHALFSDIR/packages`
+      # separates each iteration by lines.
+      # Modify the 'internal field separator' to break on 'LF' only
+      IFS=$'\x0A'
+      for f in `cat packages.tmp`; do
+        IFS=$saveIFS  # Restore the system defaults     
+        LOC_add_packages_entry \
+        `echo $f | sed -e 's/-version//' \
+                       -e 's/-file.*//' \
+                       -e 's/"//g'`
+     done
+     echo " ...OK"
+     ;;
+           
+    *)
+      echo -n "Creating <${PROGNAME}> specific packageslist_.wget file"
+      grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' \
+                                               -e 's@">@"@' \
+                                               -e '/generic/d' >> packages
+      ;; 
+  esac
 
   # Download the vim-lang package if it must be installed
@@ -664 +730 @@
   echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
 
-  # There is no HLFS patches.ent file so we will create one.
-
+  # There is no useful patches.ent file so we will create one.
   case "${PROGNAME}" in
-    hlfs)  build_patches_file ;;
-    clfs) ;;
+    hlfs)
+      build_patches_file ;;
+    clfs )
+      build_patches_file ;;
     lfs)
       grep "^<\!ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches