r3520 - in jhalfs/trunk: CLFS common/libs

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Tue Oct 21 14:24:25 PDT 2008


Author: georgeb
Date: 2008-10-21 15:24:25 -0600 (Tue, 21 Oct 2008)
New Revision: 3520

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/common/libs/func_check_version.sh
Log:
Added Perl and M4 as host requirements (code:Matthew Burgess)

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2008-10-20 23:33:54 UTC (rev 3519)
+++ jhalfs/trunk/CLFS/master.sh	2008-10-21 21:24:25 UTC (rev 3520)
@@ -770,7 +770,7 @@
   # Add chroot commands
   if [ "$METHOD" = "chroot" ] ; then
     CHROOT_LOC="`whereis -b chroot | cut -d " " -f2`"
-    chroot=`cat chroot/*chroot* | \
+    chroot=`cat chroot/???-chroot | \
             sed  -e "s at chroot@$CHROOT_LOC@" \
                  -e '/#!\/bin\/bash/d' \
                  -e '/^export/d' \

Modified: jhalfs/trunk/common/libs/func_check_version.sh
===================================================================
--- jhalfs/trunk/common/libs/func_check_version.sh	2008-10-20 23:33:54 UTC (rev 3519)
+++ jhalfs/trunk/common/libs/func_check_version.sh	2008-10-21 21:24:25 UTC (rev 3520)
@@ -99,8 +99,10 @@
   check_version "3.0"     "$(gawk --version  | head -n1 | cut -d" " -f3)"      "GAWK"
   check_version "2.5"     "$(grep --version  | head -n1 | awk '{print $NF}')"  "GREP"
   check_version "1.2.4"   "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)"  "GZIP"
+  check_version "1.4"     "$(m4 --version 2>&1 | head -n1 | cut -d" " -f3)"    "M4"
   check_version "3.79.1"  "$(make --version  | head -n1 | cut -d " " -f3 | cut -c1-4)"  "MAKE"
   check_version "2.5.4"   "$(patch --version | head -n1 | cut -d" " -f2)"      "PATCH"
+  check_version "5.6.0"   "$(perl -V:version | cut -f2 -d\')"                  "PERL"
   check_version "3.0.2"   "$(sed --version   | head -n1 | cut -d" " -f4)"      "SED"
   check_version "4.8"	  "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO"
 




More information about the alfs-log mailing list