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

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Aug 19 04:26:02 PDT 2006


Author: manuel
Date: 2006-08-19 05:26:01 -0600 (Sat, 19 Aug 2006)
New Revision: 3017

Modified:
   jhalfs/branches/experimental/BLFS/libs/func_packages
   jhalfs/branches/experimental/BLFS/update_book.sh
Log:
Added package book version to packages database.

Modified: jhalfs/branches/experimental/BLFS/libs/func_packages
===================================================================
--- jhalfs/branches/experimental/BLFS/libs/func_packages	2006-08-18 22:24:11 UTC (rev 3016)
+++ jhalfs/branches/experimental/BLFS/libs/func_packages	2006-08-19 11:26:01 UTC (rev 3017)
@@ -5,36 +5,79 @@
 set -e
 
 #-----------------------#
+get_pkg_ver() {         # Find package version for a given package ID
+#-----------------------#
+  local pkg_id=$1
+
+  case ${pkg_id} in
+                  # ALSA packages version
+            alsa* ) pkg_id=alsa ;;
+
+                  # KDE packages version
+          kdevelop ) : ;;
+        kde*config ) : ;;
+              kde* ) pkg_id=kde ;;
+
+                  # Xorg7 packages version
+      xorg7-server ) pkg_id=xorg-server ;;
+            xterm2 ) pkg_id=xterm ;;
+            xorg7* ) pkg_id=xorg7 ;;
+
+                   # Others (ID value don't match entity name)
+    wireless_tools ) pkg_id=wireless-tools ;;
+        bind-utils ) pkg_id=bind ;;
+         html-tidy ) pkg_id=tidy ;;
+               jdk ) pkg_id=jdk-src ;;
+          reiserfs ) pkg_id=reiser ;;
+               xfs ) pkg_id=xfsprogs ;;
+  esac
+
+  xmllint --noent ./blfs-xml/book/bookinfo.xml 2>/dev/null | \
+  grep -i " ${pkg_id}-version " | cut -d "\"" -f2
+
+}
+
+#-----------------------#
 generate_packages()  {  # Master packages file
 #-----------------------#
-  local pkg_id file
+  local pkg_id file pkg_ver
+  local ALSA_VER GNOME_VER GNOME_MINOR_VER KDE_VER KDE_KOFFICE_VER XORG7_VER
 
   > packages.tmp
 
   # Extract Id and path for sect1 files
   for file in `find $BLFS_XML -name "*.xml"` ; do
-    pkg_id=`grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//'`
-    [[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file" >> packages.tmp
+    pkg_id=$(grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//')
+    pkg_ver=$(get_pkg_ver $pkg_id)
+    [[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file\t$pkg_ver" >> packages.tmp
   done
 
   # IDs clean-up (unuseful pages or commented-out packages, could be more)
   sed -i '/template/d;/ntroduction/d;/preface/d;/alsa.xml/d' packages.tmp
   sed -i '/obsolete/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
   sed -i '/courier.xml/d;/-other\t/d;/others-/d;/other-/d' packages.tmp
-  sed -i '/fw-firewall/d;/gcc2/d;/cvsserver/d;/svnserver/d' packages.tmp
+  sed -i '/fw-firewall\t/d;/gcc2\t/d;/cvsserver\t/d;/svnserver\t/d' packages.tmp
   sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d;/konq\t/d' packages.tmp
   sed -i '/gst-plugins\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
 
+  # Meta-packages version
+  ALSA_VER=$(get_pkg_ver alsa)
+  GNOME_VER=$(get_pkg_ver gnome)
+  GNOME_MINOR_VER=$(get_pkg_ver gnome-minor)
+  KDE_VER=$(get_pkg_ver kde)
+  KDE_KOFFICE_VER=$(get_pkg_ver koffice)
+  XORG7_VER=$(get_pkg_ver xorg7)
+
   # Add header with meta-packages pseudo Id
 {
   cat << EOF
-alsa	$BLFS_XML
-gnome-core	$BLFS_XML
-gnome-full	$BLFS_XML
-kde-core	$BLFS_XML
-kde-full	$BLFS_XML
-kde-koffice	$BLFS_XML
-xorg7	$BLFS_XML
+alsa	$BLFS_XML	$ALSA_VER
+gnome-core	$BLFS_XML	$GNOME_VER$GNOME_MINOR_VER
+gnome-full	$BLFS_XML	$GNOME_VER$GNOME_MINOR_VER
+kde-core	$BLFS_XML	$KDE_VER
+kde-full	$BLFS_XML	$KDE_VER
+kde-koffice	$BLFS_XML	$KDE_KOFFICE_VER
+xorg7	$BLFS_XML	$XORG7_VER
 EOF
 } >> packages.tmp
 

Modified: jhalfs/branches/experimental/BLFS/update_book.sh
===================================================================
--- jhalfs/branches/experimental/BLFS/update_book.sh	2006-08-18 22:24:11 UTC (rev 3016)
+++ jhalfs/branches/experimental/BLFS/update_book.sh	2006-08-19 11:26:01 UTC (rev 3017)
@@ -70,7 +70,7 @@
 
 BOOK_Source
 
-echo -en "\n\tGenerating packages file ..."
+echo -en "\n\tGenerating packages database file ..."
 generate_packages
 echo "done."
 




More information about the alfs-log mailing list