r735 - x86/trunk/scripts

justin at linuxfromscratch.org justin at linuxfromscratch.org
Fri Sep 23 21:46:55 PDT 2005


Author: justin
Date: 2005-09-23 22:46:55 -0600 (Fri, 23 Sep 2005)
New Revision: 735

Modified:
   x86/trunk/scripts/functions
Log:
Merged changes to messages and logging by Alexander Patrakov to the trunk functions file.

Modified: x86/trunk/scripts/functions
===================================================================
--- x86/trunk/scripts/functions	2005-09-24 04:16:55 UTC (rev 734)
+++ x86/trunk/scripts/functions	2005-09-24 04:46:55 UTC (rev 735)
@@ -17,20 +17,39 @@
 endef
 
 define std_build
-        @unpack $(FILE)
-        @make -C $(DIR) -f ../Makefile compile-$@
-        @make clean
+	@$(call echo_message, Building)
+        @unpack $(FILE) >$(DIR)-$@.log 2>&1
+        @make -C $(DIR) -f ../Makefile compile-$@ >>$(DIR)-$@.log 2>&1
+        @make clean >>$(DIR)-$@.log 2>&1
         @touch $@
 endef
 
+define std_build_noclean
+	@$(call echo_message, Building)
+        @unpack $(FILE) >$(DIR)-$@.log 2>&1
+        @make -C $(DIR) -f ../Makefile compile-$@ >>$(DIR)-$@.log 2>&1
+        @touch $@
+endef
+
 define sep_dir_build
-	@unpack $(FILE)
-	@rm -rf $(NM)-build
-	@mkdir $(NM)-build
-	@$(MAKE) -C $(NM)-build -f ../Makefile compile-$@
+	@$(call echo_message, Building)
+	@unpack $(FILE) >$(DIR)-$@.log 2>&1
+	@rm -rf $(NM)-build >>$(DIR)-$@.log 2>&1
+	@mkdir -v $(NM)-build >>$(DIR)-$@.log 2>&1
+	@$(MAKE) -C $(NM)-build -f ../Makefile compile-$@ >>$(DIR)-$@.log 2>&1
+	@make clean >>$(DIR)-$@.log 2>&1
 	@touch $@
 endef
 
+define sep_dir_build_noclean
+	@$(call echo_message,Building)
+	@unpack $(FILE) >$(DIR)-$@.log 2>&1
+	@rm -rf $(NM)-build >>$(DIR)-$@.log 2>&1
+	@mkdir -v $(NM)-build >>$(DIR)-$@.log 2>&1
+	@$(MAKE) -C $(NM)-build -f ../Makefile compile-$@ >>$(DIR)-$@.log 2>&1
+	@touch $@
+endef
+
 # This takes the form of 'download [filename] [url] [sha1sum]'
 define download
 	@cd $(SRC) ; if [ ! -f $(1) ] ; then $(WGET) $(2) ; \
@@ -42,7 +61,7 @@
 	@ln -sf $(SRC)/$(1) .
 endef
 
-%.gz %.tgz %.bz2 %.zip %.patch %.rules:
+%.gz %.tgz %.bz2 %.zip %.patch %.rules %.ttf:
 	$(call download,$@,$(URL-$@),$(SHA-$@))
 
 wget-list-entry:
@@ -58,3 +77,5 @@
 	@echo $(URL-$(PATCH3)) >>$(MKTREE)/wget-list
 	@echo $(URL-$(PATCH4)) >>$(MKTREE)/wget-list
 	@echo $(URL-$(PATCH5)) >>$(MKTREE)/wget-list
+	@echo $(URL-$(PATCH6)) >>$(MKTREE)/wget-list
+	@echo $(URL-$(PATCH7)) >>$(MKTREE)/wget-list




More information about the livecd mailing list