r540 - in x86/trunk: . packages/grub

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 21:15:29 PDT 2005


Author: jhuntwork
Date: 2005-08-02 22:15:28 -0600 (Tue, 02 Aug 2005)
New Revision: 540

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

Modified: x86/trunk/packages/grub/Makefile
===================================================================
--- x86/trunk/packages/grub/Makefile	2005-08-03 04:09:24 UTC (rev 539)
+++ x86/trunk/packages/grub/Makefile	2005-08-03 04:15:28 UTC (rev 540)
@@ -1,31 +1,56 @@
 # Grub Makefile
+#==============================================================================
 
-# Package versions
 NM= grub
-VRS= 0.96
+VRS= 0.97
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 51d60ce71a40e6ecf6870b3a96067b7866a2c477
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY:  clean stage2 chroot
+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 /usr/sbin/grub ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr >../$(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
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-03 04:09:24 UTC (rev 539)
+++ x86/trunk/todo-list	2005-08-03 04:15:28 UTC (rev 540)
@@ -1,4 +1,3 @@
-grub
 hotplug
 inputattach
 lfs-bootscripts




More information about the livecd mailing list