r556 - in x86/trunk: . packages/lfs-bootscripts

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 8 17:33:37 PDT 2005


Author: justin
Date: 2005-08-08 18:33:37 -0600 (Mon, 08 Aug 2005)
New Revision: 556

Modified:
   x86/trunk/packages/lfs-bootscripts/Makefile
   x86/trunk/todo-list
Log:
Updated lfs-bootscripts Makefile.

Modified: x86/trunk/packages/lfs-bootscripts/Makefile
===================================================================
--- x86/trunk/packages/lfs-bootscripts/Makefile	2005-08-09 00:25:14 UTC (rev 555)
+++ x86/trunk/packages/lfs-bootscripts/Makefile	2005-08-09 00:33:37 UTC (rev 556)
@@ -1,42 +1,52 @@
 # LFS-Bootscripts Makefile
+#==============================================================================
 
-# Package versions
 NM= lfs-bootscripts
 VRS= 3.2.1
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 6de412b717ae09fbaf701ec9485b60f496f173aa
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY:  clean stage2 chroot
+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 $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /etc/rc.d/init.d/functions ] ; then unpack ${SRC}/${FILE} && \
-	 cd ${DIR} && make install-livecd && \
-	 install -m 755 lfs/init.d/mountkernfs /etc/rc.d/init.d && \
-	 ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernks && \
-	 install -m 755 ../udev /etc/rc.d/init.d/ && \
-	 ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev && \
-	 install -m 755 ../mountfs /etc/rc.d/init.d/ && \
-	 ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs && \
-	 install -m 755 ../clkconf /etc/rc.d/init.d/ && \
-	 ln -sf ../init.d/clkconf /etc/rc.d/rcsysinit.d/S59clkconf && \
-	 install -m 755 ../langconf /etc/rc.d/init.d/ && \
-	 ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf && \
-	 install -m 755 ../console /etc/rc.d/init.d/ && \
-	 rm -f /etc/rc.d/rc0.d/S99halt && \
-	 rm -f /etc/rc.d/rc6.d/S99reboot && \
-	 rm -f /etc/rc.d/*/*mountsqfs /etc/rc.d/*/*startup ; fi
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install-livecd >../$(DIR)-$@.log 2>&1
+	@install -m 755 lfs/init.d/mountkernfs /etc/rc.d/init.d
+	@ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernks
+	@install -m 755 ../udev /etc/rc.d/init.d/
+	@ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev
+	@install -m 755 ../mountfs /etc/rc.d/init.d/
+	@ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs
+	@install -m 755 ../clkconf /etc/rc.d/init.d/
+	@ln -sf ../init.d/clkconf /etc/rc.d/rcsysinit.d/S59clkconf
+	@install -m 755 ../langconf /etc/rc.d/init.d/
+	@ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf
+	@install -m 755 ../console /etc/rc.d/init.d/
+	@rm -f /etc/rc.d/rc0.d/S99halt
+	@rm -f /etc/rc.d/rc6.d/S99reboot
+	@rm -f /etc/rc.d/*/*mountsqfs /etc/rc.d/*/*startup
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
-	@-rm -rf bootscripts
+	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-09 00:25:14 UTC (rev 555)
+++ x86/trunk/todo-list	2005-08-09 00:33:37 UTC (rev 556)
@@ -1,3 +1,2 @@
-lfs-bootscripts
 procps
 psmisc




More information about the livecd mailing list