r555 - in x86/trunk: . packages/shadow

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 8 17:25:15 PDT 2005


Author: justin
Date: 2005-08-08 18:25:14 -0600 (Mon, 08 Aug 2005)
New Revision: 555

Modified:
   x86/trunk/packages/shadow/Makefile
   x86/trunk/todo-list
Log:
Updated shadow Makefile, bumped version to 4.0.10.

Modified: x86/trunk/packages/shadow/Makefile
===================================================================
--- x86/trunk/packages/shadow/Makefile	2005-08-08 23:38:25 UTC (rev 554)
+++ x86/trunk/packages/shadow/Makefile	2005-08-09 00:25:14 UTC (rev 555)
@@ -1,43 +1,70 @@
 # Shadow Makefile
+#==============================================================================
 
-# Package versions
 NM= shadow
-VRS= 4.0.9
+VRS= 4.0.10
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= df6e5feb481cdc24b7f675ad0fc17c65f0798167
 
-# 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 [ ! -d /etc/default ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --libdir=/lib --enable-shared && \
-	 sed -i 's/groups$$(EXEEXT) //' src/Makefile && \
-	 sed -i '/groups/d' man/Makefile && \
-	 make -j3 && make install && \
-	 cp etc/{limits,login.access} /etc && \
-	 cp etc/login.defs.linux /etc/login.defs && \
-	 sed -i -e 's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --libdir=/lib --enable-shared >../$(DIR)-$@.log 2>&1
+	@sed -i 's/groups$$(EXEEXT) //' src/Makefile
+	@sed -i '/groups/d' man/Makefile
+#
+#==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
+	@cp etc/{limits,login.access} /etc
+	@cp etc/login.defs.linux /etc/login.defs
+	@sed -i -e 's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
 	     -e 's@/var/spool/mail@/var/mail@' \
-	     -e 's at MAIL_CHECK_ENAB..yes@MAIL_CHECK_ENAB no@' /etc/login.defs && \
-	 mv /usr/bin/passwd /bin && \
-	 mv /lib/libshadow.*a /usr/lib && \
-	 rm /lib/libshadow.so && \
-	 ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so && \
-	 mkdir /etc/default && \
-	 pwconv && grpconv ; fi
-	@make clean
-	 
+	     -e 's at MAIL_CHECK_ENAB..yes@MAIL_CHECK_ENAB no@' /etc/login.defs
+	@mv /usr/bin/passwd /bin
+	@mv /lib/libshadow.*a /usr/lib
+	@rm /lib/libshadow.so
+	@ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
+	@mkdir /etc/default
+	@pwconv
+	@grpconv
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-08 23:38:25 UTC (rev 554)
+++ x86/trunk/todo-list	2005-08-09 00:25:14 UTC (rev 555)
@@ -1,4 +1,3 @@
 lfs-bootscripts
 procps
 psmisc
-shadow




More information about the livecd mailing list