Changeset 9b95f2a

Timestamp:

08/23/2006 06:45:03 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

431520b

Parents:

aea74cb

Message:

Fixed an oditie with x-window-system (I think).
Test if DEP has been already installed after packages remaping.

File:

• BLFS/libs/func_dependencies (modified) (2 diffs)

BLFS/libs/func_dependencies

@@ -178 +178 @@
   > xincludes/$PKG.xinc.tmp
   for DEP in `cat dependencies/$PKG.dep`; do
+
+    # Special packages that need be remaped
+    case $DEP in
+
+      db ) continue ;; # The proper version of DB is installed in LFS
+
+        # Don't have their own XML file
+      hal-requirements | hal-runtime-dependencies ) continue ;;
+      perl-* | tk-perl )         DEP=perl-modules ;;
+
+        # Orphan links (proper link must be created when generating the book)
+      arts )                     DEP=aRts ;;
+      kde )                      DEP=kde-core ;;
+
+        # Set values for alternative packages
+      LPRng | cups )             DEP=$PRINT_SERVER ;;
+      mitkrb | heimdal )         DEP=$KBR5 ;;
+      gs | espgs )               DEP=$GHOSTSCRIPT ;;
+      server-mail )              DEP=$MAIL_SERVER ;;
+      x-window-system )
+        case $X11 in
+          xorg7 ) DEP=xorg7 ;;
+              * )
+                  pkg_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f3)
+                  inst_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f4)
+                  [ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
+                  ;;
+        esac
+        ;;
+    esac
+
     # If DEP has been previouly installed, skip it
     pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
     inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
     [ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
-
-    # Special packages (a lot of hacks)
-    case $DEP in
-
-      db ) continue ;; # The proper version of DB is installed in LFS
-
-        # Don't have their own XML file
-      hal-requirements | hal-runtime-dependencies ) continue ;;
-      perl-* | tk-perl )         DEP=perl-modules ;;
-
-        # Orphan links (proper link must be created when generating the book)
-      arts )                     DEP=aRts ;;
-      kde )                      DEP=kde-core ;;
-
-        # Set values for alternative packages
-        # X is a meta-package, thus handled in another way.
-      LPRng | cups )             DEP=$PRINT_SERVER ;;
-      mitkrb | heimdal )         DEP=$KBR5 ;;
-      gs | espgs )               DEP=$GHOSTSCRIPT ;;
-      server-mail )              DEP=$MAIL_SERVER ;;
-    esac
 
     #------------------
@@ -273 +283 @@
           cp ../libs/kde-core.dep dependencies/
           ;;
-        x-window-system ) # X11 alternatives
+        x-window-system ) # When X11 is not Xorg7
           echo -e "x-config\nx-setup\n$X11" > dependencies/x-window-system.dep
           ;;
-        xorg7 ) # At dependencies level, remove x-config and x-setup
+        xorg7 )
           cp ../libs/xorg7.dep dependencies/
-          sed -i '/x-config/d;/x-setup/d' dependencies/xorg7.dep
           ;;
         * ) xsltproc --stringparam dependencies $DEP_LV \