r563 - in x86/trunk: . packages/gcc packages/openssl

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu Aug 11 09:20:55 PDT 2005


Author: jhuntwork
Date: 2005-08-11 10:20:54 -0600 (Thu, 11 Aug 2005)
New Revision: 563

Modified:
   x86/trunk/Makefile
   x86/trunk/packages/gcc/Makefile
   x86/trunk/packages/openssl/Makefile
Log:
Removed test for kernel version, added a temporary symlink of wget (fixes openssl's attempt to use wget before it appears in the /usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/opt/jdk/jdk/bin), fixed sha1sum for openssl, and temporarily force gcc's symlinks in stage2

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-08-10 19:00:43 UTC (rev 562)
+++ x86/trunk/Makefile	2005-08-11 16:20:54 UTC (rev 563)
@@ -107,11 +107,7 @@
 test-host:
 	@if [ `whoami` != "root" ] ; then \
 	 echo "You must be logged in as root." && exit 1 ; fi
-	@if [ `uname -r` != "$(KVERS)" ] ; then \
-	 echo "Please update your host kernel to version $(KVERS)." \
-         && exit 1 ; fi
 
-
 # This target builds just a base LFS system, minus the kernel and bootscripts
 #==============================================================================
 lfs-base: lfsuser
@@ -137,6 +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
 	@touch $@
 
 extend-lfs:

Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile	2005-08-10 19:00:43 UTC (rev 562)
+++ x86/trunk/packages/gcc/Makefile	2005-08-11 16:20:54 UTC (rev 563)
@@ -142,8 +142,8 @@
 # Install commands below \/
 #==============================================================================
 	@make install >>../$(DIR)-$@.log 2>&1
-	@ln -s ../usr/bin/cpp /lib
-	@ln -s gcc /usr/bin/cc
+	@ln -sf ../usr/bin/cpp /lib
+	@ln -sf gcc /usr/bin/cc
 #
 #==Status Messages===========================================
 #

Modified: x86/trunk/packages/openssl/Makefile
===================================================================
--- x86/trunk/packages/openssl/Makefile	2005-08-10 19:00:43 UTC (rev 562)
+++ x86/trunk/packages/openssl/Makefile	2005-08-11 16:20:54 UTC (rev 563)
@@ -7,7 +7,7 @@
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
-SHA-$(FILE)= d2ea2e6b63f6d34bd26b8ba32344dfdc6b5286eb
+SHA-$(FILE)= 21c1f51188bed0de902985f6ed334284082cb90d
 
 PATCH1= $(DIR)-fix_manpages-1.patch
 URL-$(PATCH1)= $(HTTPBLFS)/M-P/$(PATCH1)




More information about the livecd mailing list