Changeset 5130b3a for common/libs

Timestamp:

11/17/2013 10:20:07 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

dda2496

Parents:

84a651c

Message:

Merge trunk r3750-3760

Location:

common/libs

Files:

• func_download_pkgs (modified) (1 diff)
• func_install_blfs (modified) (1 diff)
• func_validate_configs.sh (modified) (2 diffs)

common/libs/func_download_pkgs

@@ -27 +27 @@
   [[ ! -d $BUILDDIR/sources ]] && mkdir $BUILDDIR/sources
   cd $BUILDDIR/sources
-  [[ -f MD5SUMS ]] && rm MD5SUMS
-  [[ -f MISSING_FILES.DMP ]] && rm MISSING_FILES.DMP
-  [[ -f urls.lst ]] && rm urls.lst
+    # If using CLFS, /sources is writable by all, but with sticky bit,
+    # and user does not hold MD5SUMS nor the other files, so use sudo
+  [[ -f MD5SUMS ]] && sudo rm MD5SUMS
+  [[ -f MISSING_FILES.DMP ]] && sudo rm MISSING_FILES.DMP
+  [[ -f urls.lst ]] && sudo rm urls.lst
 
     # Generate URLs file

common/libs/func_install_blfs

@@ -27 +27 @@
     ${BUILDDIR}${BLFS_ROOT}/Makefile
 
-# Downloads the book, initialize the tracking file and the package database
+# If we have a working copy, copy it:
+if [[ "$BLFS_WORKING_COPY" = "y" ]]; then
+# -r: recursive; -u: only if newer; -T: otherwise, would copy to a subdirectory
+# of blfs-xml, if blfs-xml already exists
+  cp -ruT $BLFS_WC_LOCATION ${BUILDDIR}${BLFS_ROOT}/blfs-xml
+fi
+# Downloads the book if necessary, initialize the tracking file and the
+# package database.
 # sudo is needed if $BUILDDIR/var/lib is owned by root and /var/lib/jhalfs
 # has to be created

common/libs/func_validate_configs.sh

@@ -54 +54 @@
   local -r clfs2_PARAM_LIST="$CLFS2_book $GENERAL_common $CLFS2_build                  $ADVANCED_common"
   local -r clfs3_PARAM_LIST="$CLFS3_book $GENERAL_common $CLFS3_build                  $ADVANCED_common"
-  local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
-
-  # 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_DBXML DEP_LYNX DEP_SUDO DEP_WGET \
-                                 DEP_SVN DEP_GPM DEP_OPENSSL DEP_PYTHON"
+#  local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
+
+  # Additional variables
+  local -r blfs_tool_PARAM_LIST="\
+     BLFS_TREE BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR \
+     DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_DBXML DEP_LYNX DEP_SUDO DEP_WGET \
+     DEP_SVN DEP_GPM DEP_OPENSSL DEP_PYTHON"
   local -r custom_tool_PARAM_LIST="TRACKING_DIR"
 
@@ -185 +185 @@
                ;;
 
-      # BLFS params.
-      BRANCH_ID | BLFS_ROOT | BLFS_XML )  echo "`eval echo $PARAM_VALS`" ;;
-      TRACKING_DIR ) validate_dir -z -d -w ;;
-
       # Display non-validated envars found in ${PROGNAME}_PARAM_LIST
       * ) echo -e "`eval echo $PARAM_VALS`" ;;