r623 - in x86/trunk: . packages/grub packages/openssl

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Sep 6 16:05:18 PDT 2005


Author: jhuntwork
Date: 2005-09-06 17:05:15 -0600 (Tue, 06 Sep 2005)
New Revision: 623

Modified:
   x86/trunk/Makefile
   x86/trunk/packages/grub/Makefile
   x86/trunk/packages/openssl/Makefile
Log:
Fixed wget link in Makefile, use lfs-matrix.net server, fixed URL for openssl patch

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-09-06 13:58:08 UTC (rev 622)
+++ x86/trunk/Makefile	2005-09-06 23:05:15 UTC (rev 623)
@@ -46,8 +46,8 @@
 
 # Default http server for the lfs-base packages
 #==============================================================================
-export HTTP := http://ftp.lfs-matrix.de/pub/lfs/lfs-packages/conglomeration
-export HTTPBLFS := http://ftp.lfs-matrix.de/pub/BLFS/SVN
+export HTTP := http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
+export HTTPBLFS := http://ftp.lfs-matrix.net/pub/BLFS/SVN
 
 # Directory variables
 #==============================================================================
@@ -83,7 +83,7 @@
 export chbash-pre-bash := SHELL=$(WD)/bin/bash
 export chbash-post-bash := SHELL=/bin/bash
 export WHICH= $(WD)/bin/which
-export WGET= wget --passive-ftp
+export WGET= wget
 
 export BRW= ""
 export RED= ""
@@ -133,7 +133,7 @@
 	 cd $(ROOT) && make pre-bash $(chbash-pre-bash)'
 	@chroot "$(MP)" $(chenv-post-bash) 'set +h && cd $(ROOT) && \
 	 make post-bash $(chbash-post-bash)'
-	@ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
+	@-ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
 
 extend-lfs: prep-chroot
 	@cp $(WD)/bin/which $(MP)/usr/bin

Modified: x86/trunk/packages/grub/Makefile
===================================================================
--- x86/trunk/packages/grub/Makefile	2005-09-06 13:58:08 UTC (rev 622)
+++ x86/trunk/packages/grub/Makefile	2005-09-06 23:05:15 UTC (rev 623)
@@ -22,6 +22,7 @@
 	@$(std_build)
 
 compile-stage2:
+ifeq ($(ARCH),x86)
 	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
@@ -49,6 +50,7 @@
 #==Status Messages===========================================
 #
 	@$(OK)
+endif
 
 clean:
 	@-rm -rf $(DIR)

Modified: x86/trunk/packages/openssl/Makefile
===================================================================
--- x86/trunk/packages/openssl/Makefile	2005-09-06 13:58:08 UTC (rev 622)
+++ x86/trunk/packages/openssl/Makefile	2005-09-06 23:05:15 UTC (rev 623)
@@ -10,7 +10,7 @@
 SHA-$(FILE)= 21c1f51188bed0de902985f6ed334284082cb90d
 
 PATCH1= $(DIR)-fix_manpages-1.patch
-URL-$(PATCH1)= $(HTTPBLFS)/M-P/$(PATCH1)
+URL-$(PATCH1)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1)
 SHA-$(PATCH1)= cb1ec4af292fc381500c4a63fd470ac0ea61218d
 
 # Targets




More information about the livecd mailing list