r2078 - jhalfs/trunk

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Oct 4 18:14:48 PDT 2005


Author: jhuntwork
Date: 2005-10-04 19:14:48 -0600 (Tue, 04 Oct 2005)
New Revision: 2078

Modified:
   jhalfs/trunk/jhalfs
Log:
Reverted the cd into PKGDIR, already covered by envars. Fixed spurious '\' in Makefile.

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-05 01:01:06 UTC (rev 2077)
+++ jhalfs/trunk/jhalfs	2005-10-05 01:14:48 UTC (rev 2078)
@@ -524,7 +524,7 @@
 	@\$(call unpack,$FILE)
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
 	echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\
-	echo "export PKGDIR" >> envars\\
+	echo "export PKGDIR" >> envars
 EOF
 ) >> $MKFILE.tmp
     fi
@@ -550,22 +550,12 @@
 EOF
 ) >> $MKFILE.tmp
 
-    # If we have a package we need to cd into the directory
-    elif [ "$vrs" != "" ] ; then
-(
-    cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >logs/$i && \\
-	\$(CHROOT1) 'cd /jhalfs && source envars && cd \$\$PKGDIR && /jhalfs/commands/$file >>logs/$i 2>&1' && \\
-	echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >>logs/$i
-EOF
-) >> $MKFILE.tmp
-
     # The rest of Chapter06
     else
 (
     cat << EOF
 	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >logs/$i && \\
-	\$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/commands/$file >>logs/$i 2>&1' && \\
+	\$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/commands/$file >>/jhalfs/logs/$i 2>&1' && \\
 	echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >>logs/$i
 EOF
 ) >> $MKFILE.tmp




More information about the alfs-log mailing list