Changeset 5842156

Timestamp:

06/01/2006 02:34:38 AM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

82eb8c1

Parents:

b9ec725

Message:

Added function(s) wrt_delete_existings_dirs. Requested by Gerald B

Files:

• HLFS/master.sh (modified) (1 diff)
• common/common-functions (modified) (4 diffs)

HLFS/master.sh

@@ -142 +142 @@
       esac
       # Insert instructions for unpacking the package and to set the PKGDIR variable.
-      wrt_unpack "$FILE"
+      case $this_script in
+        *binutils* ) 
+          wrt_unpack "$FILE" 1 ;; # Do not delete an existing package directories
+        *)
+          wrt_unpack "$FILE" ;;
+      esac
       [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     fi

common/common-functions

@@ -210 +210 @@
 
 #----------------------------------#
+wrt_remove_existing_dirs() {       #
+#----------------------------------#
+  local PKG_NAME=$1
+(
+cat << EOF
+        @ROOT=\`tar -tf \$(MOUNT_PT)\$(SRC)/${PKG_NAME} | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
+        [[ -n \$\$ROOT ]] && \\
+        rm -rf \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
+        if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build ]; then \\
+                rm -rf \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build; \\
+        fi;
+EOF
+) >> $MKFILE.tmp
+}
+
+#----------------------------------#
+wrt_remove_existing_dirs2() {      #
+#----------------------------------#
+  local PKG_NAME=$1
+(
+cat << EOF
+        @ROOT=\`tar -tf \$(SRC)/${PKG_NAME} | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
+        [[ -n \$\$ROOT ]] && \\
+        rm -rf \$(SRC)/\$\$ROOT && \\
+        if [ -e \$(SRC)/${PKG_NAME%%-*}-build ]; then \\
+                rm -rf \$(SRC)/${PKG_NAME%%-*}-build; \\
+        fi;
+EOF
+) >> $MKFILE.tmp
+}
+
+
+
+#----------------------------------#
 wrt_unpack() {                     # Unpack and set 'ROOT' var
 #----------------------------------#
   local FILE=$1
+  local optSAVE_PREVIOUS=$2
+  
+  if [ "${optSAVE_PREVIOUS}" != "1" ]; then
+    wrt_remove_existing_dirs "$FILE"
+  fi
 (
 cat << EOF
@@ -228 +267 @@
 #----------------------------------#
   local FILE=$1
+  local optSAVE_PREVIOUS=$2
+
+  if [ "${optSAVE_PREVIOUS}" != "1" ]; then
+    wrt_remove_existing_dirs "$FILE"
+  fi
 (
 cat  << EOF
@@ -242 +286 @@
 #----------------------------------#
   local FILE=$1
+  local optSAVE_PREVIOUS=$2
+
+  if [ "${optSAVE_PREVIOUS}" != "1" ]; then
+    wrt_remove_existing_dirs2 "$FILE"
+  fi
 (
 cat  << EOF
@@ -250 +299 @@
 ) >> $MKFILE.tmp
 }
-
 
 #----------------------------------#