Changeset bc40917

Timestamp:

08/21/2006 09:57:52 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

0208570

Parents:

cac94f6

Message:

Making use off installed version from packages database.
Not full tested yet.

Files:

• BLFS/gen-makefile.sh (modified) (1 diff)
• BLFS/gen_config.sh (modified) (6 diffs)
• BLFS/libs/func_dependencies (modified) (3 diffs)
• blfs (modified) (1 diff)

BLFS/gen-makefile.sh

@@ -5 +5 @@
 set -e
 
-# Uncomment this when reasy to be used
-#source ../configuration
-
 # TEMPORARY VARIABLES.. development use only
 declare MKFILE=Makefile
 declare PREV_PACKAGE=""
 declare BUILD_SCRIPTS=scripts
-# Remove this when we can use configuration
-declare TRACKING_DIR=/var/lib/jhalfs/BLFS
+declare TRACKING_DIR=tracking-dir
 
 HEADER="# This file is automatically generated by jhalfs

BLFS/gen_config.sh

@@ -7 +7 @@
 export inFile=packages          # file for reading and writing to.
 
-declare TRACKING_DIR=tracking-dir
-
 declare PKG_NAME
 declare PKG_XML_FILE
 declare PKG_DIR
 declare PKG_VER
+declare INST_VER
 declare SAVE_IFS=${IFS}
 declare -a DIR_TREE
@@ -43 +42 @@
   PKG_DIR=$(dirname $2)
   PKG_VER=$3
+  INST_VER=$4
     # These are the META packages.
   if [ $PKG_DIR = "." ]; then
     SET_COMMENT=y
       # Do not include previously installed packages....
-    if [ -e $TRACKING_DIR/${PKG_NAME}-${PKG_VER} ]; then continue; fi
+    if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+      continue
+    fi
 
     META_PKG=$(echo ${PKG_NAME} | tr [a-z] [A-Z])
     echo -e "config CONFIG_$META_PKG" >> $outFile
-    echo -e "\tbool \"$META_PKG $PKG_VER\"" >> $outFile
+    echo -e "\tbool \"$META_PKG $PKG_VER $INST_VER\"" >> $outFile
     echo -e "\tdefault n" >> $outFile
 
@@ -60 +62 @@
          read || break 1
          PKG_NAME=${REPLY}
-         PKG_VER=$(grep "^$PKG_NAME[[:space:]]" $inFile | cut -f3)
+         PKG_VER=$(grep "^${PKG_NAME}[[:space:]]" $inFile | cut -f3)
+         INST_VER=$(grep "^${PKG_NAME}[[:space:]]" $inFile | cut -f4)
+         if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+           continue
+         fi
 (
 cat << EOF
         config  DEP_${META_PKG}_${PKG_NAME}
-                bool    "$PKG_NAME ${PKG_VER}"
+                bool    "$PKG_NAME ${PKG_VER} ${INST_VER}"
                 default y
 
@@ -84 +90 @@
     # IF this package name-version exists in the tracking dir
     # do not add this package to the list of installable pkgs.
-  if [ -e $TRACKING_DIR/${PKG_NAME}-${PKG_VER} ]; then continue; fi
+  if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+    continue
+  fi
 
   IFS="/"
@@ -123 +131 @@
 cat << EOF
         config CONFIG_$PKG_NAME
-                bool "$PKG_NAME ${PKG_VER}"
+                bool "$PKG_NAME ${PKG_VER} ${INST_VER}"
                 default n
 EOF
@@ -236 +244 @@
                 Select if sudo will be used (you want build as a normal user)
                         otherwise sudo is not needed (you want build as root)
-
-config  TRACKING_DIR
-        string
-        default $TRACKING_DIR
-
 EOF
 ) >> $outFile

BLFS/libs/func_dependencies

@@ -137 +137 @@
                        $GHOSTSCRIPT
                        $MAILSERVER
-                       $TRACKING_DIR
                 file:  depure.txt
                        $TARGET-index.xml.tmp
@@ -155 +154 @@
   local saveIFS=$IFS
   local DEP_LV=$DEP_LEVEL
-  local line line2 DEP pkg_ver
-  # Remove this when we can use configuration file
-  local TRACKING_DIR=/var/lib/jhalfs/BLFS
+  local line line2 DEP pkg_ver inst_ver
 
   #------------------
@@ -183 +180 @@
     # If DEP has been previouly installed, skip it
     pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
-    [ -e $TRACKING_DIR/${DEP}-$pkg_ver ] && continue
+    inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
+    [ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
+
     # Special packages (a lot of hacks)
     case $DEP in

blfs

@@ -127 +127 @@
 # Set some harcoded envars to their proper values
 sed -i 's,blfs-xml,'$BLFS_XML',' update_book.sh libs/book.xsl
-sed -i 's,tracking-dir,'$TRACKING_DIR',' update_book.sh gen_config.sh
+sed -i 's,tracking-dir,'$TRACKING_DIR',' update_book.sh gen-makefile.sh
 
-# Fetch book sources and create packages and GNOME/KDE dependencies files
+# Fetch book sources and create packages and meta-packages dependencies files
 if [[ -d $BLFS_XML ]] ; then
   ./update_book.sh