r462 - x86/trunk/packages/inetutils

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Aug 1 11:38:08 PDT 2005


Author: thomasp
Date: 2005-08-01 12:38:05 -0600 (Mon, 01 Aug 2005)
New Revision: 462

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

Modified: x86/trunk/packages/inetutils/Makefile
===================================================================
--- x86/trunk/packages/inetutils/Makefile	2005-08-01 18:18:17 UTC (rev 461)
+++ x86/trunk/packages/inetutils/Makefile	2005-08-01 18:38:05 UTC (rev 462)
@@ -1,40 +1,66 @@
 # Inetutils Makefile
+#==============================================================================
 
-# Package versions
 NM= inetutils
 VRS= 1.4.2
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH1= $(DIR)-kernel_headers-1.patch
-PATCH2= $(DIR)-no_server_man_pages-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
-URL2= $(HTTP)/$(NM)/$(PATCH2)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 53841f98bd32a899461b67c319ec2bb18060d9c5
 
-# RULES
+PATCH1= $(DIR)-no_server_man_pages-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= ccd3c59f9ed4eca6f7a8dffb494ed8916087bc50
 
-.PHONY: chroot stage2 clean
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+	@chroot "$(MP)" $(chenv-pre-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH1) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
-	 mv $(PATCH2) $(SRC) ; fi
-	@if [ ! -f /bin/ping ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \
-	 ./configure --prefix=/usr --libexecdir=/usr/sbin --sysconfdir=/etc \
-	 --disable-logger --disable-syslogd --disable-whois --disable-servers && \
-	 make -j3 && make install && mv /usr/bin/ping /bin ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@./configure --prefix=/usr --libexecdir=/usr/sbin \
+	--sysconfdir=/etc --localstatedir=/var \
+	--disable-logger --disable-syslogd \
+	--disable-whois --disable-servers >../$(DIR)-$@.log 2>&1
+#
+#==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
+	@mv /usr/bin/ping /bin
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list