Changeset 9c9775f for BLFS/gen_config.sh

Timestamp:

09/19/2007 04:50:48 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

3778352

Parents:

0510381

Message:

Updated experimental branch to current trunk code.

File:

• BLFS/gen_config.sh (modified) (5 diffs)

BLFS/gen_config.sh

@@ -48 +48 @@
     SET_COMMENT=y
       # Do not include previously installed packages
-    if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+    if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+      continue
+    fi
+      # Do not include installed packages newer than the book ones
+    if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
       continue
     fi
@@ -76 +80 @@
          INST_VER=$(grep "^${PKG_NAME}[[:space:]]" $inFile | cut -f4)
            # Skip installed meta-package components
-         if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+         if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+           continue
+         fi
+          # Do not include installed packages newer than the book ones
+         if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
            continue
          fi
@@ -96 +104 @@
   [[ "${SET_COMMENT}" = "y" ]] && echo "comment \"\"" >>$outFile; unset SET_COMMENT
 
-    # Deal with a few unusable (at target level) package names
+    # Deal with targets that are part of a meta-package but that are in the same
+    # directory that non meta-package targets
   case ${PKG_NAME} in
-     xorg7-* ) continue ;;
-     alsa-* ) continue ;;
-     x-config | x-setup ) continue ;;
+     alsa-* | \
+     xorg7-* | \
+     x-config | \
+     x-setup | \
+     libXau | \
+     libxcb | \
+     libXdmcp | \
+     luit | \
+     xbitmaps | \
+     xcb-proto | \
+     xkeyboard-config | \
+     mesalib | \
+     libdrm ) continue ;;
   esac
 
     # Skip installed packages
-  if [ -n "${PKG_VER}" ] && [ "x${PKG_VER}" = "x${INST_VER}" ]; then
+  if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" = "x${INST_VER}" ]]; then
+    continue
+  fi
+    # Do not include installed packages newer than the book ones
+  if [ -n "${PKG_VER}" ] && [[ "x${PKG_VER}" < "x${INST_VER}" ]]; then
     continue
   fi
@@ -223 +246 @@
         config  WIN_xorg7
         bool    "Xorg7"
-        config  WIN_xorg
-        bool    "Xorg"
         config  WIN_xfree86
         bool    "xfree86"
@@ -231 +252 @@
         string
         default xorg7   if WIN_xorg7
-        default xorg    if WIN_xorg
         default xfree86 if WIN_xfree86
 endmenu