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

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Aug 18 15:24:12 PDT 2006


Author: manuel
Date: 2006-08-18 16:24:11 -0600 (Fri, 18 Aug 2006)
New Revision: 3016

Modified:
   jhalfs/branches/experimental/BLFS/gen_config.sh
   jhalfs/branches/experimental/BLFS/libs/func_packages
Log:
Finished packages clean-up and version fixes.

Modified: jhalfs/branches/experimental/BLFS/gen_config.sh
===================================================================
--- jhalfs/branches/experimental/BLFS/gen_config.sh	2006-08-18 20:49:01 UTC (rev 3015)
+++ jhalfs/branches/experimental/BLFS/gen_config.sh	2006-08-18 22:24:11 UTC (rev 3016)
@@ -23,16 +23,29 @@
 get_pkg_ver() {
   local this_script=$1
 
-  # ALSA packages version
-  [[ ${this_script:0:4} = "alsa" ]] && this_script=alsa
-  # KDE packages version
-  [[ ${this_script:0:3} = "kde" ]] && [[ ! ${this_script} = "kdevelop" ]] && \
-  [[ ! ${this_script: -6} = "config" ]] && this_script=kde
-  # Xorg7 packages version
-  [[ ${this_script} = "xorg7-server" ]] && this_script=xorg-server
-  [[ ${this_script} = "xterm2" ]] && this_script=xterm
-  [[ ${this_script:0:5} = "xorg7" ]] && this_script=xorg7
+  case ${this_script} in
+                  # ALSA packages version
+            alsa* ) this_script=alsa ;;
 
+                  # KDE packages version
+          kdevelop ) : ;;
+        kde*config ) : ;;
+              kde* ) this_script=kde ;;
+
+                  # Xorg7 packages version
+      xorg7-server ) this_script=xorg-server ;;
+            xterm2 ) this_script=xterm ;;
+            xorg7* ) this_script=xorg7 ;;
+
+                   # Others (ID value don't match entity name)
+    wireless_tools ) this_script=wireless-tools ;;
+        bind-utils ) this_script=bind ;;
+         html-tidy ) this_script=tidy ;;
+               jdk ) this_script=jdk-src ;;
+          reiserfs ) this_script=reiser ;;
+               xfs ) this_script=xfsprogs ;;
+  esac
+
   PKG_VER=$(xmllint --noent ./blfs-xml/book/bookinfo.xml 2>/dev/null | \
             grep -i " ${this_script}-version " | cut -d "\"" -f2 )
 
@@ -97,13 +110,11 @@
   fi
   [[ "${SET_COMMENT}" = "y" ]] && echo "comment \"\"" >>$outFile; unset SET_COMMENT
 
-    # Deal with a few unusable chapter names
+    # Deal with a few unusable (at target level) package names
   case ${PKG_NAME} in
-     xorg7-* ) # Deal with sub-elements of Xorg7, mandatory for build.
-               # No need to (even possible?) to build separately
-         continue
-      ;;
+     xorg7-* ) continue ;;
      alsa-* ) continue ;;
+     x-config | x-setup ) continue ;;
   esac
 
     # IF this package name-version exists in the tracking dir

Modified: jhalfs/branches/experimental/BLFS/libs/func_packages
===================================================================
--- jhalfs/branches/experimental/BLFS/libs/func_packages	2006-08-18 20:49:01 UTC (rev 3015)
+++ jhalfs/branches/experimental/BLFS/libs/func_packages	2006-08-18 22:24:11 UTC (rev 3016)
@@ -22,8 +22,8 @@
   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 '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d' packages.tmp
-  sed -i '/gst-plugins\t/d;/openquicktime\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
 
   # Add header with meta-packages pseudo Id
 {




More information about the alfs-log mailing list