Changeset e576789 for common

Timestamp:

10/29/2013 03:42:03 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

5795ad7

Parents:

2e64c47

Message:

Merge ablfs branch. Normally, jhalfs should not perform differently
for building LFS

Location:

common

Files:

• blfs-tool-deps/901-libxml2 (deleted)
• blfs-tool-deps/902-libxslt (deleted)
• blfs-tool-deps/903-tidy (deleted)
• blfs-tool-deps/904-unzip (deleted)
• blfs-tool-deps/905-docbook-xml (deleted)
• blfs-tool-deps/906-docbook-xsl (deleted)
• blfs-tool-deps/907-gpm (deleted)
• blfs-tool-deps/908-lynx (deleted)
• blfs-tool-deps/909-sudo (deleted)
• blfs-tool-deps/910-wget (deleted)
• blfs-tool-deps/911-sqlite (deleted)
• blfs-tool-deps/912-apr (deleted)
• blfs-tool-deps/913-apr-util (deleted)
• blfs-tool-deps/914-subversion (deleted)
• blfs-tool-deps/apr-1.4.5-config.patch (deleted)
• blfs-tool-deps/apr-util-1.4.1-config.patch (deleted)
• common-functions (modified) (2 diffs)
• libs/func_blfs_deps (deleted)
• libs/func_book_parser (modified) (1 diff)
• libs/func_download_pkgs (modified) (1 diff)
• libs/func_install_blfs (added)
• libs/func_validate_configs.sh (modified) (1 diff)

common/common-functions

@@ -74 +74 @@
       sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt,run}
       sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
+      if [[ "${BLFS_TOOL}" = "y" ]] ; then 
+        sudo rm -rf $BUILDDIR/$BLFS_ROOT
+      fi
       echo "done"
       echo -n "Cleaning $JHALFSDIR ..."
@@ -108 +111 @@
 
 
-[[ $VERBOSITY2 > 0 ]] && echo -n "Loading <func_blfs_deps>..."
-source $COMMON_DIR/libs/func_blfs_deps
-[[ $? > 0 ]] && echo "file libs/func_blfs_deps did not load.." && exit 1
-[[ $VERBOSITY2 > 0 ]] && echo "OK"
-
 [[ $VERBOSITY2 > 0 ]] && echo -n "    ..."

common/libs/func_book_parser

@@ -153 +153 @@
   esac
 
-  [[ "${BLFS_TOOL}" = "y" ]] && copy_blfs_deps_scripts
-
   echo "done"
 

common/libs/func_download_pkgs

@@ -181 +181 @@
   cd $BUILDDIR/sources
 
-  if [[ "${BLFS_TOOL}" = "y" ]]; then
-    add_blfs_deps_urls
-  fi
-
   if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
     add_CustomToolsURLS

common/libs/func_validate_configs.sh

@@ -58 +58 @@
   # 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_LIBXML DEP_LIBXSLT DEP_TIDY \
                                  DEP_DBXML DEP_LYNX DEP_SUDO DEP_WGET \
-                                 DEP_SVN DEP_GPM"
+                                 DEP_SVN DEP_GPM DEP_OPENSSL DEP_PYTHON"
   local -r custom_tool_PARAM_LIST="TRACKING_DIR"