Changeset 82eb8c1 for common

Timestamp:

06/01/2006 06:42:08 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

190d3a2

Parents:

5842156

Message:

Creating "unpacked" inside souces dir instead /tmp and referencing it via envar.

Location:

common

Files:

• common-functions (modified) (6 diffs)
• config (modified) (1 diff)
• makefile-functions (modified) (1 diff)

common/common-functions

@@ -248 +248 @@
   local FILE=$1
   local optSAVE_PREVIOUS=$2
-  
+
   if [ "${optSAVE_PREVIOUS}" != "1" ]; then
     wrt_remove_existing_dirs "$FILE"
@@ -255 +255 @@
 cat << EOF
         @\$(call unpack,$FILE)
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+        @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
         echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
         chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
@@ -275 +275 @@
 cat  << EOF
         @\$(call unpack2,$FILE)
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+        @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
         echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars
 EOF
@@ -294 +294 @@
 cat  << EOF
         @\$(call unpack3,$FILE)
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+        @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
         echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars
 EOF
@@ -413 +413 @@
 (
 cat << EOF
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+        @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
         rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
         if [ -e \$(MOUNT_PT)\$(SRC)/$name-build ]; then \\
@@ -429 +429 @@
 (
 cat << EOF
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+        @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
         rm -r \$(SRC)/\$\$ROOT && \\
         if [ -e \$(SRC)/$name-build ]; then \\

common/config

@@ -92 +92 @@
    LOGDIR=$JHALFSDIR/logs
 
+#--- File listing package contents (from where package sources dir is extracted)
+PKG_LST=unpacked
+
 #--- ICA report log directory
 ICALOGDIR=$LOGDIR/ICA

common/makefile-functions

@@ -18 +18 @@
 define unpack
   @cd $(MOUNT_PT)$(SRC) && \
-  tar -xvf `ls -t $(1) | head -n1` > /tmp/unpacked
+  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
 endef
 
 define unpack2
   @cd $(MOUNT_PT)$(SRC) && \
-  /tools/bin/tar -xvf `ls -t $(1) | head -n1` > /tmp/unpacked
+  /tools/bin/tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
 endef
 
 define unpack3
   @cd $(SRC) && \
-  tar -xvf `ls -t $(1) | head -n1` > /tmp/unpacked
+  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
 endef