Changeset 323f805

Timestamp:

08/17/2006 08:41:38 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

f2a45d9

Parents:

de14f6a

Message:

Pre-generating dep files for alsa, kde-koffice, and xorg7.

Location:

BLFS

Files:

• libs/func_dependencies (modified) (5 diffs)
• libs/func_packages (modified) (4 diffs)
• update_book.sh (modified) (2 diffs)

BLFS/libs/func_dependencies

@@ -74 +74 @@
 
     # 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 )
@@ -92 +90 @@
       ;;
     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
@@ -273 +268 @@
         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 )
@@ -283 +277 @@
           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 \
@@ -338 +331 @@
   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

BLFS/libs/func_packages

@@ -19 +19 @@
 
   # 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
@@ -27 +27 @@
 {
   cat << EOF
+alsa    $BLFS_XML
 gnome-core      $BLFS_XML
 gnome-full      $BLFS_XML
@@ -32 +33 @@
 kde-full        $BLFS_XML
 kde-koffice     $BLFS_XML
+xorg7   $BLFS_XML
 EOF
 } > packages
@@ -117 +119 @@
   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
+}

BLFS/update_book.sh

@@ -75 +75 @@
 echo "done."
 
+echo -en "\tGenerating alsa dependencies list ..."
+generate_alsa
+echo "done."
+
 echo -en "\tGenerating gnome-core dependencies list ..."
 generate_gnome_core
@@ -89 +93 @@
 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."
+