Changeset b928382

Timestamp:

08/15/2006 01:33:40 AM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

bc4a8dc

Parents:

2fedf49

Message:

BLFS: Add pkg version (if available) to tracking file name

File:

• BLFS/gen-makefile.sh (modified) (4 diffs)

BLFS/gen-makefile.sh

@@ -50 +50 @@
 #----------------------------------#
   local pkg_name=$1
+  local pkg_ver=$2
 (
 cat << EOF
         @touch  \$@ && \\
-        touch \$(TRACKING_DIR)/${pkg_name#*-?-} && \\
+        touch \$(TRACKING_DIR)/${pkg_name#*-?-}-${pkg_ver} && \\
         sleep .25 && \\
         echo -e "\n\n "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -66 +67 @@
 #----------------------------#
   local script_name=$1
-
+  local pkg_ver=$2
+  
   echo -n "${tab_}${tab_} entry for <$script_name>"
 
@@ -80 +82 @@
   # Include a touch of the target name so make can check
   # if it's already been made.
-  __wrt_touch "${script_name}"
+  __wrt_touch "${script_name}" "${pkg_ver}"
   #
   #--------------------------------------------------------------------#
@@ -102 +104 @@
   for package_script in scripts/* ; do
     this_script=`basename $package_script`
-    if [ ! -e $TRACKING_DIR/${this_script#*-} ]; then
+    script_ver=$(xmllint --noent ../blfs-xml/book/bookinfo.xml 2>/dev/null | \
+                grep -i " ${this_script#*-?-}-version " | \
+                cut -d "\"" -f2 )
+    echo "${this_script} ... ${this_script#*-?-} .. ver ${script_ver}"
+    if [ ! -e $TRACKING_DIR/${this_script#*-?-}-$script_ver ]; then
       pkg_list="$pkg_list ${this_script}"
-      __write_entry $this_script
+     __write_entry "${this_script}" "${script_ver}"
       PREV_PACKAGE=${this_script}
     fi