r565 - in x86/trunk: . packages/xfsprogs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu Aug 11 09:49:39 PDT 2005


Author: jhuntwork
Date: 2005-08-11 10:49:38 -0600 (Thu, 11 Aug 2005)
New Revision: 565

Modified:
   x86/trunk/Makefile
   x86/trunk/packages/xfsprogs/Makefile
Log:
Corrected chroot settings for blfs builds, small fixes to xfsprogs Makefile

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-08-11 16:30:02 UTC (rev 564)
+++ x86/trunk/Makefile	2005-08-11 16:49:38 UTC (rev 565)
@@ -136,12 +136,11 @@
 	@ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
 	@touch $@
 
-extend-lfs:
+extend-lfs: prep-chroot
 	@cp $(WD)/bin/which $(MP)/usr/bin
 	@cp $(ROOT)/scripts/unpack $(MP)/bin
 	@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
 	 make blfs $(chbash-post-bash)'
-	@make unloadmodule
 	@make unmount
 	@touch $@
 

Modified: x86/trunk/packages/xfsprogs/Makefile
===================================================================
--- x86/trunk/packages/xfsprogs/Makefile	2005-08-11 16:30:02 UTC (rev 564)
+++ x86/trunk/packages/xfsprogs/Makefile	2005-08-11 16:49:38 UTC (rev 565)
@@ -6,7 +6,7 @@
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).src.tar.bz2
-URL-$(FILE)= $(HTTPBLFS)W-Z/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/W-Z/$(FILE)
 SHA-$(FILE)= e9d4e493969176961dbe98b663ea1cac16fcacd9
 
 # Targets
@@ -28,7 +28,7 @@
 #==============================================================================
 	@patch -Np1 -i ../$(DIR)-fix_compile-1.patch
 	@sed -i 's/autoconf//' Makefile
-	@make $(PM) >../$(DIR)-$@.log 2>&1
+	@make >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages===========================================
 #




More information about the livecd mailing list