r1457 - in branches/udev_update: . packages/bash packages/coreutils packages/db packages/file packages/flex packages/groff packages/iproute2 packages/linux packages/psmisc packages/sed packages/shadow

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Apr 1 01:15:28 PST 2006


Author: alexander
Date: 2006-04-01 02:15:25 -0700 (Sat, 01 Apr 2006)
New Revision: 1457

Modified:
   branches/udev_update/Makefile
   branches/udev_update/packages/bash/Makefile
   branches/udev_update/packages/coreutils/Makefile
   branches/udev_update/packages/db/Makefile
   branches/udev_update/packages/file/Makefile
   branches/udev_update/packages/flex/Makefile
   branches/udev_update/packages/groff/Makefile
   branches/udev_update/packages/iproute2/Makefile
   branches/udev_update/packages/linux/Makefile
   branches/udev_update/packages/psmisc/Makefile
   branches/udev_update/packages/sed/Makefile
   branches/udev_update/packages/shadow/Makefile
Log:
Updated all LFS packages except perl to the versions in the udev_update book


Modified: branches/udev_update/Makefile
===================================================================
--- branches/udev_update/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -39,7 +39,7 @@
 export pagesize ?= letter
 export ROOT ?= /lfs-livecd
 #export PM ?= -j3
-export HTTP ?= http://ftp.linuxfromscratch.org/pub/lfs/conglomeration
+export HTTP ?= http://ftp.lfs-matrix.net/pub/lfs/conglomeration
 export HTTPBLFS ?= http://ftp.lfs-matrix.net/pub/blfs/conglomeration
 
 # Directory variables
@@ -57,7 +57,7 @@
 
 include $(CROSSVARS)
 
-export KVERS ?= 2.6.16
+export KVERS ?= 2.6.16.1
 
 # Environment Variables
 # The following lines need to be all on one line - no newlines.

Modified: branches/udev_update/packages/bash/Makefile
===================================================================
--- branches/udev_update/packages/bash/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/bash/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -8,6 +8,10 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 35e8f7eadded3be38df2eb8ac8db094109339d5e
 
+PATCH1= $(DIR)-fixes-6.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 4ea7c1761e720413d4a49a2964cdd3aa30cc560e
+
 FILE1 = $(NM)-doc-$(VRS).tar.bz2
 URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
 SHA-$(FILE1)= 21084bf998eb11b9c30cd6dac72471ee980cc893
@@ -16,9 +20,9 @@
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE)
+stage1: $(FILE) $(PATCH1)
 	$(std_build)
-	cp $(SRC)/$(FILE) $(LFSSRC)
+	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
 
 compile-stage1:
 ifndef CROSS
@@ -40,7 +44,7 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE) $(PATCH1) $(FILE1)
 	$(std_build)
 	cp $(SRC)/$(FILE1) $(LFSSRC)/
 
@@ -48,6 +52,7 @@
 	unpack ../$(FILE1)
 	sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/$(DIR)|" \
 	 Makefile.in
+	patch -Np1 -i ../$(PATCH1)
 ifndef CROSS
 	./configure --prefix=/usr --bindir=/bin --without-bash-malloc \
 	 --with-installed-readline

Modified: branches/udev_update/packages/coreutils/Makefile
===================================================================
--- branches/udev_update/packages/coreutils/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/coreutils/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,22 +1,22 @@
 # Coreutils Makefile
 
 NM= coreutils
-VRS= 5.93
+VRS= 5.94
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 56d983bfb20d04ff298677e7e795956f0d44ea6f
+SHA-$(FILE)= c39add02995304e1cf3dfc8543702f22155fba50
 
 PATCH1= $(DIR)-uname-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 42cc795e56b96994a4dc9e8f2a8dd72b6a25665f
 
-PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch
+PATCH2= $(DIR)-suppress_uptime_kill_su-2.patch
 URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 6a0098315fa9b7cb80d17dd1b146ac91fa187606
+SHA-$(PATCH2)= a7dedf947b7651f882c8ede00eb6e56689bbb154
 
-PATCH50= $(DIR)-i18n-2.patch
+PATCH50= $(DIR)-i18n-1.patch
 URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50)
 SHA-$(PATCH50)= 3ff73ceeae8ef66345cfed38f770e51db4d02199
 

Modified: branches/udev_update/packages/db/Makefile
===================================================================
--- branches/udev_update/packages/db/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/db/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,12 +1,12 @@
 # DB Makefile
 
 NM= db
-VRS= 4.4.16
+VRS= 4.4.20
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= dd03d6f2d3802c8e5f92e650d3be514f47810b39
+SHA-$(FILE)= 63ff1d980648e4eb8a3d68cfe7592a3d677c7b5b
 
 # Targets
 

Modified: branches/udev_update/packages/file/Makefile
===================================================================
--- branches/udev_update/packages/file/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/file/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,12 +1,12 @@
 # File Makefile
 
 NM= file
-VRS= 4.16
+VRS= 4.17
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= aa99ab8e29d5833787e63d6380a4a03104df2554
+SHA-$(FILE)= 6d4d0f18c6a6749048df2d6cf36aac6f287f2154
 
 # Targets
 

Modified: branches/udev_update/packages/flex/Makefile
===================================================================
--- branches/udev_update/packages/flex/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/flex/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,17 +1,13 @@
 # Flex Makefile
 
 NM= flex
-VRS= 2.5.31
+VRS= 2.5.33
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= c305d08a469625658418cb8f2d66c66fce1b76e5
+SHA-$(FILE)= acdb8fff6455967ad1a5bfc71855dbcc1253ee56
 
-PATCH1= $(DIR)-debian_fixes-3.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= aafb7a09fa8ffe4d3db0737df6ac39d26f93e072
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -20,13 +16,11 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
-	patch -Np1 -Z -i ../$(PATCH1)
-	touch doc/flex.1
 ifndef CROSS
 	./configure --prefix=/usr
 else
@@ -35,7 +29,7 @@
 endif
 	make $(PM)
 	make install
-	ln -s libfl.a /usr/$(LIB_MAYBE64)/libl.a
+	ln -sf libfl.a /usr/$(LIB_MAYBE64)/libl.a
 	echo "#!/bin/sh" > /usr/bin/lex
 	echo "# Begin /usr/bin/lex" >> /usr/bin/lex
 	echo "" >> /usr/bin/lex

Modified: branches/udev_update/packages/groff/Makefile
===================================================================
--- branches/udev_update/packages/groff/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/groff/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -13,10 +13,9 @@
 URL-$(FILE)= http://ftp.gnu.org/gnu/$(NM)/$(FILE)
 SHA-$(FILE)= 19c8c83e6ee29dd6041dae0daf1c1d0debd3d32a
 
-# Don't recompress with bzip2, this would break jhalfs
-PATCH= groff_1.18.1.1-10.diff.gz
+PATCH= $(DIR)-debian_fixes-1.patch
 URL-$(PATCH)= $(HTTP)/$(NM)/$(PATCH)
-SHA-$(PATCH)= 197464e2a56854ada9d5512ff1089fa94fdf36e5
+SHA-$(PATCH)= 39fb82b9673523cb2451a0491929693226ea97dd
 
 # Targets
 
@@ -31,14 +30,14 @@
 	cp $(SRC)/{$(FILE),$(PATCH)} $(LFSSRC)
 
 compile-stage2:
-	zcat ../$(PATCH) | patch -Np1
+	patch -Np1 -i ../$(PATCH)
 	sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
 	    -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto
 ifndef CROSS
 	PAGE=$(pagesize) ./configure --prefix=/usr --enable-multibyte
 else
 	PAGE=$(pagesize) CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
-	 ./configure --prefix=/usr --libdir=/usr/lib64 --enable-multibyte
+	 ./configure --prefix=/usr --libdir=/usr/$(LIB_MAYBE64) --enable-multibyte
 endif
 	make
 	make install

Modified: branches/udev_update/packages/iproute2/Makefile
===================================================================
--- branches/udev_update/packages/iproute2/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/iproute2/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,22 +1,13 @@
 # Iproute2 Makefile
 
 NM= iproute2
-ifndef CROSS
-DATE= 051007
-DIR= $(NM)-$(DATE)
-else
-VRS= 2.6.14
-DATE= 051107
+VRS= 2.6.16
+DATE= 060323
 DIR= $(NM)-$(VRS)-$(DATE)
-endif
 
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-ifndef CROSS
-SHA-$(FILE)= 1da92131ff9ae59b96beb54f769411a1339dd1b9
-else
-SHA-$(FILE)= b7042721179ae912044b66711d54773457846abe
-endif
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://developer.osdl.org/dev/iproute2/download/$(FILE)
+SHA-$(FILE)= 76d866bb3b46a7b2e73d79a4faf6fa8971527633
 
 # Targets
 
@@ -31,8 +22,6 @@
 	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
-	chmod u+x configure
-	./configure
 ifndef CROSS
 	make $(PM) SBINDIR=/sbin
 else

Modified: branches/udev_update/packages/linux/Makefile
===================================================================
--- branches/udev_update/packages/linux/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/linux/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -6,13 +6,13 @@
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= bef21cd5063a648f33a99a26f4742dd05eb4dca2
+SHA-$(FILE)= c5db9b9a3b23e0cda5a198290b5411226715a406
 
-URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/
+# URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/
 
-#PATCH1= reiser4-for-2.6.15-1.patch.gz
-#URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.15/$(PATCH1)
-#SHA-$(PATCH1)= 439e54c5e2d16eeff260ffa7511fb09d3c7e5712
+PATCH1= reiser4-for-2.6.16-1.patch.gz
+URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1)
+SHA-$(PATCH1)= 80d0e0530bf658489834dd27ae955e5d89257a98
 
 PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
 
@@ -38,7 +38,7 @@
 	cd reiser4 ; grep 'reiser4' series | grep -v '#' >reiser4-patches
 	-cd reiser4 ; $(WGET) -nc -B $(URL_REISER4) -i reiser4-patches
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) reiser4
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50)
 	$(std_build)
 	cp $(SRC)/{$(FILE),$(PATCH50)} $(LFSSRC)/
 
@@ -50,9 +50,9 @@
 	mkdir -p /boot/isolinux
 endif
 ifndef LIBATA_SUFFIX
-#	zcat ../$(PATCH1) | patch -Np1
-	for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i ../reiser4/$$a ; done
-	echo 'EXPORT_SYMBOL(page_cache_readahead);' >>mm/readahead.c
+	zcat ../$(PATCH1) | patch -Np1
+#	for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i ../reiser4/$$a ; done
+#	echo 'EXPORT_SYMBOL(page_cache_readahead);' >>mm/readahead.c
 	patch -Np1 -i ../$(PATCH3)
 	zcat ../$(PATCH4) | patch -Np1
 	patch -Np1 -l -i ../$(PATCH50)

Modified: branches/udev_update/packages/psmisc/Makefile
===================================================================
--- branches/udev_update/packages/psmisc/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/psmisc/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,12 +1,12 @@
 # Psmisc Makefile
 
 NM= psmisc
-VRS= 22.1
+VRS= 22.2
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= f654685c7c300d9681131465f8c5d5ae5a3f8ace
+SHA-$(FILE)= a9fbc679297fcf1e4d42a1beb29e28358174ee33
 
 # Targets
 

Modified: branches/udev_update/packages/sed/Makefile
===================================================================
--- branches/udev_update/packages/sed/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/sed/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,12 +1,12 @@
 # Sed Makefile
 
 NM= sed
-VRS= 4.1.4
+VRS= 4.1.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 3e2c884252920cced7b636826bf9a99d7d3e8437
+SHA-$(FILE)= edb9f49caff130eef7d80f357610611355767fbd
 
 # Targets
 

Modified: branches/udev_update/packages/shadow/Makefile
===================================================================
--- branches/udev_update/packages/shadow/Makefile	2006-04-01 03:37:43 UTC (rev 1456)
+++ branches/udev_update/packages/shadow/Makefile	2006-04-01 09:15:25 UTC (rev 1457)
@@ -1,12 +1,12 @@
 # Shadow Makefile
 
 NM= shadow
-VRS= 4.0.14
+VRS= 4.0.15
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 7d8c504ae03421f9a75cfef3b97b9713782a6e91
+SHA-$(FILE)= 0f7cd3366a032091fdffd2f8edf65056bd576cae
 
 # Targets
 




More information about the livecd mailing list