Changeset 80f0ea1

Timestamp:

09/15/2006 09:19:27 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

621f01f

Parents:

0167dd8

Message:

Added PATH variable to generated Makefile. /usr/sbin may not be in builders PATH

Files:

• CLFS/master.sh (modified) (1 diff)
• CLFS2/master.sh (modified) (1 diff)
• HLFS/master.sh (modified) (1 diff)
• LFS/master.sh (modified) (1 diff)
• common/func_check_version.sh (modified) (2 diffs)
• jhalfs (modified) (1 diff)

CLFS/master.sh

@@ -1153 +1153 @@
 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
 
+export PATH := \${PATH}:/usr/sbin
+
 include makefile-functions
 

CLFS2/master.sh

@@ -457 +457 @@
 LUSER_HOME = /home/\$(LUSER)
 
+export PATH := \${PATH}:/usr/sbin
+
 include makefile-functions
 

HLFS/master.sh

@@ -525 +525 @@
 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
 
+export PATH := \${PATH}:/usr/sbin
+
 include makefile-functions
 

LFS/master.sh

@@ -406 +406 @@
 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
 
+export PATH := \${PATH}:/usr/sbin
 
 include makefile-functions

common/func_check_version.sh

@@ -37 +37 @@
   }
 
-  echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
+  echo -ne "${TXT}${dotSTR:${#TXT}}${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
+
+#  echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
   IFS=".-(p"   # Split up w.x.y.z as well as w.x.y-rc  (catch release candidates)
   set -- $ref_version # set postional parameters to minimum ver values
@@ -46 +48 @@
   #
   # Compare against minimum acceptable version..
-  (( major > ref_major )) && echo " ..OK" && return
+  (( major > ref_major )) && echo " ..${GREEN}OK${OFF}" && return
   (( major < ref_major )) && write_error_and_die
     # major=ref_major
   (( minor < ref_minor )) && write_error_and_die
-  (( minor > ref_minor )) && echo " ..OK" && return
+  (( minor > ref_minor )) && echo " ..${GREEN}OK${OFF}" && return
     # minor=ref_minor
-  (( revision >= ref_revision )) && echo " ..OK" && return
+  (( revision >= ref_revision )) && echo " ..${GREEN}OK${OFF}" && return
 
   # oops.. write error msg and die

jhalfs

@@ -258 +258 @@
   exit 1
 fi
+
+xsltprocVer=`xsltproc -V | head -n1 `
+  libxmlVer=$(echo $xsltprocVer | cut -d " " -f3)
+ libxsltVer=$(echo $xsltprocVer | cut -d " " -f5)
+    tidyVer=`tidy -V | cut -d " " -f9`
+    
+# Version numbers are packed strings not xx.yy.zz format.
+check_version "2.06.20"  "${libxmlVer:0:1}.${libxmlVer:1:2}.${libxmlVer:3:2}"     "LIBXML2"
+check_version "1.01.14"  "${libxsltVer:0:1}.${libxsltVer:1:2}.${libxsltVer:3:2}"  "LIBXSLT"
+check_version "2004"   "${tidyVer}"        "TIDY"
+
 echo "${SD_BORDER}${nl_}"