r2371 - jhalfs/branches/experimental/HLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Mar 20 11:03:35 PST 2006


Author: manuel
Date: 2006-03-20 12:03:35 -0700 (Mon, 20 Mar 2006)
New Revision: 2371

Modified:
   jhalfs/branches/experimental/HLFS/master.sh
Log:
The uClibc-locale package and grsecurity patch should be placed into the FTP mirrors in their original formats.

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-03-19 13:40:28 UTC (rev 2370)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-03-20 19:03:35 UTC (rev 2371)
@@ -50,7 +50,7 @@
 
       "tcl" )   FILE="$PKG$VRS-src.tar.bz2" ; download $PKG $FILE ;;
 
-      "uClibc-locale" ) FILE="$PKG-$VRS.tar.bz2" ; PKG="uClibc"
+      "uClibc-locale" ) FILE="$PKG-$VRS.tgz" ; PKG="uClibc"
                 download $PKG $FILE
                 # There can be no patches for this file
                 continue ;;
@@ -79,9 +79,6 @@
   # .... U G L Y .... what to do with the grsecurity patch to the kernel..
   download grsecurity `grep grsecurity $JHALFSDIR/patches`
 
-  # .... U G L Y .... deal with uClibc-locale-xxxxx.tar.bz2 format issue.
-  bzcat uClibc-locale-030818.tar.bz2 | gzip > uClibc-locale-030818.tgz
-
   if [[ -s $BUILDDIR/sources/MISSING_FILES.DMP ]]; then
     echo  -e "\n\n${tab_}${RED} One or more files were not retrieved.\n${tab_} Check <MISSING_FILES.DMP> for names ${OFF}\n\n"
   fi
@@ -418,10 +415,6 @@
       *kernel)
           # If no .config file is supplied, the kernel build is skipped
         [[ -z $CONFIG ]] && continue
-          # The files in the conglomeration dir are xxx.bz2
-          # What if the user download the original file?
-        sed 's|.patch.gz|.patch.bz2|'   -i chapter07/$this_script
-        sed 's|gunzip|bunzip2|'         -i chapter07/$this_script
          ;;
     esac
 




More information about the alfs-log mailing list