r437 - x86/trunk/packages/cpio

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Jul 31 23:15:28 PDT 2005


Author: justin
Date: 2005-08-01 00:15:27 -0600 (Mon, 01 Aug 2005)
New Revision: 437

Modified:
   x86/trunk/packages/cpio/Makefile
Log:
Updated cpio Makefile.

Modified: x86/trunk/packages/cpio/Makefile
===================================================================
--- x86/trunk/packages/cpio/Makefile	2005-08-01 05:56:38 UTC (rev 436)
+++ x86/trunk/packages/cpio/Makefile	2005-08-01 06:15:27 UTC (rev 437)
@@ -1,32 +1,60 @@
 # cpio Makefile
+#==============================================================================
 
-# Package versions
 NM= cpio
 VRS= 2.6
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://ftp.gnu.org/pub/gnu/cpio/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/A-C/$(FILE)
+SHA-$(FILE)= 4f65821ec10eb2c330a582fbc8112960c9849ecd
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+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 /bin/cpio ] ; then unpack $(FILE) && cd $(DIR) && \
-	 sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c && \
-	 ./configure CPIO_MT_PROG=mt --prefix=/usr --bindir=/bin --libexecdir=/tmp --with-rmt=/usr/sbin/rmt && \
-	 echo "#define HAVE_SETLOCALE 1" >>config.h && \
-	 echo "#define HAVE_LSTAT 1" >>config.h && \
-	 make -j3 && \
-	 make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c
+	@./configure CPIO_MT_PROG=mt --prefix=/usr --bindir=/bin \
+	 --libexecdir=/tmp --with-rmt=/usr/sbin/rmt >../$(DIR)-$@.log 2>&1
+	@echo "#define HAVE_SETLOCALE 1" >>config.h
+	@echo "#define HAVE_LSTAT 1" >>config.h
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list