From 323f805cba2fe308ceac1d38ab64fe9db0f7a9b7 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Thu, 17 Aug 2006 20:41:38 +0000
Subject: [PATCH] Pre-generating dep files for alsa, kde-koffice, and xorg7.

---
 BLFS/libs/func_dependencies | 25 +++++++++----------------
 BLFS/libs/func_packages     | 27 +++++++++++++++++++++++++--
 BLFS/update_book.sh         | 14 +++++++++++++-
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/BLFS/libs/func_dependencies b/BLFS/libs/func_dependencies
index bd7aabf..f7b93b6 100644
--- a/BLFS/libs/func_dependencies
+++ b/BLFS/libs/func_dependencies
@@ -73,10 +73,8 @@ inline_doc
     alsa-lib | cracklib | libexif | unixodbc ) ;;
 
     # Meta-packages at target level
-    # KDE and Gnome-{core,full} could be made via packages.sh, but not sure yet how.
     alsa )
-      echo -e "alsa-oss\nalsa-firmware\nalsa-tools\nalsa-utils\n \
-               alsa-plugins\nalsa-lib" > dependencies/alsa.dep
+      cp ../libs/alsa.dep dependencies/
       ;;
     gnome-core )
       cp ../libs/gnome-core.dep dependencies/
@@ -91,13 +89,10 @@ inline_doc
       cp ../libs/kde-{core,full}.dep dependencies/
       ;;
     kde-koffice )
-      cp ../libs/kde-{core,full}.dep dependencies/
-      echo -e "koffice\nkde-full\nkde-core" > dependencies/kde-koffice.dep
+      cp ../libs/kde-{core,full,koffice}.dep dependencies/
       ;;
     xorg7 ) # At atarget level, add also x-config and x-setup
-      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" > dependencies/xorg7.dep
+      cp ../libs/xorg7.dep dependencies/
       ;;
     * ) # Default
       xsltproc --stringparam dependencies $DEP_LEVEL \
@@ -272,9 +267,8 @@ inline_doc
         # Skip the creation when all dependencies are circular.
         alsa-lib | cracklib | libexif | unixodbc ) ;;
         # Meta-packages at dependency level (ugly *.dep files, but work for now)
-        alsa ) # When dependency "alsa", use all alsa-* packages
-          echo -e "alsa-oss\nalsa-firmware\nalsa-tools\nalsa-utils\n \
-                   alsa-plugins\nalsa-lib" > dependencies/alsa.dep
+        alsa )
+          cp ../libs/alsa.dep dependencies/
           ;;
         kde-core )
           cp ../libs/kde-core.dep dependencies/
@@ -282,10 +276,9 @@ inline_doc
         x-window-system ) # X11 alternatives
           echo -e "x-config\nx-setup\n$X11" > dependencies/x-window-system.dep
           ;;
-        xorg7 )
-          echo -e "rman\nxterm2\nxorg7-driver\nxorg7-server\nluit\nxorg7-font\n \
-                   xorg7-data\nxorg7-app\nxbitmaps\nmesalib\nlibdrm\n \
-                   xorg7-lib\nxorg7-util\nxorg7-proto" > dependencies/xorg7.dep
+        xorg7 ) # At dependencies level, remove x-config and x-setup
+          cp ../libs/xorg7.dep dependencies/
+          sed -i '/x-config/d;/x-setup/d' dependencies/xorg7.dep
           ;;
         * ) xsltproc --stringparam dependencies $DEP_LV \
                -o dependencies/$DEP.dep ../libs/dependencies.xsl ../$DEP_XML
@@ -337,7 +330,7 @@ inline_doc
   #------------------
   if [[ "$PKG" = "xorg7" ]] ; then
     # Add their XInclude
-    PKG_XML=`grep "^$PKG[[:space:]]" ../packages | cut -f2`
+    PKG_XML=blfs-xml/x/installing/xorg7.xml
     echo -e "    $ENTRY_START$PKG_XML$ENTRY_END" >> xincludes/$PKG.xinc.tmp
   fi
 
diff --git a/BLFS/libs/func_packages b/BLFS/libs/func_packages
index fb3a4eb..a6bd8a4 100644
--- a/BLFS/libs/func_packages
+++ b/BLFS/libs/func_packages
@@ -18,19 +18,21 @@ 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' packages.tmp
-  sed -i '/obsolete/d;/postlfs-/d;/-client.xml/d' packages.tmp
+  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
 
   # 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
 EOF
 } > packages
 
@@ -116,3 +118,24 @@ generate_kde_full()  {     # KDE full
   tac kde-full.dep.tmp > libs/kde-full.dep
   rm kde-full.dep.tmp
 }
+
+#--------------------------#
+generate_kde_koffice()  {  # KDE full + Koffice
+#--------------------------#
+  echo -e "koffice\nkde-full\nkde-core" > libs/kde-koffice.dep
+}
+
+#--------------------------#
+generate_alsa()  {         # ALSA packages
+#--------------------------#
+  echo -e "alsa-oss\nalsa-firmware\nalsa-tools\nalsa-utils\n \
+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
+}
diff --git a/BLFS/update_book.sh b/BLFS/update_book.sh
index 734544b..a04cfac 100755
--- a/BLFS/update_book.sh
+++ b/BLFS/update_book.sh
@@ -74,6 +74,10 @@ echo -en "\n\tGenerating packages file ..."
 generate_packages
 echo "done."
 
+echo -en "\tGenerating alsa dependencies list ..."
+generate_alsa
+echo "done."
+
 echo -en "\tGenerating gnome-core dependencies list ..."
 generate_gnome_core
 echo "done."
@@ -88,5 +92,13 @@ echo "done."
 
 echo -en "\tGenerating kde-full dependencies list ..."
 generate_kde_full
-echo -e "done.\n"
+echo -e "done."
+
+echo -en "\tGenerating kde-koffice dependencies list ..."
+generate_kde_koffice
+echo -e "done."
+
+echo -en "\tGenerating xorg7 dependencies list ..."
+generate_xorg7
+echo "done."