Changeset 7889308

Timestamp:

07/25/2007 09:32:33 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

28087b7

Parents:

55bc23b

Message:

BLFS: Started X11 updates.

Location:

BLFS

Files:

• gen_config.sh (modified) (3 diffs)
• gen_pkg_book.sh (modified) (1 diff)
• libs/func_packages (modified) (2 diffs)

BLFS/gen_config.sh

@@ -96 +96 @@
   [[ "${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-packages 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
 
@@ -223 +234 @@
         config  WIN_xorg7
         bool    "Xorg7"
-        config  WIN_xorg
-        bool    "Xorg"
         config  WIN_xfree86
         bool    "xfree86"
@@ -231 +240 @@
         string
         default xorg7   if WIN_xorg7
-        default xorg    if WIN_xorg
         default xfree86 if WIN_xfree86
 endmenu

BLFS/gen_pkg_book.sh

@@ -132 +132 @@
 #--------------------------#
 
-tail -n 30 configuration > configuration.tmp
+tail -n 29 configuration > configuration.tmp
 mv configuration.tmp configuration
 

BLFS/libs/func_packages

@@ -64 +64 @@
 
   # 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 '/template/d;/ntroduction/d;/preface/d;/alsa.xml/d;/xorg.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;/^ash\t/d' packages.tmp
@@ -206 +206 @@
 #--------------------------#
   echo -e "x-config\nx-setup\nrman\nxterm2\nxorg7-driver\nxorg7-server\nluit\n\
-xorg7-font\nxorg7-data\nxorg7-app\nxbitmaps\nmesalib\nlibdrm\n\
-xorg7-lib\nxorg7-util\nxorg7-proto" > libs/xorg7.dep
-}
+xkeyboard-config\nxorg7-font\nxorg7-data\nxorg7-app\nmesalib\nlibdrm\nxbitmaps\n\
+xorg7-lib\nlibxcb\nxcb-proto\nlibXdmcp\nlibXau\nxorg7-util\nxorg7-proto" > libs/xorg7.dep
+}