r530 - in x86/trunk: . packages/nfs-utils

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 16:04:35 PDT 2005


Author: justin
Date: 2005-08-02 17:04:35 -0600 (Tue, 02 Aug 2005)
New Revision: 530

Modified:
   x86/trunk/packages/nfs-utils/Makefile
   x86/trunk/todo-list
Log:
Updated nfs-utils Makefile, bumped version.

Modified: x86/trunk/packages/nfs-utils/Makefile
===================================================================
--- x86/trunk/packages/nfs-utils/Makefile	2005-08-02 22:57:21 UTC (rev 529)
+++ x86/trunk/packages/nfs-utils/Makefile	2005-08-02 23:04:35 UTC (rev 530)
@@ -1,31 +1,59 @@
 # NFS Utilities Makefile
+#==============================================================================
 
-# Package versions
 NM= nfs-utils
-VRS= 1.0.6
+VRS= 1.0.7
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://ftp.kernel.org/pub/linux/utils/nfs/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
+SHA-$(FILE)= dd84793fbfb88098da4242ec70844604652602c4
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+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 /usr/sbin/exportfs ] ; then unpack $(FILE) && cd $(DIR) && \
-	 groupadd -g 99 nogroup && \
-	 useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup -s /bin/false -u 99 nobody && \
-	 ./configure --prefix=/usr --sysconfdir=/etc --disable-nfsv4 --disable-gss && \
-	 make && \
-	 make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@groupadd -g 99 nogroup
+	@useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup -s /bin/false -u 99 nobody
+	@./configure --prefix=/usr --sysconfdir=/etc --disable-nfsv4 \
+	 --disable-gss >../$(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-02 22:57:21 UTC (rev 529)
+++ x86/trunk/todo-list	2005-08-02 23:04:35 UTC (rev 530)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-nfs-utils
 openssh
 openssl
 pango




More information about the livecd mailing list