r3026 - in jhalfs/branches/experimental/BLFS: . libs

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Aug 21 11:42:54 PDT 2006


Author: manuel
Date: 2006-08-21 12:42:52 -0600 (Mon, 21 Aug 2006)
New Revision: 3026

Modified:
   jhalfs/branches/experimental/BLFS/gen-makefile.sh
   jhalfs/branches/experimental/BLFS/libs/func_dependencies
Log:
Skip installed packages when processing dependencies instead of when generating the Makefile.
Fixed a bug when TARGET=xorg7

Modified: jhalfs/branches/experimental/BLFS/gen-makefile.sh
===================================================================
--- jhalfs/branches/experimental/BLFS/gen-makefile.sh	2006-08-21 17:56:01 UTC (rev 3025)
+++ jhalfs/branches/experimental/BLFS/gen-makefile.sh	2006-08-21 18:42:52 UTC (rev 3026)
@@ -112,11 +112,9 @@
   for package_script in scripts/* ; do
     this_script=`basename $package_script`
     pkg_ver=$(grep "^${this_script#*-?-}[[:space:]]" ../packages | cut -f3)
-    if [ ! -e $TRACKING_DIR/${this_script#*-?-}-$script_ver ]; then
-      pkg_list="$pkg_list ${this_script}"
-     __write_entry "${this_script}" "${pkg_ver}"
-      PREV_PACKAGE=${this_script}
-    fi
+    pkg_list="$pkg_list ${this_script}"
+    __write_entry "${this_script}" "${pkg_ver}"
+    PREV_PACKAGE=${this_script}
   done
 
 

Modified: jhalfs/branches/experimental/BLFS/libs/func_dependencies
===================================================================
--- jhalfs/branches/experimental/BLFS/libs/func_dependencies	2006-08-21 17:56:01 UTC (rev 3025)
+++ jhalfs/branches/experimental/BLFS/libs/func_dependencies	2006-08-21 18:42:52 UTC (rev 3026)
@@ -46,8 +46,6 @@
 
   #---------------------
   # The BLFS sources directory.
-  # Note: for book.xsl this value must be set via a sed in ./blfs.
-  # For consistency, we should to do the same here.
   BLFS_XML=`echo $PKGXML | sed -e 's,/.*,,'`
 
   if [[ ! -d ../$BLFS_XML ]] ; then
@@ -109,7 +107,7 @@
   # Write the XInclude
   case $TARGET in
     # If there is no usefull XML page, skip it.
-    alsa | gnome-core | gnome-full | kde-core | kde-full | kde-koffice ) ;;
+    alsa | gnome-core | gnome-full | kde-core | kde-full | kde-koffice | xorg7) ;;
     * )
       echo -e "    $ENTRY_START$PKGXML$ENTRY_END" >> $TARGET-index.xml.tmp
       ;;
@@ -155,7 +153,8 @@
   local PKG=$1
   local saveIFS=$IFS
   local DEP_LV=$DEP_LEVEL
-  local line line2 DEP
+  local line line2 DEP pkg_ver
+  local TRACKING_DIR=/var/lib/jhalfs/BLFS
 
   #------------------
   #  If a premade xinclude file exists, use it. If not, create one
@@ -179,6 +178,9 @@
   # Start with a clean $PKG.xinc.tmp file
   > xincludes/$PKG.xinc.tmp
   for DEP in `cat dependencies/$PKG.dep`; do
+    # If DEP has been previouly installed, skip it
+    pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
+    [ -e $TRACKING_DIR/${DEP}-$pkg_ver ] && continue
     # Special packages (a lot of hacks)
     case $DEP in
 




More information about the alfs-log mailing list