r800 - in x86/trunk: . initramfs packages/ncurses

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Sep 27 23:13:19 PDT 2005


Author: justin
Date: 2005-09-28 00:13:18 -0600 (Wed, 28 Sep 2005)
New Revision: 800

Modified:
   x86/trunk/Makefile
   x86/trunk/initramfs/Makefile
   x86/trunk/packages/ncurses/Makefile
Log:
Added ncurses 20050903 and 20050910 to fix a double Gpm_Open bug, added -f flag to rm of volume.h.

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-09-28 06:10:17 UTC (rev 799)
+++ x86/trunk/Makefile	2005-09-28 06:13:18 UTC (rev 800)
@@ -441,6 +441,7 @@
 	@-groupdel lfs
 	@-rm -rf /home/lfs
 	@-rm {prepiso,lfsuser,unamemod,prep-chroot,lfs-base,extend-lfs}
+	@-rm {sqfs.log,lfs-strip}
 	@-rm $(PKG)/binutils/{,re-}adjust-toolchain
 	@-for i in `ls $(PKG)` ; do $(MAKE) -C $(PKG)/$$i clean ; done
 	@find $(PKG) -name "pass*" -exec rm -rf \{} \;

Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile	2005-09-28 06:10:17 UTC (rev 799)
+++ x86/trunk/initramfs/Makefile	2005-09-28 06:13:18 UTC (rev 800)
@@ -56,6 +56,6 @@
 	-rm -rf temp
 	-rm -f initramfs_data*
 	-rm -f init
-	-rm volume.h
+	-rm -f volume.h
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/ncurses/Makefile
===================================================================
--- x86/trunk/packages/ncurses/Makefile	2005-09-28 06:10:17 UTC (rev 799)
+++ x86/trunk/packages/ncurses/Makefile	2005-09-28 06:13:18 UTC (rev 800)
@@ -12,6 +12,16 @@
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 7da2e2ae84d49466ff777b4d815318391776e21b
 
+# Just for $(PATCH3) not to fail
+PATCH2= $(DIR)-20050903.patch.gz
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 7012562cf189879484addcaacb128cefb8f89c72
+
+# Fix for double Gpm_Open()
+PATCH3= $(DIR)-20050910.patch.gz
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= 3078547c70c63cc03fa9a1ea298aa701771c42eb
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -37,6 +47,8 @@
 compile-stage2:
 	bzcat ../$(PATCH1) > update.sh
 	sh update.sh
+	zcat ../$(PATCH2) | patch -Np1
+	zcat ../$(PATCH3) | patch -Np1
 	./configure --prefix=/usr --with-shared --without-debug --with-gpm
 	make sources
 	make $(PM)




More information about the livecd mailing list