r1762 - in trunk: . packages packages/bash packages/binutils packages/coreutils packages/expect packages/findutils packages/gcc packages/gettext packages/glibc packages/linux-headers packages/m4 packages/make packages/tar packages/tcl packages/util-linux vars

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Dec 5 04:28:12 PST 2006


Author: alexander
Date: 2006-12-05 05:28:07 -0700 (Tue, 05 Dec 2006)
New Revision: 1762

Added:
   trunk/packages/glibc/glibc-2.5-supported_locales-1.patch
   trunk/packages/linux-headers/
   trunk/packages/linux-headers/Makefile
Removed:
   trunk/packages/Xorg-modular/
   trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch
   trunk/packages/glibc/glibc-20051107-supported_locales-2.patch
   trunk/packages/linux-libc-headers/
   trunk/packages/util-linux/util-linux-2.12q-klibc-1.patch
Modified:
   trunk/Makefile
   trunk/packages/bash/Makefile
   trunk/packages/binutils/Makefile
   trunk/packages/coreutils/Makefile
   trunk/packages/expect/Makefile
   trunk/packages/findutils/Makefile
   trunk/packages/gcc/Makefile
   trunk/packages/gettext/Makefile
   trunk/packages/glibc/Makefile
   trunk/packages/m4/Makefile
   trunk/packages/make/Makefile
   trunk/packages/tar/Makefile
   trunk/packages/tcl/Makefile
   trunk/vars/vars.ppc
   trunk/vars/vars.sparc
   trunk/vars/vars.x86
Log:
Merged recent fixes from the 6.2 branch, and updated Chapter 5 to LFS SVN

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -217,13 +217,13 @@
 	@if [ -f tools.tar.bz2 ] ; then \
 	    tar -C .. -jxpf tools.tar.bz2 ; \
 	else \
-	    su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'" ; \
+	    su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'" && \
 	    tar -C .. -jcpf tools.tar.bz2 tools ; \
 	fi
 	@touch $@
 
 tools:  pre-which pre-wget lfs-binutils-pass1 lfs-gcc-pass1 \
-	lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
+	lfs-linux-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
 	lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2 \
 	lfs-binutils-pass2 lfs-ncurses-scpt lfs-bash-scpt lfs-bzip2-scpt \
 	lfs-coreutils-scpt lfs-diffutils-scpt lfs-findutils-scpt \
@@ -234,12 +234,13 @@
 	@cp /etc/resolv.conf $(WD)/etc
 	@touch $@
 
-pre-bash: createfiles ch-linux-libc-headers ch-man-pages \
-	ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-db ch-coreutils \
-	ch-iana-etc ch-m4 ch-bison ch-gpm ch-ncurses ch-procps ch-sed ch-libtool \
-	ch-perl ch-readline ch-zlib ch-autoconf ch-automake ch-bash
+pre-bash: createfiles stop-here ch-linux-headers ch-man-pages \
+	ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-db ch-sed \
+	ch-e2fsprogs ch-coreutils ch-iana-etc ch-m4 ch-bison ch-gpm \
+	ch-ncurses ch-procps ch-libtool ch-perl ch-readline ch-zlib \
+	ch-autoconf ch-automake ch-bash
 
-post-bash: ch-bzip2 ch-diffutils ch-e2fsprogs ch-file ch-findutils ch-flex \
+post-bash: ch-bzip2 ch-diffutils ch-file ch-findutils ch-flex \
 	ch-gawk ch-gettext ch-grep ch-groff ch-gzip ch-inetutils \
 	ch-iproute2 ch-kbd ch-less ch-make ch-man-db ch-mktemp \
 	ch-module-init-tools ch-patch ch-psmisc ch-shadow ch-sysklogd \

Modified: trunk/packages/bash/Makefile
===================================================================
--- trunk/packages/bash/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/bash/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,20 +1,20 @@
 # Bash Makefile
 
 NM= bash
-VRS= 3.1
+VRS= 3.2
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 766e3fd9384616d8a103f812f662fd8ec791c129
+SHA-$(FILE)= fe6466c7ee98061e044dae0347ca5d1a8eab4a0d
 
-PATCH1= $(DIR)-fixes-8.patch
+PATCH1= $(DIR)-fixes-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 03d6781dd9ad6336eda906d5645c166e1641dd49
+SHA-$(PATCH1)= f2e145c311c52e264b3341cd6757c0ea67996fa8
 
 FILE1 = $(NM)-doc-$(VRS).tar.gz
 URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
-SHA-$(FILE1)= 9cacbbdf3b1be03819b1ea82cdaec0f5e61570c1
+SHA-$(FILE1)= 30e4a66c0974275384b90ffdbc4f54d53ba3d2b4
 
 # Targets
 
@@ -25,6 +25,7 @@
 	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
 
 compile-stage1:
+	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=$(WD) --without-bash-malloc
 	make
 	make install

Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/binutils/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,11 +1,11 @@
 # Binutils Makefile
 
 NM= binutils
-VRS= 2.16.1
+VRS= 2.17
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 5c80fd5657da47efc16a63fdd93ef7395319fbbf
+SHA-$(FILE)= a557686eef68362ea31a3aa41ce274e3eeae1ef0
 
 # Targets
 
@@ -32,11 +32,8 @@
 	mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old}
 	mv -v $(WD)/bin/{ld-new,ld}
 	ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld
-	SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
-	gcc -dumpspecs > $$SPECFILE && \
-	sed 's@/lib/$(LINKER)@$(WD)&@g' $$SPECFILE > tempspecfile && \
-	mv -vf tempspecfile $$SPECFILE && \
-	unset SPECFILE
+	gcc -dumpspecs | sed 's@^/lib/ld-linux.so.2@/tools&@g' \
+	  > `dirname $$(gcc -print-libgcc-file-name)`/specs
 	GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \
 	find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && \
 	rm -vf `grep -l "DO NOT EDIT THIS FILE" $${GCC_INCLUDEDIR}/*` && \

Modified: trunk/packages/coreutils/Makefile
===================================================================
--- trunk/packages/coreutils/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/coreutils/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,12 +1,12 @@
 # Coreutils Makefile
 
 NM= coreutils
-VRS= 5.96
+VRS= 6.6
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 782379daf200427058ca94a408566d600f779823
+SHA-$(FILE)= 9019a32b122db851eff22ace8669d7cdedf39e7b
 
 PATCH1= $(DIR)-uname-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
@@ -14,11 +14,11 @@
 
 PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch
 URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= a7dedf947b7651f882c8ede00eb6e56689bbb154
+SHA-$(PATCH2)= e1e783efd515639b78627c37025b96168594f408
 
-PATCH50= $(DIR)-i18n-1.patch
-URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= 3ff73ceeae8ef66345cfed38f770e51db4d02199
+PATCH3= $(DIR)-i18n-1.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= e5a7ab810f4032db0b8f829297c70e10f825f41e
 
 # Targets
 
@@ -37,16 +37,16 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH50)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
 	$(std_build)
-	cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH50)} $(LFSSRC)/
+	cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/
 
 compile-stage2:
 ifeq ($(LFS-ARCH),x86)
 	patch -Np1 -i ../$(PATCH1)
 endif
 	patch -Np1 -i ../$(PATCH2)
-	patch -Np1 -i ../$(PATCH50)
+	patch -Np1 -i ../$(PATCH3)
 	chmod +x tests/sort/sort-mb-tests
 	sed -i 's/_LEN 6/_LEN 20/' src/who.c
 	./configure --prefix=/usr

Modified: trunk/packages/expect/Makefile
===================================================================
--- trunk/packages/expect/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/expect/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -22,6 +22,8 @@
 
 compile-stage1:
 	patch -Np1 -i ../$(PATCH1)
+	cp configure{,.bak}
+	sed 's:/usr/local/bin:/bin:' configure.bak > configure
 	./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
 	--with-tclinclude=$(WD)/include --with-x=no
 	make $(PM)

Modified: trunk/packages/findutils/Makefile
===================================================================
--- trunk/packages/findutils/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/findutils/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,12 +1,12 @@
 # Findutils Makefile
 
 NM= findutils
-VRS= 4.2.27
+VRS= 4.2.28
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 0655e10b20dc66b1ccddfa45e5d6c57a3cd312a2
+SHA-$(FILE)= 96f78e570f371c553699215857d7f992accce4d5
 
 # Targets
 

Modified: trunk/packages/gcc/Makefile
===================================================================
--- trunk/packages/gcc/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/gcc/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,16 +1,16 @@
 # Gcc Makefile
 
 NM= gcc
-VRS= 4.0.3
+VRS= 4.1.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 5a94943d9ab823cf8d080cc7f9e8a4a91797afea
+SHA-$(FILE)= a398b95d38b6e35f4c4e02c34c0a3bff79811f8f
 
 PATCH1= $(DIR)-specs-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 04d4b7d68bfd6b362e9b75678584641a2dde7c2f
+SHA-$(PATCH1)= 1bdfbb49437642d3e450f0e3ba25a3e30e25e857
 
 # Targets
 
@@ -36,9 +36,9 @@
 	cp $(SRC)/$(PATCH1) $(LFSSRC)/
 
 compile-pass2:
-	cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} && \
+	cd ../$(DIR) ; cp -v gcc/Makefile.in{,.orig} && \
 	 sed 's@\./fixinc\.sh at -c true@' gcc/Makefile.in.orig > gcc/Makefile.in
-	cd ../$(DIR) ; cp gcc/Makefile.in{,.tmp} && \
+	cd ../$(DIR) ; cp -v gcc/Makefile.in{,.tmp} && \
 	 sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
 	 > gcc/Makefile.in
 	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)

Modified: trunk/packages/gettext/Makefile
===================================================================
--- trunk/packages/gettext/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/gettext/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,12 +1,12 @@
 # Gettext Makefile
 
 NM= gettext
-VRS= 0.14.5
+VRS= 0.16
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 68737eee1a6427044eef901dc88e4144d371fb6b
+SHA-$(FILE)= ab42a62fcfbfc5adde199375a20c0ae252b40961
 
 # Targets
 
@@ -18,7 +18,7 @@
 
 compile-stage1:
 	cd $(NM)-tools ; ./configure --prefix=$(WD) --disable-shared
-	cd $(NM)-tools ; make -C lib
+	cd $(NM)-tools ; make -C gnulib-lib
 	cd $(NM)-tools ; make -C src msgfmt
 	cd $(NM)-tools ; cp -v src/msgfmt $(WD)/bin
 

Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/glibc/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,28 +1,19 @@
 # Glibc Makefile
 
 NM= glibc
-VRS= 2.3.6
+VRS= 2.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 82d0487419f1bdbf2dee439c344e89d6af47e558
+SHA-$(FILE)= ec9a007c4875062099a4701ac9137fcdb5a71447
 
 FILE2= $(NM)-libidn-$(VRS).tar.bz2
-#URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
-URL-$(FILE2)= http://ftp.gnu.org/gnu/glibc/$(FILE2)
-SHA-$(FILE2)= 95d3a98495d4bd7138149fd312db88da56e735db
+URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
+SHA-$(FILE2)= ee7e019e01aa338e28db1eeb34abb2cb09d2f30a
 
-PATCH1= $(NM)-$(VRS)-linux_types-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 0bdf2b15e20c176caf3c85e5b6a7bc957f636d6a
+PATCH50= $(DIR)-supported_locales-1.patch
 
-PATCH2= $(NM)-$(VRS)-inotify-1.patch
-URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH2)
-SHA-$(PATCH2)= d282d10108a4f6b9c6eddc4351a83abe22a5b5b6
-
-PATCH50= $(DIR)-supported_locales-2.patch
-
 # Targets
 
 include $(ROOT)/scripts/functions

Deleted: trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch
===================================================================
--- trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,74 +0,0 @@
-Submitted by: Alexander E. Patrakov
-Date: 2005-08-13
-Initial Package Version: 2.3.5
-Upstream Status: LiveCD specific. Nearly equivalent to adding "localedef" to Makefile.
-Origin: Combined RedHat, ALT Linux and Debian changes
-Description: Alters the list of supported locales
-
-Adds some ISO-8859-15 locales (RedHat)
-Adds ru_RU.CP1251, uk_UA.CP1251 for Windows compatibility (ALT Linux)
-Changes "russian" alias to point to the de-facto ru_RU.KOI8-R standard (Debian)
-
-diff -ur glibc-2.3.5.orig/intl/locale.alias glibc-2.3.5/intl/locale.alias
---- glibc-2.3.5.orig/intl/locale.alias	2005-08-13 14:06:12.910337376 +0600
-+++ glibc-2.3.5/intl/locale.alias	2005-08-13 14:07:42.435727448 +0600
-@@ -63,7 +63,7 @@
- polish          pl_PL.ISO-8859-2
- portuguese      pt_PT.ISO-8859-1
- romanian        ro_RO.ISO-8859-2
--russian         ru_RU.ISO-8859-5
-+russian         ru_RU.KOI8-R
- slovak          sk_SK.ISO-8859-2
- slovene         sl_SI.ISO-8859-2
- slovenian       sl_SI.ISO-8859-2
-diff -ur glibc-2.3.5.orig/localedata/SUPPORTED glibc-2.3.5/localedata/SUPPORTED
---- glibc-2.3.5.orig/localedata/SUPPORTED	2005-08-13 14:06:32.316387208 +0600
-+++ glibc-2.3.5/localedata/SUPPORTED	2005-08-13 14:10:11.836015152 +0600
-@@ -63,6 +63,7 @@
- cy_GB/ISO-8859-14 \
- da_DK.UTF-8/UTF-8 \
- da_DK/ISO-8859-1 \
-+da_DK.ISO-8859-15/ISO-8859-15 \
- de_AT.UTF-8/UTF-8 \
- de_AT/ISO-8859-1 \
- de_AT at euro/ISO-8859-15 \
-@@ -89,6 +90,7 @@
- en_DK/ISO-8859-1 \
- en_GB.UTF-8/UTF-8 \
- en_GB/ISO-8859-1 \
-+en_GB.ISO-8859-15/ISO-8859-15 \
- en_HK.UTF-8/UTF-8 \
- en_HK/ISO-8859-1 \
- en_IE.UTF-8/UTF-8 \
-@@ -103,6 +105,7 @@
- en_SG/ISO-8859-1 \
- en_US.UTF-8/UTF-8 \
- en_US/ISO-8859-1 \
-+en_US.ISO-8859-15/ISO-8859-15 \
- en_ZA.UTF-8/UTF-8 \
- en_ZA/ISO-8859-1 \
- en_ZW.UTF-8/UTF-8 \
-@@ -257,6 +260,7 @@
- ro_RO.UTF-8/UTF-8 \
- ro_RO/ISO-8859-2 \
- ru_RU.KOI8-R/KOI8-R \
-+ru_RU.CP1251/CP1251 \
- ru_RU.UTF-8/UTF-8 \
- ru_RU/ISO-8859-5 \
- ru_UA.UTF-8/UTF-8 \
-@@ -280,6 +284,7 @@
- sv_FI at euro/ISO-8859-15 \
- sv_SE.UTF-8/UTF-8 \
- sv_SE/ISO-8859-1 \
-+sv_SE.ISO-8859-15/ISO-8859-15 \
- ta_IN/UTF-8 \
- te_IN/UTF-8 \
- tg_TJ/KOI8-T \
-@@ -293,6 +298,7 @@
- tr_TR/ISO-8859-9 \
- tt_RU.UTF-8/UTF-8 \
- uk_UA.UTF-8/UTF-8 \
-+uk_UA.CP1251/CP1251 \
- uk_UA/KOI8-U \
- ur_PK/UTF-8 \
- uz_UZ/ISO-8859-1 \

Copied: trunk/packages/glibc/glibc-2.5-supported_locales-1.patch (from rev 1759, trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch)
===================================================================
--- trunk/packages/glibc/glibc-2.5-supported_locales-1.patch	                        (rev 0)
+++ trunk/packages/glibc/glibc-2.5-supported_locales-1.patch	2006-12-05 12:28:07 UTC (rev 1762)
@@ -0,0 +1,74 @@
+Submitted by: Alexander E. Patrakov
+Date: 2005-08-13
+Initial Package Version: 2.3.5
+Upstream Status: LiveCD specific. Nearly equivalent to adding "localedef" to Makefile.
+Origin: Combined RedHat, ALT Linux and Debian changes
+Description: Alters the list of supported locales
+
+Adds some ISO-8859-15 locales (RedHat)
+Adds ru_RU.CP1251, uk_UA.CP1251 for Windows compatibility (ALT Linux)
+Changes "russian" alias to point to the de-facto ru_RU.KOI8-R standard (Debian)
+
+diff -ur glibc-2.3.5.orig/intl/locale.alias glibc-2.3.5/intl/locale.alias
+--- glibc-2.3.5.orig/intl/locale.alias	2005-08-13 14:06:12.910337376 +0600
++++ glibc-2.3.5/intl/locale.alias	2005-08-13 14:07:42.435727448 +0600
+@@ -63,7 +63,7 @@
+ polish          pl_PL.ISO-8859-2
+ portuguese      pt_PT.ISO-8859-1
+ romanian        ro_RO.ISO-8859-2
+-russian         ru_RU.ISO-8859-5
++russian         ru_RU.KOI8-R
+ slovak          sk_SK.ISO-8859-2
+ slovene         sl_SI.ISO-8859-2
+ slovenian       sl_SI.ISO-8859-2
+diff -ur glibc-2.3.5.orig/localedata/SUPPORTED glibc-2.3.5/localedata/SUPPORTED
+--- glibc-2.3.5.orig/localedata/SUPPORTED	2005-08-13 14:06:32.316387208 +0600
++++ glibc-2.3.5/localedata/SUPPORTED	2005-08-13 14:10:11.836015152 +0600
+@@ -63,6 +63,7 @@
+ cy_GB/ISO-8859-14 \
+ da_DK.UTF-8/UTF-8 \
+ da_DK/ISO-8859-1 \
++da_DK.ISO-8859-15/ISO-8859-15 \
+ de_AT.UTF-8/UTF-8 \
+ de_AT/ISO-8859-1 \
+ de_AT at euro/ISO-8859-15 \
+@@ -89,6 +90,7 @@
+ en_DK/ISO-8859-1 \
+ en_GB.UTF-8/UTF-8 \
+ en_GB/ISO-8859-1 \
++en_GB.ISO-8859-15/ISO-8859-15 \
+ en_HK.UTF-8/UTF-8 \
+ en_HK/ISO-8859-1 \
+ en_IE.UTF-8/UTF-8 \
+@@ -103,6 +105,7 @@
+ en_SG/ISO-8859-1 \
+ en_US.UTF-8/UTF-8 \
+ en_US/ISO-8859-1 \
++en_US.ISO-8859-15/ISO-8859-15 \
+ en_ZA.UTF-8/UTF-8 \
+ en_ZA/ISO-8859-1 \
+ en_ZW.UTF-8/UTF-8 \
+@@ -257,6 +260,7 @@
+ ro_RO.UTF-8/UTF-8 \
+ ro_RO/ISO-8859-2 \
+ ru_RU.KOI8-R/KOI8-R \
++ru_RU.CP1251/CP1251 \
+ ru_RU.UTF-8/UTF-8 \
+ ru_RU/ISO-8859-5 \
+ ru_UA.UTF-8/UTF-8 \
+@@ -280,6 +284,7 @@
+ sv_FI at euro/ISO-8859-15 \
+ sv_SE.UTF-8/UTF-8 \
+ sv_SE/ISO-8859-1 \
++sv_SE.ISO-8859-15/ISO-8859-15 \
+ ta_IN/UTF-8 \
+ te_IN/UTF-8 \
+ tg_TJ/KOI8-T \
+@@ -293,6 +298,7 @@
+ tr_TR/ISO-8859-9 \
+ tt_RU.UTF-8/UTF-8 \
+ uk_UA.UTF-8/UTF-8 \
++uk_UA.CP1251/CP1251 \
+ uk_UA/KOI8-U \
+ ur_PK/UTF-8 \
+ uz_UZ/ISO-8859-1 \

Deleted: trunk/packages/glibc/glibc-20051107-supported_locales-2.patch
===================================================================
--- trunk/packages/glibc/glibc-20051107-supported_locales-2.patch	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/glibc/glibc-20051107-supported_locales-2.patch	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1 +0,0 @@
-link glibc-2.3.6-supported_locales-2.patch
\ No newline at end of file

Added: trunk/packages/linux-headers/Makefile
===================================================================
--- trunk/packages/linux-headers/Makefile	                        (rev 0)
+++ trunk/packages/linux-headers/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -0,0 +1,49 @@
+# Linux-headers Makefile
+
+NM= linux
+VRS= 2.6.18.3
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 8a7df3c58179c8a23a36767de2354baa778d3a50
+
+PATCH1= $(DIR)-unifdef-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 7495a2faab177e9e58f7c4af5b306d387be82410
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+stage1: $(FILE) $(PATCH1)
+	$(std_build)
+	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+
+compile-stage1:
+	patch -Np1 -i ../$(PATCH1)
+	make mrproper
+	make headers_install
+	make headers_check
+	cp -av usr/include/* /tools/include
+
+chroot:
+	chroot "$(MP)" $(chenv-pre-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+
+stage2: $(FILE) $(PATCH1)
+	$(std_build)
+
+compile-stage2:
+	patch -Np1 -i ../$(PATCH1)
+	install -dv /usr/include/asm
+	cp -Rv include/$(LLH_ASM)/* /usr/include/asm
+	cp -Rv include/linux /usr/include
+	chown -Rv root:root /usr/include/{asm,linux}
+	find /usr/include/{asm,linux} -type d -exec chmod -v 755 {} \;
+	find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2

Modified: trunk/packages/m4/Makefile
===================================================================
--- trunk/packages/m4/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/m4/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,12 +1,12 @@
 # M4 Makefile
 
 NM= m4
-VRS= 1.4.4
+VRS= 1.4.8
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.gz
+FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 4861140cb54b6c9e135d04b5fbf460ff57f969a5
+SHA-$(FILE)= 31589415022c2842f62f3b91186bc9e0a9a8e1a1
 
 # Targets
 

Modified: trunk/packages/make/Makefile
===================================================================
--- trunk/packages/make/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/make/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,12 +1,12 @@
 # Make Makefile
 
 NM= make
-VRS= 3.80
+VRS= 3.81
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= d2085842f08e57d58d3e1cd75a5f0342a60e5f45
+SHA-$(FILE)= 41ed86d941b9c8025aee45db56c0283169dcab3d
 
 # Targets
 

Modified: trunk/packages/tar/Makefile
===================================================================
--- trunk/packages/tar/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/tar/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,35 +1,22 @@
 # Tar Makefile
 
 NM= tar
-VRS= 1.15.1
+VRS= 1.16
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= f861b7524a0867833056dc382e68085234cae6ff
+SHA-$(FILE)= b98abe392cedb7fcef475a41d61c17a8f800b90c
 
-PATCH1= $(DIR)-gcc4_fix_tests-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= ba780e0e88c7993a69d5a498912e135bf16e7df8
-
-PATCH2= $(DIR)-sparse_fix-1.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 269dfcc556b6217d27d043ea623df75e19e3d8c9
-
-PATCH3= $(DIR)-security_fixes-1.patch
-URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
-SHA-$(PATCH3)= 93fd5a55bccf25d03bb7e18dffc0bce27c29d207
-
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(PATCH1)
+stage1: $(FILE)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)/
+	cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-stage1:
-	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=$(WD)
 	make $(PM)
 	make install

Modified: trunk/packages/tcl/Makefile
===================================================================
--- trunk/packages/tcl/Makefile	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/tcl/Makefile	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,12 +1,12 @@
 # Tcl Makefile
 
 NM= tcl
-VRS= 8.4.13
+VRS= 8.4.14
 DIR= $(NM)$(VRS)
 
 FILE= $(DIR)-src.tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 4af6bec9a941d7d798df4287eebece7ded67489c
+SHA-$(FILE)= d7af7e0c7ed563e2344dda04bbe49961589244dd
 
 # Targets
 

Deleted: trunk/packages/util-linux/util-linux-2.12q-klibc-1.patch
===================================================================
--- trunk/packages/util-linux/util-linux-2.12q-klibc-1.patch	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/packages/util-linux/util-linux-2.12q-klibc-1.patch	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,54 +0,0 @@
-diff -urN util-linux-2.12q.orig/lib/getpass.c util-linux-2.12q/lib/getpass.c
---- util-linux-2.12q.orig/lib/getpass.c	1970-01-01 05:00:00.000000000 +0500
-+++ util-linux-2.12q/lib/getpass.c	2005-04-22 13:57:34.000000000 +0600
-@@ -0,0 +1,7 @@
-+#include <stdio.h>
-+
-+const char *getpass(const char *prompt)
-+{
-+	fprintf(stderr, "This version of losetup doesn't support passwords.\n");
-+	return "";	
-+}
-diff -urN util-linux-2.12q.orig/mount/lomount.c util-linux-2.12q/mount/lomount.c
---- util-linux-2.12q.orig/mount/lomount.c	2004-12-21 03:11:04.000000000 +0500
-+++ util-linux-2.12q/mount/lomount.c	2005-04-22 13:39:50.000000000 +0600
-@@ -395,7 +395,6 @@
- 
- #ifdef LOOP_SET_FD
- 
--#include <getopt.h>
- #include <stdarg.h>
- 
- int verbose = 0;
-@@ -448,10 +447,6 @@
- 	int pfd = -1;
- 	unsigned long long off;
- 
--	setlocale(LC_ALL, "");
--	bindtextdomain(PACKAGE, LOCALEDIR);
--	textdomain(PACKAGE);
--
- 	delete = find = 0;
- 	off = 0;
- 	offset = encryption = passfd = NULL;
-diff -urN util-linux-2.12q.orig/mount/Makefile util-linux-2.12q/mount/Makefile
---- util-linux-2.12q.orig/mount/Makefile	2004-12-22 14:32:08.000000000 +0500
-+++ util-linux-2.12q/mount/Makefile	2005-04-22 13:51:59.000000000 +0600
-@@ -29,7 +29,7 @@
- 
- MAYBE = pivot_root swapoff
- 
--LO_OBJS = lomount.o $(LIB)/xstrncpy.o
-+LO_OBJS = lomount.o $(LIB)/xstrncpy.o $(LIB)/getpass.o
- NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o
- GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c
- 
-@@ -64,7 +64,7 @@
- main_losetup.o: lomount.c
- 	$(COMPILE) -DMAIN lomount.c -o $@
- 
--losetup: main_losetup.o $(LIB)/xstrncpy.o
-+losetup: main_losetup.o $(LIB)/xstrncpy.o $(LIB)/getpass.o
- 	$(LINK) $^ -o $@
- 
- mount.o umount.o nfsmount.o losetup.o fstab.o realpath.o sundries.o: sundries.h

Modified: trunk/vars/vars.ppc
===================================================================
--- trunk/vars/vars.ppc	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/vars/vars.ppc	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,4 +1,4 @@
-export VERSION := ppc-6.2-4
+export VERSION := ppc-6.3-pre1
 export CFLAGS := -Os -s -fno-strict-aliasing
 export LINKER := ld.so.1
 export LFS_TARGET := powerpc-unknown-linux-gnu

Modified: trunk/vars/vars.sparc
===================================================================
--- trunk/vars/vars.sparc	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/vars/vars.sparc	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,3 +1,3 @@
-export VERSION := sparc-6.2-4
+export VERSION := sparc-6.3-pre1
 export CFLAGS := -Os -s -fno-strict-aliasing
 export LFS_TARGET := sparc-unknown-linux-gnu

Modified: trunk/vars/vars.x86
===================================================================
--- trunk/vars/vars.x86	2006-12-05 12:19:45 UTC (rev 1761)
+++ trunk/vars/vars.x86	2006-12-05 12:28:07 UTC (rev 1762)
@@ -1,4 +1,4 @@
-export VERSION := x86-6.2-4
+export VERSION := x86-6.3-pre1
 export CFLAGS := -Os -s -fno-strict-aliasing -mtune=i686
 export LINKER := ld-linux.so.2
 export LFS_TARGET := i486-pc-linux-gnu




More information about the livecd mailing list