r1953 - in branches/minimal/packages: cpio texinfo

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu Jul 12 09:01:53 PDT 2007


Author: jhuntwork
Date: 2007-07-12 10:01:53 -0600 (Thu, 12 Jul 2007)
New Revision: 1953

Modified:
   branches/minimal/packages/cpio/Makefile
   branches/minimal/packages/texinfo/Makefile
Log:
Merge r1951 & r1952 to minimal branch

Modified: branches/minimal/packages/cpio/Makefile
===================================================================
--- branches/minimal/packages/cpio/Makefile	2007-07-12 14:31:32 UTC (rev 1952)
+++ branches/minimal/packages/cpio/Makefile	2007-07-12 16:01:53 UTC (rev 1953)
@@ -1,17 +1,13 @@
 # cpio Makefile
 
 NM= cpio
-VRS= 2.7
+VRS= 2.9
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://ftp.gnu.org/pub/gnu/cpio/$(FILE)
-SHA-$(FILE)= ce1c8ab703d62fc1d30ca59e044ba9f43c3db574
+SHA-$(FILE)= ef381d0f33f1ea74475b6d813c42a74327762c4a
 
-PATCH1= $(DIR)-upstream_fixes-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/blfs/svn/$(PATCH1)
-SHA-$(PATCH1)= 13e0944c9ff335f5afa9102061e499acde350909
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -20,11 +16,10 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
 	./configure CPIO_MT_PROG=mt --prefix=/usr --bindir=/bin \
 	 --libexecdir=/tmp --with-rmt=/usr/sbin/rmt
 	make

Modified: branches/minimal/packages/texinfo/Makefile
===================================================================
--- branches/minimal/packages/texinfo/Makefile	2007-07-12 14:31:32 UTC (rev 1952)
+++ branches/minimal/packages/texinfo/Makefile	2007-07-12 16:01:53 UTC (rev 1953)
@@ -5,7 +5,7 @@
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnu.org/texinfo/$(FILE)
+URL-$(FILE)= http://ftp.gnu.org/gnu/texinfo/$(FILE)
 SHA-$(FILE)= 19a0cc0b56cbfcfe610925bef31e0bdf749492c9
 
 PATCH1= $(DIR)-tempfile_fix-1.patch




More information about the livecd mailing list