BLFS: Started X11 updates.

BLFS/gen_config.sh

@@ -95,11 +95,22 @@ EOF
   fi
   [[ "${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
 
     # Skip installed packages
@@ -222,15 +233,12 @@ choice
 	prompt	"Window package"
 	config	WIN_xorg7
 	bool	"Xorg7"
-	config	WIN_xorg
-	bool	"Xorg"
 	config	WIN_xfree86
 	bool	"xfree86"
 endchoice
 config	X11
 	string
 	default	xorg7	if WIN_xorg7
-	default	xorg	if WIN_xorg
 	default xfree86	if WIN_xfree86
 endmenu
 

BLFS/gen_pkg_book.sh

@@ -131,7 +131,7 @@ regenerate_deps() {        #
 clean_configuration() {    #
 #--------------------------#
 
-tail -n 30 configuration > configuration.tmp
+tail -n 29 configuration > configuration.tmp
 mv configuration.tmp configuration
 
 }

BLFS/libs/func_packages

@@ -63,7 +63,7 @@ generate_packages()  {  # Master packages file
   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 '/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
   sed -i '/fw-firewall\t/d;/gcc2\t/d;/cvsserver\t/d;/svnserver\t/d' packages.tmp
@@ -205,6 +205,6 @@ alsa-plugins\nalsa-lib" > libs/alsa.dep
 generate_xorg7()  {        # Xorg7 packages
 #--------------------------#
   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
 }