* updated uclibc (20061129 -> 0.9.28.3) - .conf partially reworked and cleaned

* renamed uclibc/functions.in to uclibc/conffiles-functions.in (includes API change)


git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20507 10447126-35f2-4685-b0cf-6dd780d3921f

base/uclibc/add-dns-skipname.patch

@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../uclibc/add-dns-skipname.patch
+# Filename: package/.../uclibc/add-dns-skipname.patch
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -12,13 +13,13 @@
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 --- uClibc-0.9.27/libc/inet/resolv.c.orig	2005-02-01 11:16:03.000000000 -0800
 +++ uClibc-0.9.27/libc/inet/resolv.c	2005-02-01 11:27:30.000000000 -0800
 @@ -2543,4 +2543,85 @@
+ 		len = srcp - src;
  	return (len);
  }
- libc_hidden_def(ns_name_unpack)
 +
 +#define NS_TYPE_ELT                     0x40 /* EDNS0 extended label type */
 +#define DNS_LABELTYPE_BITSTRING         0x41

base/uclibc/conffiles-functions.in

@@ -1,9 +1,8 @@
-#!/bin/sh
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# Filename: package/.../uclibc/functions.in
+# Filename: package/.../uclibc/conffiles-functions.in
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -19,7 +18,7 @@
 # X means enable, O disable, and - removes it
 # pattern can use '*' as a wildcard for [^ #]
 # optionaly can set a value different that y
-apply_conffiles() {
+conffiles_apply() {
 	local file= rule=
 	local action= prerule= value= x=
 
@@ -50,23 +49,22 @@ apply_conffiles() {
 		done
 	fi ; done
 	fi
-	sed -f $builddir/config.sed .config > $1
+	sed -f $builddir/config.sed .config
 }
 
 # get default config, and filter considering <n>
 # levels, because new options can appear and other disappear
-auto_config() {
+conffiles_loop() {
-	local j=1 n="${1:-1}"
+	local loops="${1:-1}"
+	shift
 
-	# defconfig
+	cp -v .config .config.1
-	eval "$MAKE defconfig"
-	cp -v .config .config.$j
 
-	j=2 ; for (( i=1 ; i<n ; i++, j++ )) {
+	j=2 ; for (( i=1 ; i<loops ; i++, j++ )) {
-		apply_conffiles .config.$j
+		conffiles_apply > .config.$j
 		cp -v .config.$j .config
 		
-		yes '' | eval $MAKE oldconfig
+		eval $MAKE "$@" oldconfig
 
 		(( j++ )) ; cp -v .config .config.$j
 	}

base/uclibc/dont_validate_kernelsource_on_stage0.diff

@@ -1,29 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../uclibc/dont_validate_kernelsource_on_stage0.diff
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
---- ./Makefile.orig	2004-02-07 10:30:44.000000000 -0300
-+++ ./Makefile	2004-02-07 10:32:53.000000000 -0300
-@@ -121,11 +121,6 @@
- 	@./extra/config/conf -o extra/Configs/Config.in
- 
- headers: include/bits/uClibc_config.h
--ifeq ($(strip $(ARCH_HAS_MMU)),y)
--	@set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH)
--else
--	@set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
--endif
- 	@cd include/bits; \
- 	set -e; \
- 	for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \

base/uclibc/filter_before_install.ing.patch

@@ -1,55 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# Filename: package/.../uclibc/filter_before_install.ing.patch
-# Copyright (C) 2006 The OpenSDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.in.orig	2006-11-29 22:29:11.000000000 -0300
-+++ ./Makefile.in	2006-11-29 22:30:50.000000000 -0300
-@@ -113,16 +113,8 @@
- 
- # Installs header files.
- install_headers:
--	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
--	printf ".svn\n.cvsignore\nCVS\n" > tar_exclude ; \
--	if [ "$(KERNEL_SOURCE)" = "$(PREFIX)$(DEVEL_PREFIX)" ] ; then \
--		ls -1d include/linux include/asm* >> tar_exclude ; \
--	fi ; \
--	$(TAR) -chf - -X tar_exclude include \
--		| $(TAR) -xf - -C $(PREFIX)$(DEVEL_PREFIX)
--	rm -f tar_exclude
- 	printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
--		$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
-+		include/libc-internal.h
- 	$(RM) include/dl-osinfo.h
- 	$(RM) include/_lfs_64.h
- 	$(RM) include/bits/uClibc_uintmaxtostr.h
-@@ -199,10 +191,14 @@
- 	# Remove this as it is only used internally.
- 	$(RM) include/tls.h
- endif
--	-@for i in `find $(PREFIX)$(DEVEL_PREFIX)include -type d` ; do \
--	    chmod 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \
--	done
--	-chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1:\2/'` $(PREFIX)$(DEVEL_PREFIX)include
-+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
-+	printf ".svn\n.cvsignore\nCVS\n" > tar_exclude ; \
-+	if [ "$(KERNEL_SOURCE)" = "$(PREFIX)$(DEVEL_PREFIX)" ] ; then \
-+		ls -1d include/linux include/asm* >> tar_exclude ; \
-+	fi ; \
-+	$(TAR) -chf - -X tar_exclude include/* \
-+		| $(TAR) -xf - -C $(PREFIX)$(DEVEL_PREFIX)
-+	rm -f tar_exclude
- 
- # Installs development library links.
- install_dev: install_headers

base/uclibc/fix_make_install.patch

@@ -0,0 +1,30 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# Filename: package/.../uclibc/fix_make_install.patch
+# Copyright (C) 2007 The OpenSDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- ./Makefile.orig	2007-03-19 08:23:12.000000000 -0400
++++ ./Makefile	2007-03-19 08:23:49.000000000 -0400
+@@ -163,8 +163,9 @@
+ 	else \
+ 		extra_exclude="" ; \
+ 	fi ; \
+-	tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \
+-		| tar -xf - -C $(PREFIX)$(DEVEL_PREFIX)
++	find -L include ! -type d ! -path '*/.svn/*' ! -path '*/CVS/*' ! -path 'include/linux/*' ! -path 'include/scsi/*' \
++		! -path 'include/asm/*' ! -path 'include/asm-*/*' | tar -chf - -T /dev/stdin \
++		| tar -xvf - -C $(PREFIX)$(DEVEL_PREFIX)
+ 	echo '/* Dont use _syscall#() macros; use the syscall() function */' > \
+ 		$(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h
+ ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)

base/uclibc/make_locale_after_headers.diff

@@ -1,25 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../uclibc/make_locale_after_headers.diff
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
---- ./Makefile.orig	2004-02-08 00:35:28.000000000 -0300
-+++ ./Makefile	2004-02-08 00:36:20.000000000 -0300
-@@ -156,6 +156,7 @@
- 	fi
- 	$(MAKE) -C libc/sysdeps/linux/common headers
- 	$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
-+	$(MAKE) -C extra/locale
- 
- # Command used to download source code
- WGET:=wget --passive-ftp

base/uclibc/uclibc.conf

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: package/.../uclibc/uclibc.conf
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -13,37 +13,18 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-. $confdir/functions.in
+. $confdir/conffiles-functions.in
-
-# create /etc/ld.so.conf
-hook_add postinstall 5 'uclibc_ldsoconf'
-uclibc_ldsoconf() {
-	cat > $root/etc/ld.so.conf <<-EOT
-/lib
-/usr/lib
-/usr/X11/lib
-/opt/*/lib
-EOT
-}
-
-# rulesets
-var_append conffiles ' ' $confdir/clean_arch.config
 
-hook_add preconf 3 "default_config > $builddir/.config"
+# generated set
 var_append conffiles ' ' $builddir/.config
-
 # add custom/target configuration from $targetdir
 if [ -e $targetdir/uclibc.config ] ; then
 	var_append conffiles ' ' $targetdir/uclibc.config
 fi
 
-default_config()
+default_config() {
-{
+	local uC_arch="$1"
-	echo "X TARGET_$( echo $arch | arch2uname )"
+	echo "X TARGET_$uC_arch"
-#	case "$arch" in
-#		i386)	cpu
-#	echo "X CONFIG_$( echo SDECFG_X86_OPT )"
-#	esac
 
 	if [ "$arch_bigendian" = "yes" ]; then
 		echo "X ARCH_BIG_ENDIAN"
@@ -60,7 +41,6 @@ default_config()
 		echo "X KERNEL_SOURCE \"$root/usr\""
 	fi
 	echo "X RUNTIME_PREFIX \"/\""
-	#echo "X DEVEL_PREFIX \"/usr/lib/uclibc\""	# NOTE: why there?
 	echo "X DEVEL_PREFIX \"/usr\""
 
 	if [ "$SDECFG_STATIC" = 0 ]; then
@@ -109,18 +89,17 @@ default_config()
 	echo "X UCLIBC_HAS_FLOATS"
 }
 
-if [ "$SDECFG_DISABLE_NLS" = "0" ]; then
-	uclibc_preparelocale() {
-		find ./charmaps -name "*.pairs" > codesets.txt
-		cp -v LOCALES locales.txt
-	}
-	hook_add preconf 5 '( cd extra/locale; uclibc_preparelocale )'
-	var_append patchfiles ' ' $confdir/make_locale_after_headers.diff
-fi
-
 runconf=0
-# FIXME: inject X options early - so 2 loops are enough
+hook_add premake 5 "uclibc_config"
-hook_add premake 5 "auto_config 3"
+uclibc_config() {
+	local uC_arch=$( echo $arch | arch2uname )
+
+	# generate default_config
+	default_config $uC_arch > $builddir/.config
+
+	eval $MAKE defconfig ARCH=$uC_arch
+	conffiles_loop 2 TARGET_ARCH=$uC_arch
+}
 
 var_remove_regex makeopt ' ' 'prefix=[^ ]*'
 if atstage toolchain; then
@@ -128,12 +107,13 @@ if atstage toolchain; then
 else
 	var_append makeopt ' ' "PREFIX=$root"
 fi
-makeinstopt="$makeopt"
+makeinstopt="$makeopt -j 1"
+var_append makeopt ' ' "CROSS=${archprefix}"
 
 if atstage toolchain; then
 	var_append makeopt ' ' "headers"
 
-	var_append makeinstopt ' ' "install_headers"
+	var_append makeinstopt ' ' "install_dev"
 else
 	var_append makeopt ' ' "pregen"
 	var_append makeopt ' ' "all"
@@ -144,23 +124,5 @@ else
 	var_append makeinstopt ' ' "install_utils"
 fi
 
-hook_add prepatch 5 'sanitize_makefile'
+hook_add postdoc 5 'cp -v .config .config.* $root/$docdir/'
-sanitize_makefile() {
-	sed -i -e 's,\($(RM)\) $(PREFIX)$(DEVEL_PREFIX)\(.*\.h\),\1 \2,' Makefile.in
-	}
-
-
-# inject kernel symlinks
-hook_add preconf 5 'uclibc_kernellinks'
-uclibc_kernellinks() {
-	local x=
-	rm -rvf include/scsi
-	for x in $( ls -1d $root/usr/include/{asm,asm-*,scsi,linux} 2> /dev/null ); do
-		ln -svf $x include/
-	done
-}
-
-# remove symlinks to avoid shares (install_dev)
-hook_add inmake 5 'rm -vf include/{asm,asm-*,scsi,linux}'
 
-hook_add postdoc 5 'cp -v .config $root/$docdir/'

base/uclibc/uclibc.desc

@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] 
 [COPY] Filename: package/.../uclibc/uclibc.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
@@ -35,8 +35,9 @@
 [C] extra/base
 
 [L] LGPL
-[S] Beta
+[S] Stable
-[V] 20061129
+[V] 0.9.28.3
 [P] O 01---5---9 101.700
 
-[D] 2166461980 uClibc-20061129.tar.bz2 http://www.uclibc.org/downloads/snapshots/
+#[D] 301470184 uClibc-20061231.tar.bz2 http://www.uclibc.org/downloads/snapshots/
+[D] 0 uClibc-0.9.28.3.tar.bz2 http://www.uclibc.org/downloads/