r2090 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Oct 8 08:34:33 PDT 2005


Author: manuel
Date: 2005-10-08 09:34:32 -0600 (Sat, 08 Oct 2005)
New Revision: 2090

Modified:
   jhalfs/trunk/jhalfs
Log:
Fixed an issue when ./is added to the umpacked filenames, like in kbd-1.12.tar.bz2

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-08 14:52:37 UTC (rev 2089)
+++ jhalfs/trunk/jhalfs	2005-10-08 15:34:32 UTC (rev 2090)
@@ -393,7 +393,7 @@
 (
     cat << EOF
 	@\$(call unpack,$FILE)
-	@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
+	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	chown -R lfs \$(LFS)\$(SRC)/\$\$ROOT && \\
 	echo "PKGDIR=\$(LFS)\$(SRC)/\$\$ROOT" > envars && \\
 	echo "export PKGDIR" >> envars && \\
@@ -454,7 +454,7 @@
       if [ "$i" != "027-binutils-pass1" ] && [ "$i" != "032-tcl" ] && [ "$i" != "036-binutils-pass2" ] ; then
 (
     cat << EOF
-	@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
+	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\
 	if [ -e \$(LFS)\$(SRC)/$name-build ]; then \\
 		rm -r \$(LFS)\$(SRC)/$name-build; \\
@@ -499,7 +499,7 @@
 (
     cat << EOF
 	@if [ ! -e \$@ ] ; then \\
-		ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
+		ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 		rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\
 		rm -r \$(LFS)\$(SRC)/binutils-build; \\
 	fi;
@@ -511,7 +511,7 @@
 (
     cat << EOF
 	@if [ ! -e \$@ ] ; then \\
-		ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
+		ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 		rm -r \$(LFS)\$(SRC)/\$\$ROOT; \\
 	fi;
 EOF
@@ -563,7 +563,7 @@
 (
     cat  << EOF
 	@\$(call unpack,$FILE)
-	@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
+	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\
 	echo "export PKGDIR" >> envars
 EOF
@@ -617,7 +617,7 @@
     if [ "$vrs" != "" ] ; then
 (
     cat << EOF
-	@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
+	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\
 	if [ -e \$(LFS)\$(SRC)/$name-build ]; then \\
 		rm -r \$(LFS)\$(SRC)/$name-build; \\




More information about the alfs-log mailing list