r431 - in x86/trunk: initramfs packages/unionfs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Jul 31 14:51:56 PDT 2005


Author: jhuntwork
Date: 2005-07-31 15:51:55 -0600 (Sun, 31 Jul 2005)
New Revision: 431

Modified:
   x86/trunk/initramfs/Makefile
   x86/trunk/packages/unionfs/Makefile
Log:
Minor mods to initramfs Makefile, updated unionfs Makefile

Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile	2005-07-31 21:40:39 UTC (rev 430)
+++ x86/trunk/initramfs/Makefile	2005-07-31 21:51:55 UTC (rev 431)
@@ -1,13 +1,13 @@
 # Makefile for initramfs included on the LFS livecd
-# Written by Jeremy Huntwork, 2004-12-16
 #
 
-all: initramfs_data.cpio.gz
 MK= mknod
 CP= cp
 WD= temp
 KLIBC= /usr/lib/klibc
 
+all: initramfs_data.cpio.gz
+
 initramfs_data.cpio.gz: init
 	mkdir -p $(WD)/{dev,bin,lib,.tmpfs,.union}
 	$(CP) $(KLIBC)/bin/{insmod,isoinfo,ln,losetup,mkdir,mount,run-init,sh,sleep} $(WD)/bin

Modified: x86/trunk/packages/unionfs/Makefile
===================================================================
--- x86/trunk/packages/unionfs/Makefile	2005-07-31 21:40:39 UTC (rev 430)
+++ x86/trunk/packages/unionfs/Makefile	2005-07-31 21:51:55 UTC (rev 431)
@@ -1,30 +1,50 @@
 # Unionfs Makefile
+#==============================================================================
 
-# Package versions
 NM= unionfs
 VRS= 1.0.11
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.gz
-URL= ftp://ftp.fsl.cs.sunysb.edu/pub/$(NM)/$(FILE)
+URL-$(FILE)= ftp://ftp.fsl.cs.sunysb.edu/pub/$(NM)/$(FILE)
+SHA-$(FILE)= ee4f67f7c84d1ece8ede4d5841d086a5f77df02c
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+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 $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /lib/modules/$(KVERS)/kernel/fs/unionfs.ko ] ; then unpack $(FILE) && cd $(DIR) && \
-	 make KVERS=$(KVERS) PREFIX=/usr EXTRACFLAGS=-DNODEBUG && \
-	 make KVERS=$(KVERS) PREFIX=/usr EXTRACFLAGS=-DNODEBUG install && \
-	 strip --strip-debug /lib/modules/$(KVERS)/kernel/fs/unionfs.ko ; fi
-	@make clean
-	
+stage2: Makefile $(FILE) 
+	@$(std_build) 
 
+compile-stage2:
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make KVERS=$(KVERS) PREFIX=/usr EXTRACFLAGS=-DNODEBUG \
+	 >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make KVERS=$(KVERS) PREFIX=/usr EXTRACFLAGS=-DNODEBUG install \
+	 >>../$(DIR)-$@.log 2>&1
+	@strip --strip-debug /lib/modules/$(KVERS)/kernel/fs/unionfs.ko
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list