r772 - in x86/trunk/packages: blfs-bootscripts linux unionfs

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Sep 25 09:00:24 PDT 2005


Author: justin
Date: 2005-09-25 10:00:12 -0600 (Sun, 25 Sep 2005)
New Revision: 772

Modified:
   x86/trunk/packages/blfs-bootscripts/Makefile
   x86/trunk/packages/linux/Makefile
   x86/trunk/packages/unionfs/Makefile
Log:
Added "unset ARCH" commands to unionfs and linux Makefiles to stop our ARCH variable from tainting the kernel install, fixed blfs-bootscripts SHA1SUM.

Modified: x86/trunk/packages/blfs-bootscripts/Makefile
===================================================================
--- x86/trunk/packages/blfs-bootscripts/Makefile	2005-09-25 15:22:28 UTC (rev 771)
+++ x86/trunk/packages/blfs-bootscripts/Makefile	2005-09-25 16:00:12 UTC (rev 772)
@@ -6,10 +6,9 @@
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(FILE)
-SHA-$(FILE)= 9ab7259c47697b3e81cb28d003e70f01d09cca75
+SHA-$(FILE)= 9fa8932329962cfa9227ab1c3b5d7aead8866610
 
 PATCH1=$(NM)-add-autosshd-1.patch
-SHA-$(PATCH1)= d69c9467e6cfcbff70006ad065f2765dc46c986b
 
 # Targets
 
@@ -19,7 +18,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:

Modified: x86/trunk/packages/linux/Makefile
===================================================================
--- x86/trunk/packages/linux/Makefile	2005-09-25 15:22:28 UTC (rev 771)
+++ x86/trunk/packages/linux/Makefile	2005-09-25 16:00:12 UTC (rev 772)
@@ -34,10 +34,10 @@
 	patch -Np1 -i ../reiser4.patch
 	patch -Np1 -i ../$(PATCH2)
 	cd $(ROOT) ; make -C $(PKG)/unionfs patch-kernel
-	make mrproper
+	unset ARCH ; make mrproper
 	cp $(ROOT)/linux/config.$(ARCH) .config
-	make $(PM)
-	make modules_install
+	unset ARCH ; make $(PM)
+	unset ARCH ; make modules_install
 ifeq ($(ARCH),x86)
 	cp -v arch/i386/boot/bzImage /boot/isolinux/linux
 else

Modified: x86/trunk/packages/unionfs/Makefile
===================================================================
--- x86/trunk/packages/unionfs/Makefile	2005-09-25 15:22:28 UTC (rev 771)
+++ x86/trunk/packages/unionfs/Makefile	2005-09-25 16:00:12 UTC (rev 772)
@@ -35,7 +35,7 @@
 compile-patch-kernel:
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
-	./patch-kernel.sh $(ROOT)/$(PKG)/linux/linux-$(KVERS)/
+	unset ARCH ; ./patch-kernel.sh $(ROOT)/$(PKG)/linux/linux-$(KVERS)/
 
 clean:
 	-rm -rf $(DIR)




More information about the livecd mailing list