r537 - in x86/trunk: . packages/e2fsprogs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 19:39:54 PDT 2005


Author: jhuntwork
Date: 2005-08-02 20:39:53 -0600 (Tue, 02 Aug 2005)
New Revision: 537

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

Modified: x86/trunk/packages/e2fsprogs/Makefile
===================================================================
--- x86/trunk/packages/e2fsprogs/Makefile	2005-08-02 23:21:25 UTC (rev 536)
+++ x86/trunk/packages/e2fsprogs/Makefile	2005-08-03 02:39:53 UTC (rev 537)
@@ -1,33 +1,59 @@
 # E2fsprogs Makefile
+#==============================================================================
 
-# Package versions
 NM= e2fsprogs
-VRS= 1.37
+VRS= 1.38
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 6c8ace4aa769bf63d5bad9302113c9732f270e4c
 
-# 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 /sbin/mke2fs ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 sed -i -e 's/-DTEST/$(ALL_CFLAGS) &/' lib/e2p/Makefile.in && \
-	 mkdir build && cd build && \
-	 ../configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs --disable-evms && \
-	 make && make install && make install-libs ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@mkdir build
+	@cd build ; ../configure --prefix=/usr --with-root-prefix="" \
+	 --enable-elf-shlibs --disable-evms >../../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@cd build ; make >>../../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@cd build ; make install >>../../$(DIR)-$@.log 2>&1
+	@cd build ; make install-libs >>../../$(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-02 23:21:25 UTC (rev 536)
+++ x86/trunk/todo-list	2005-08-03 02:39:53 UTC (rev 537)
@@ -1,4 +1,3 @@
-e2fsprogs
 grub
 hotplug
 inputattach




More information about the livecd mailing list