r387 - in x86/trunk/packages: coreutils gawk

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 19 19:52:49 PDT 2005


Author: jhuntwork
Date: 2005-07-19 20:52:48 -0600 (Tue, 19 Jul 2005)
New Revision: 387

Modified:
   x86/trunk/packages/coreutils/Makefile
   x86/trunk/packages/gawk/Makefile
Log:
Updated coreutils, added missing chroot target for gawk

Modified: x86/trunk/packages/coreutils/Makefile
===================================================================
--- x86/trunk/packages/coreutils/Makefile	2005-07-20 02:40:19 UTC (rev 386)
+++ x86/trunk/packages/coreutils/Makefile	2005-07-20 02:52:48 UTC (rev 387)
@@ -1,59 +1,112 @@
 # Coreutils Makefile
+#==============================================================================
 
-# Package versions
 NM= coreutils
 VRS= 5.2.1
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 1028755ae0fa9be840576e4837004cf5a9981c45 
+
 PATCH1= $(DIR)-uname-2.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 15e872e94319b29c3db4e9454d8d87ff3d51999b 
+
 PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
-URL2= $(HTTP)/$(NM)/$(PATCH2)
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 29b8d86879d6e654642b51b86766c7b8b2c53066 
 
-# RULES
 
-.PHONY: stage1 clean stage2 chroot
+# Targets
+# =============================================================================
 
-stage1:
-	@echo ""
-	@echo "=====> Building $(NM)"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(WD)/bin/ls ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=$(WD) && make -j3 && make install && \
-	 mv ${WD}/bin/uname ${WD}/bin/uname.real && \
-	 install -m 755 ${MP}${ROOT}/uname/uname ${WD}/bin/ ; fi
-	@make clean
+include $(ROOT)/scripts/functions
 
+stage1: $(FILE)
+	@$(std_build)
+	@cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH2)} $(LFSSRC)
+
+compile-stage1:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=$(WD) \
+	>../$(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
+	@mv ${WD}/bin/uname ${WD}/bin/uname.real 
+	@install -m 755 ${MP}${ROOT}/uname/uname ${WD}/bin/
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+	@chroot "$(MP)" $(chenv-pre-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH1) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
-	 mv $(PATCH2) $(SRC) ; fi
-	@if [ ! -f /bin/ls ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \
-	 DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/usr && \
-	 make -j3 && make install && \
-	 $(WD)/bin/mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin && \
-	 $(WD)/bin/mv /usr/bin/{date,echo,false,head,hostname,install,ln} /bin && \
-	 $(WD)/bin/mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin && \
-	 mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin && \
-	 mv /usr/bin/chroot /usr/sbin && \
-	 ln -s ../../bin/install /usr/bin && \
-	 mv /bin/uname /bin/uname.real && \
-	 install -m 755 ${ROOT}/uname/uname /bin/ ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@patch -Np1 -i ../$(PATCH2)
+	@DEFAULT_POSIX2_VERSION=199209 ./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
+	@$(WD)/bin/mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
+	@$(WD)/bin/mv /usr/bin/{date,echo,false,head,hostname,install,ln} /bin
+	@$(WD)/bin/mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin
+	@mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin
+	@mv /usr/bin/chroot /usr/sbin
+	@ln -s ../../bin/install /usr/bin
+	@mv /bin/uname /bin/uname.real
+	@install -m 755 ${ROOT}/uname/uname /bin/
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2

Modified: x86/trunk/packages/gawk/Makefile
===================================================================
--- x86/trunk/packages/gawk/Makefile	2005-07-20 02:40:19 UTC (rev 386)
+++ x86/trunk/packages/gawk/Makefile	2005-07-20 02:52:48 UTC (rev 387)
@@ -50,6 +50,10 @@
 #
 	@$(OK)
 
+chroot:
+	@chroot "$(MP)" $(chenv-pre-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+
 stage2: Makefile $(FILE)
 	@$(std_build)
 




More information about the livecd mailing list