r2757 - in jhalfs/trunk: LFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Thu Jun 8 19:31:22 PDT 2006


Author: georgeb
Date: 2006-06-08 20:31:22 -0600 (Thu, 08 Jun 2006)
New Revision: 2757

Modified:
   jhalfs/trunk/LFS/config
   jhalfs/trunk/common/common-functions
Log:
small adjustment to delete before unpack routine, better handling of non-standard names

Modified: jhalfs/trunk/LFS/config
===================================================================

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-06-09 00:15:21 UTC (rev 2756)
+++ jhalfs/trunk/common/common-functions	2006-06-09 02:31:22 UTC (rev 2757)
@@ -218,8 +218,8 @@
 	ROOT=\`tar -tf \$\$PKG_PATH | 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; \\
+	if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%-*}-build ]; then \\
+		rm -rf \$(MOUNT_PT)\$(SRC)/${PKG_NAME%-*}-build; \\
 	fi;
 EOF
 ) >> $MKFILE.tmp
@@ -235,8 +235,8 @@
 	ROOT=\`tar -tf \$\$PKG_PATH | 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; \\
+	if [ -e \$(SRC)/${PKG_NAME%-*}-build ]; then \\
+		rm -rf \$(SRC)/${PKG_NAME%-*}-build; \\
 	fi;
 EOF
 ) >> $MKFILE.tmp




More information about the alfs-log mailing list