r378 - in x86/trunk: . packages/binutils packages/wget

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 19 03:31:43 PDT 2005


Author: jhuntwork
Date: 2005-07-19 04:31:41 -0600 (Tue, 19 Jul 2005)
New Revision: 378

Modified:
   x86/trunk/Makefile
   x86/trunk/packages/binutils/Makefile
   x86/trunk/packages/wget/Makefile
Log:
Fixed version sed (again) for README, and added sha1sum check for wget

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-07-19 05:07:24 UTC (rev 377)
+++ x86/trunk/Makefile	2005-07-19 10:31:41 UTC (rev 378)
@@ -380,7 +380,7 @@
 	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
 	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
 	@install -m644 doc/README $(MP)/root/README
-	@sed -i "s/[version]/$(VERSION)/" $(MP)/root/README
+	@sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
 	@install -m600 root/.bashrc $(MP)/root/.bashrc
 	@install -m644 etc/X11/app-defaults/XTerm $(MP)/etc/X11/app-defaults/XTerm
 	@install -m644 etc/X11/twm/system.twmrc $(MP)/etc/X11/twm/system.twmrc

Modified: x86/trunk/packages/binutils/Makefile
===================================================================
--- x86/trunk/packages/binutils/Makefile	2005-07-19 05:07:24 UTC (rev 377)
+++ x86/trunk/packages/binutils/Makefile	2005-07-19 10:31:41 UTC (rev 378)
@@ -43,7 +43,7 @@
 #==============================================================================
 	@make install >>../$(DIR)-$@.log 2>&1
 	@make -C ld clean >>../$(DIR)-$@.log 2>&1
-	@make -C ld LIB_PATH=$(WD)/lib >>../$(DIR)-$@.log 2&>1
+	@make -C ld LIB_PATH=$(WD)/lib >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #

Modified: x86/trunk/packages/wget/Makefile
===================================================================
--- x86/trunk/packages/wget/Makefile	2005-07-19 05:07:24 UTC (rev 377)
+++ x86/trunk/packages/wget/Makefile	2005-07-19 10:31:41 UTC (rev 378)
@@ -5,6 +5,7 @@
 VRS= 1.9.1
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
+SHA= 0597a4f47b056e3e60cf7d08c9409d67358e7099
 
 # Targets
 # =============================================================================
@@ -13,6 +14,9 @@
 
 $(FILE):
 	@cd $(SRC) ; ftpget $(VRS)
+# The only reason for using download below is to check the sha1sum, since
+# at this point we already have the tarball.
+	$(call download,$(FILE),NULL,$(SHA))
 	@ln -s $(SRC)/$(FILE) .
 	
 




More information about the livecd mailing list