r468 - x86/trunk/packages/xfsprogs

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 14:06:56 PDT 2005


Author: justin
Date: 2005-08-01 15:06:55 -0600 (Mon, 01 Aug 2005)
New Revision: 468

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

Modified: x86/trunk/packages/xfsprogs/Makefile
===================================================================
--- x86/trunk/packages/xfsprogs/Makefile	2005-08-01 20:35:33 UTC (rev 467)
+++ x86/trunk/packages/xfsprogs/Makefile	2005-08-01 21:06:55 UTC (rev 468)
@@ -1,29 +1,49 @@
 # XFS Progs Makefile
+#==============================================================================
 
-# Package versions
 NM= xfsprogs
 VRS= 2.6.25
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).src.tar.gz
-URL= ftp://oss.sgi.com/projects/xfs/download/cmd_tars/$(FILE)
 
-#RULES
+FILE= $(DIR).src.tar.bz2
+URL-$(FILE)= $(HTTPBLFS)W-Z/$(FILE)
+SHA-$(FILE)= e9d4e493969176961dbe98b663ea1cac16fcacd9
 
-.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 /sbin/mkfs.xfs ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(DIR)-fix_compile-1.patch && \
-	 sed -i 's/autoconf//' Makefile && \
-	 make && make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(DIR)-fix_compile-1.patch
+	@sed -i 's/autoconf//' Makefile
+	@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