Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 91 insertions, 4 deletions

diff --git a/mk/vars.mk b/mk/vars.mk
index cd8c25d62..e5959f203 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -150,6 +150,7 @@ PKG_INSTALL:=		IPKG_TMP=$(BUILD_DIR)/tmp \
 			IPKG_INSTROOT=$(TARGET_DIR) \
 			IPKG_CONF_DIR=$(STAGING_TARGET_DIR)/etc \
 			IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
+			TOOLS_DIR=$(TOOLS_DIR) \
 			${BASH} ${SCRIPT_DIR}/ipkg \
 			-force-defaults -force-depends install
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/ipkg
diff --git a/package/bkeymaps/Makefile b/package/bkeymaps/Makefile
index 0a6bf90d8..8d6acb498 100644
--- a/package/bkeymaps/Makefile
+++ b/package/bkeymaps/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		a68058ab4a81cf9a8dcbaaa7a5df5b11
 PKG_DESCR:=		binary keymaps for busybox loadkmap
 PKG_SECTION:=		utils
+PKG_BUILDDEP:=		base-files
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_DFLT_BKEYMAPS:=	y if ADK_TARGET_WITH_INPUT
diff --git a/scripts/ipkg b/scripts/ipkg
index 101d20dc1..428761a3a 100644
--- a/scripts/ipkg
+++ b/scripts/ipkg
@@ -808,7 +808,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg
 	set -o noglob
 	rm -r $IPKG_TMP/$pkg/control
 
-	if ! $pkg_extract_stdout $filename ./data.tar.gz|gzip -dc|tar -xf - -C $IPKG_TMP/$pkg/data ; then
+	if ! $pkg_extract_stdout $filename ./data.tar.gz|gzip -dc|(cd $IPKG_TMP/$pkg/data && $TOOLS_DIR/cpio -iud -H ustar) ; then
 		echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename"
 		return 1
 	fi
@@ -876,7 +876,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
 	fi
 
 	local owd="`pwd`"
-	(cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -))
+	(cd $IPKG_TMP/$pkg/data/; find . | $TOOLS_DIR/cpio -o -H ustar | (cd $owd; cd $dest; $TOOLS_DIR/cpio -iud -H ustar))
 	rm -rf $IPKG_TMP/$pkg/data
 	rmdir $IPKG_TMP/$pkg
 	rm -f $info_dir/$pkg.list
diff --git a/target/tools/squashfs/patches/uClibc-compat.patch b/target/tools/squashfs/patches/uClibc-compat.patch
new file mode 100644
index 000000000..00f2b22c0
--- /dev/null
+++ b/target/tools/squashfs/patches/uClibc-compat.patch
@@ -0,0 +1,24 @@
+diff -Nur squashfs4.0.orig/squashfs-tools/mksquashfs.c squashfs4.0/squashfs-tools/mksquashfs.c
+--- squashfs4.0.orig/squashfs-tools/mksquashfs.c	2009-04-05 23:22:48.000000000 +0200
++++ squashfs4.0/squashfs-tools/mksquashfs.c	2011-03-18 22:04:00.000000000 +0100
+@@ -3705,7 +3705,7 @@
+ 			processors = 1;
+ 		}
+ #else
+-		processors = get_nprocs();
++		processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ 	}
+ 
+diff -Nur squashfs4.0.orig/squashfs-tools/unsquashfs.c squashfs4.0/squashfs-tools/unsquashfs.c
+--- squashfs4.0.orig/squashfs-tools/unsquashfs.c	2009-04-05 23:23:06.000000000 +0200
++++ squashfs4.0/squashfs-tools/unsquashfs.c	2011-03-18 22:03:31.000000000 +0100
+@@ -1811,7 +1811,7 @@
+ 			processors = 1;
+ 		}
+ #else
+-		processors = get_nprocs();
++		processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ 	}
+ 
diff --git a/toolchain/uClibc/Makefile.inc b/toolchain/uClibc/Makefile.inc
index bc389ca8a..1c847c61a 100644
--- a/toolchain/uClibc/Makefile.inc
+++ b/toolchain/uClibc/Makefile.inc
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		uClibc
-PKG_VERSION:=		0.9.32-rc2
+PKG_VERSION:=		0.9.32-rc3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c8d2cd2c4dbcf5218b6db843cf66ac0f
+PKG_MD5SUM:=		e7f420aa2fb28e7021d02c043acba71b
 PKG_SITES:=		http://uclibc.org/downloads/
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/uClibc/patches/cris-vfork.patch b/toolchain/uClibc/patches/cris-vfork.patch
new file mode 100644
index 000000000..8e0faa2f3
--- /dev/null
+++ b/toolchain/uClibc/patches/cris-vfork.patch
@@ -0,0 +1,49 @@
+diff -Nur uClibc-0.9.32-rc2.orig/libc/sysdeps/linux/cris/Makefile.arch uClibc-0.9.32-rc2/libc/sysdeps/linux/cris/Makefile.arch
+--- uClibc-0.9.32-rc2.orig/libc/sysdeps/linux/cris/Makefile.arch	2011-01-20 15:49:47.000000000 +0100
++++ uClibc-0.9.32-rc2/libc/sysdeps/linux/cris/Makefile.arch	2011-02-07 23:01:26.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ CSRC := __init_brk.c brk.c sbrk.c
+ 
+-SSRC := setjmp.S __longjmp.S clone.S sysdep.S syscall.S
++SSRC := setjmp.S __longjmp.S clone.S sysdep.S syscall.S vfork.S
+ ifeq ($(UNIFIED_SYSCALL),y)
+ SSRC += __uClibc_syscall.S
+ endif
+diff -Nur uClibc-0.9.32-rc2.orig/libc/sysdeps/linux/cris/vfork.S uClibc-0.9.32-rc2/libc/sysdeps/linux/cris/vfork.S
+--- uClibc-0.9.32-rc2.orig/libc/sysdeps/linux/cris/vfork.S	1970-01-01 01:00:00.000000000 +0100
++++ uClibc-0.9.32-rc2/libc/sysdeps/linux/cris/vfork.S	2011-02-08 00:39:10.000000000 +0100
+@@ -0,0 +1,33 @@
++/*
++ * vfork.S
++ *
++ * On cris, r9 contains the syscall number (set by generated stub);
++ * r10..r13 contain arguments 0-3 per the standard calling convention.
++ * The return address is in $srp; so we just need to avoid the stack
++ * usage of the normal syscall stubs.
++ */
++
++#include <asm/unistd.h>
++#include <sys/syscall.h>
++
++	.section ".text","ax"
++	.balign	4
++	.globl	__vfork
++	.type	__vfork,@function
++__vfork:
++	move.d	__NR_vfork, $r9
++	break	13
++
++	cmps.w	-4096,$r10
++	blo	1f
++	neg.d	$r10,$r11
++	move.d	$r11,[errno]
++	moveq	-1,$r10
++1:
++	ret
++	nop
++
++	.size	__vfork,.-__vfork
++
++weak_alias(__vfork,vfork)
++libc_hidden_weak(vfork)
diff --git a/toolchain/uClibc/patches/gnutar-problem.patch b/toolchain/uClibc/patches/gnutar-problem.patch
new file mode 100644
index 000000000..c797ea0b0
--- /dev/null
+++ b/toolchain/uClibc/patches/gnutar-problem.patch
@@ -0,0 +1,12 @@
+diff -Nur uClibc-0.9.32-rc3.orig/Makefile.in uClibc-0.9.32-rc3/Makefile.in
+--- uClibc-0.9.32-rc3.orig/Makefile.in	2011-03-16 20:11:13.000000000 +0100
++++ uClibc-0.9.32-rc3/Makefile.in	2011-03-18 18:00:13.000000000 +0100
+@@ -383,6 +383,8 @@
+ # Installs run-time libraries
+ install_runtime: all | $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
+ ifeq ($(HAVE_SHARED),y)
++	$(INSTALL) -m 755 $(top_builddir)lib/ld-uClibc-$(VERSION).so \
++		$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
+ 	$(INSTALL) -m 755 $(top_builddir)lib/lib*-$(VERSION).so \
+ 		$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
+ 	(cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)