Changeset 5f14bd3

Timestamp:

08/21/2006 06:42:52 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

2d0a2e5

Parents:

86f740c

Message:

Skip installed packages when processing dependencies instead of when generating the Makefile.
Fixed a bug when TARGET=xorg7

Location:

BLFS

Files:

• gen-makefile.sh (modified) (1 diff)
• libs/func_dependencies (modified) (4 diffs)

BLFS/gen-makefile.sh

@@ -113 +113 @@
     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
 

BLFS/libs/func_dependencies

@@ -47 +47 @@
   #---------------------
   # 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,/.*,,'`
 
@@ -110 +108 @@
   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
@@ -156 +154 @@
   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
 
   #------------------
@@ -180 +179 @@
   > 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