r430 - in x86/trunk: . packages/cdrtools

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Jul 31 14:40:41 PDT 2005


Author: jhuntwork
Date: 2005-07-31 15:40:39 -0600 (Sun, 31 Jul 2005)
New Revision: 430

Modified:
   x86/trunk/Makefile
   x86/trunk/packages/cdrtools/Makefile
Log:
Updated cdrtools Makefile

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-07-31 19:13:18 UTC (rev 429)
+++ x86/trunk/Makefile	2005-07-31 21:40:39 UTC (rev 430)
@@ -50,6 +50,7 @@
 # Default http server for the lfs-base packages
 #==============================================================================
 export HTTP := http://ftp.lfs-matrix.de/pub/lfs/lfs-packages/conglomeration
+export HTTPBLFS := http://ftp.lfs-matrix.de/pub/BLFS/SVN
 
 # Directory variables
 #==============================================================================

Modified: x86/trunk/packages/cdrtools/Makefile
===================================================================
--- x86/trunk/packages/cdrtools/Makefile	2005-07-31 19:13:18 UTC (rev 429)
+++ x86/trunk/packages/cdrtools/Makefile	2005-07-31 21:40:39 UTC (rev 430)
@@ -1,28 +1,49 @@
 # CDRTools Makefile
+#==============================================================================
 
-# Package versions
 NM= cdrtools
 VRS= 2.01
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= ftp://ftp.berlios.de/pub/cdrecord/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/A-C/$(FILE)
+SHA-$(FILE)= f94cfe51dd512d4e0b9106b986bde12d4f7967ce
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f $(WD)/bin/mkisofs ] ; then unpack $(FILE) && cd $(DIR) && \
-	 make -j3 INS_BASE=$(WD) DEFINSUSR=root DEFINSGRP=root && \
-	 make -j3 INS_BASE=$(WD) DEFINSUSR=root DEFINSGRP=root install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root \
+	 >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install \
+	 >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list