r1753 - branches/6.2

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Dec 3 22:45:19 PST 2006


Author: alexander
Date: 2006-12-03 23:45:16 -0700 (Sun, 03 Dec 2006)
New Revision: 1753

Modified:
   branches/6.2/Makefile
Log:
Added support for tarring up /tools

Modified: branches/6.2/Makefile
===================================================================
--- branches/6.2/Makefile	2006-11-13 03:31:54 UTC (rev 1752)
+++ branches/6.2/Makefile	2006-12-04 06:45:16 UTC (rev 1753)
@@ -169,7 +169,7 @@
 	@-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin \
 	 $(LFSSRC) $(MP)$(LFSSRC) $(SRC) $(MP)$(SRC) $(MKTREE)
 	@cp $(ROOT)/scripts/unpack $(WD)/bin
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'"
+	@make maybe-tools
 	@touch $(PKG)/wget/.pass2
 	@install -m644 -oroot -groot $(ROOT)/etc/{group,passwd} $(MP)/etc
 	@-ln -s $(WD)/bin/bash $(MP)/bin/bash
@@ -213,6 +213,14 @@
 	@make -C $(PKG)/wget prebuild
 	@touch $@
 
+maybe-tools:
+	@if [ -f tools.tar.bz2 ] ; then \
+	    tar -C .. -jxpf tools.tar.bz2 ; \
+	else \
+	    su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'" ; \
+	    tar -C .. -jcpf tools.tar.bz2 tools ; \
+	fi
+
 tools:  pre-which pre-wget lfs-binutils-pass1 lfs-gcc-pass1 \
 	lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
 	lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2 \




More information about the livecd mailing list