Changeset e05fba2 for common

Timestamp:

07/24/2007 09:04:34 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:

e45c588

Parents:

cf829f0

Message:

DocBook-XSL package is not required for now.

Location:

common/libs

Files:

• func_blfs_deps (modified) (2 diffs)
• func_check_version.sh (modified) (1 diff)
• func_validate_configs.sh (modified) (1 diff)

common/libs/func_blfs_deps

@@ -30 +30 @@
   fi
 
-  if [[ "${DEP_DBXSL}" = "y" ]] ; then
-    echo "${DBXSL_URL} ${BLFS_SERVER}docbook-xsl/${DBXSL_PKG} ${DBXSL_MD5}" >> urls.lst
-  fi
+#   if [[ "${DEP_DBXSL}" = "y" ]] ; then
+#     echo "${DBXSL_URL} ${BLFS_SERVER}docbook-xsl/${DBXSL_PKG} ${DBXSL_MD5}" >> urls.lst
+#   fi
 
   if [[ "${DEP_LINKS}" = "y" ]] ; then
@@ -85 +85 @@
   fi
 
-  if [[ "${DEP_DBXSL}" = "y" ]] ; then
-    mv blfs-tool-deps/906-docbook-xsl ${PROGNAME}-commands/blfs-tool-deps
-  fi
+#   if [[ "${DEP_DBXSL}" = "y" ]] ; then
+#     mv blfs-tool-deps/906-docbook-xsl ${PROGNAME}-commands/blfs-tool-deps
+#   fi
 
   if [[ "${DEP_LINKS}" = "y" ]] ; then

common/libs/func_check_version.sh

@@ -150 +150 @@
     fi
 
-    if [[ -z "$DEP_DBXSL" ]] ; then
-      if `echo $XML_FILE | xsltproc --noout - 2>/dev/null` ; then
-        check_version "1.69.1" "1.69.1" "DocBook XSL"
-      else
-        echo "Warning: not found a working DocBook XSL 1.69.1 installation"
-        exit 2
-      fi
-    fi
+#     if [[ -z "$DEP_DBXSL" ]] ; then
+#       if `echo $XML_FILE | xsltproc --noout - 2>/dev/null` ; then
+#         check_version "1.69.1" "1.69.1" "DocBook XSL"
+#       else
+#         echo "Warning: not found a working DocBook XSL 1.69.1 installation"
+#         exit 2
+#       fi
+#     fi
 
   fi # end BLFS_TOOL=Y

common/libs/func_validate_configs.sh

@@ -55 +55 @@
   local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
 
-  # Additional variables
+  # Additional variables (add DEP_DBXSL when required again)
   local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR \
                                  DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP \
-                                 DEP_DBXML DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET \
+                                 DEP_DBXML DEP_LINKS DEP_SUDO DEP_WGET \
                                  DEP_SVN DEP_GPM"
   local -r custom_tool_PARAM_LIST="TRACKING_DIR"