r536 - in x86/trunk: . packages/pciutils

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 16:21:26 PDT 2005


Author: jhuntwork
Date: 2005-08-02 17:21:25 -0600 (Tue, 02 Aug 2005)
New Revision: 536

Modified:
   x86/trunk/packages/pciutils/Makefile
   x86/trunk/todo-list
Log:
Updated pciutils Makefile

Modified: x86/trunk/packages/pciutils/Makefile
===================================================================
--- x86/trunk/packages/pciutils/Makefile	2005-08-02 23:20:18 UTC (rev 535)
+++ x86/trunk/packages/pciutils/Makefile	2005-08-02 23:21:25 UTC (rev 536)
@@ -1,29 +1,48 @@
 # PCI Utilities Makefile
+#==============================================================================
 
-# Package versions
 NM= pciutils
 VRS= 2.1.11
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://www.kernel.org/pub/software/utils/$(NM)/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
+SHA-$(FILE)= fa561d97033d8992d2b20c5ca928e6a2ac9ebcfb
 
-#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 /usr/sbin/lspci ] ; then unpack $(FILE) && cd $(DIR) && \
-	 make PREFIX=/usr && \
-	 make PREFIX=/usr install && \
-	 update-pciids ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make PREFIX=/usr >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make PREFIX=/usr install >>../$(DIR)-$@.log 2>&1
+	@update-pciids
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 23:20:18 UTC (rev 535)
+++ x86/trunk/todo-list	2005-08-02 23:21:25 UTC (rev 536)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-pciutils
 procps
 psmisc
 shadow




More information about the livecd mailing list