r480 - x86/trunk/packages/sysvinit

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 20:03:56 PDT 2005


Author: justin
Date: 2005-08-01 21:03:56 -0600 (Mon, 01 Aug 2005)
New Revision: 480

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

Modified: x86/trunk/packages/sysvinit/Makefile
===================================================================
--- x86/trunk/packages/sysvinit/Makefile	2005-08-02 02:32:09 UTC (rev 479)
+++ x86/trunk/packages/sysvinit/Makefile	2005-08-02 03:03:56 UTC (rev 480)
@@ -1,34 +1,62 @@
 # Sysvinit Makefile
+#==============================================================================
 
-# Package versions
 NM= sysvinit
 VRS= 2.86
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-reexec06-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= e4b8c4ab3b080dd8cc3f29f0c38a32fc7307d8ef
 
-# RULES
+PATCH1= $(DIR)-reexec06-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= d06fd7274e767c1c98be27d1dc4adb135260e479
 
-.PHONY:  clean stage2 chroot
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /sbin/init ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH) && \
-	 sed -i 's at Sending processes@& started by init at g' src/init.c && \
-	 ROOT="" make -j3 -C src && ROOT="" make -C src install && \
-	 cp $(ROOT)/etc/inittab /etc ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH) >../$(DIR)-$@.log 2>&1
+	@sed -i 's at Sending processes@& started by init at g' src/init.c
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@ROOT="" make $(PM) -C src >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@ROOT="" make -C src install >>../$(DIR)-$@.log 2>&1
+	@cp $(ROOT)/etc/inittab /etc
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list