merge of '79a8be76eb7e634035b02729b67f9179fabb8711'

     and '9b3f781313b3e47faa28044336efce829a2c5a40'

13 files changed, 359 insertions, 8 deletions

diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb
new file mode 100644
index 0000000000..92c861f49c
--- /dev/null
+++ b/packages/automake/automake-native_1.10.bb
@@ -0,0 +1,3 @@
+PV := "${PV}"
+
+require automake-native.inc
diff --git a/packages/automake/automake_1.10.bb b/packages/automake/automake_1.10.bb
new file mode 100644
index 0000000000..eef69f4e4a
--- /dev/null
+++ b/packages/automake/automake_1.10.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+
+S = "${WORKDIR}/automake-${PV}"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+inherit autotools
+
+export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+
+require automake.inc
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.9 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.9 ${D}${datadir}/automake
+	fi
+}
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gparted/.mtn2git_empty b/packages/gparted/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gparted/.mtn2git_empty
diff --git a/packages/gparted/files/.mtn2git_empty b/packages/gparted/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gparted/files/.mtn2git_empty
diff --git a/packages/gparted/files/cross.patch b/packages/gparted/files/cross.patch
new file mode 100644
index 0000000000..08d4a29e5a
--- /dev/null
+++ b/packages/gparted/files/cross.patch
@@ -0,0 +1,12 @@
+diff -ur gparted-0.3.3.org/configure.in gparted-0.3.3/configure.in
+--- gparted-0.3.3.org/configure.in	2006-12-06 15:23:35.000000000 +0200
++++ gparted-0.3.3/configure.in	2007-07-10 02:10:59.000000000 +0300
+@@ -37,7 +37,7 @@
+ AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
+ LIBS_save="$LIBS"
+ LIBS="-lparted -luuid -ldl"
+-AC_TRY_RUN(
++AC_TRY_LINK(
+ #include <stdio.h>
+ #include <parted/parted.h>
+ 
diff --git a/packages/gparted/files/gparted-0.3.3-llabs.patch b/packages/gparted/files/gparted-0.3.3-llabs.patch
new file mode 100644
index 0000000000..07c4020e57
--- /dev/null
+++ b/packages/gparted/files/gparted-0.3.3-llabs.patch
@@ -0,0 +1,72 @@
+--- src/GParted_Core.cc	2006/09/25 21:49:32	1.1
++++ src/GParted_Core.cc	2006/09/25 22:03:31
+@@ -1604,7 +1604,7 @@ bool GParted_Core::copy_filesystem( cons
+ 
+ 	while ( succes &&
+ 		timer .elapsed() <= smallest_time && 
+-		std::llabs( done ) + N <= length && 
++		llabs( done ) + N <= length && 
+ 		optimal_blocksize * 2 < N )
+ 	{
+ 		if ( done != 0 ) 
+@@ -1648,7 +1648,7 @@ bool GParted_Core::copy_filesystem( cons
+ 		      	    	    dst_device,
+ 		      	    	    src_start + ( dst_start > src_start ? 0 : done ),
+ 		      	    	    dst_start + ( dst_start > src_start ? 0 : done ),
+-		      	    	    length - std::llabs( done ), 
++		      	    	    length - llabs( done ), 
+ 		      	    	    optimal_blocksize,
+ 		      	    	    operationdetail,
+ 			    	    readonly,
+@@ -1822,7 +1822,7 @@ bool GParted_Core::copy_blocks( const Gl
+ 	if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
+ 	{
+ 		Glib::ustring error_message ;
+-		buf = static_cast<char *>( malloc( std::llabs( blocksize ) * 512 ) ) ;
++		buf = static_cast<char *>( malloc( llabs( blocksize ) * 512 ) ) ;
+ 		if ( buf )
+ 		{
+ 			ped_device_sync( lp_device_dst ) ;
+@@ -1843,7 +1843,7 @@ bool GParted_Core::copy_blocks( const Gl
+ 			operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
+ 			
+ 			Glib::Timer timer_progress_timeout, timer_total ;
+-			while( succes && std::llabs( done ) < length )
++			while( succes && llabs( done ) < length )
+ 			{
+ 				succes = copy_block( lp_device_src,
+ 						     lp_device_dst,
+@@ -1858,7 +1858,7 @@ bool GParted_Core::copy_blocks( const Gl
+ 				if ( timer_progress_timeout .elapsed() >= 0.5 )
+ 				{
+ 					set_progress_info( length,
+-							   std::llabs( done + blocksize ),
++							   llabs( done + blocksize ),
+ 							   timer_total,
+ 							   operationdetail .get_last_child() .get_last_child(),
+ 							   readonly ) ;
+@@ -1877,13 +1877,13 @@ bool GParted_Core::copy_blocks( const Gl
+ 
+ 		//final description
+ 		operationdetail .get_last_child() .get_last_child() .set_description( 
+-			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ;
++			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), llabs( done ), length ), FONT_ITALIC ) ;
+ 		
+ 		if ( ! succes && ! error_message .empty() )
+ 			operationdetail .get_last_child() .add_child( 
+ 				OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ;
+ 		
+-		total_done += std::llabs( done ) ;
++		total_done += llabs( done ) ;
+ 	
+ 		//close and destroy the devices..
+ 		ped_device_close( lp_device_src ) ;
+@@ -1912,7 +1912,7 @@ bool GParted_Core::copy_block( PedDevice
+ 
+ 	if ( blocksize < 0 )
+ 	{
+-		blocksize = std::llabs( blocksize ) ;
++		blocksize = llabs( blocksize ) ;
+ 		offset_src -= ( blocksize -1 ) ;
+ 		offset_dst -= ( blocksize -1 ) ;
+ 	}
diff --git a/packages/gparted/gparted_0.3.3.bb b/packages/gparted/gparted_0.3.3.bb
new file mode 100644
index 0000000000..43623d7348
--- /dev/null
+++ b/packages/gparted/gparted_0.3.3.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "GNOME Partition Manager"
+LICENSE = "GPL"
+DEPENDS = "gtkmm parted"
+PR = "r1"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gparted/gparted-${PV}.tar.bz2 \
+           file://cross.patch;patch=1 \
+	   file://gparted-0.3.3-llabs.patch;patch=1;pnum=0"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
new file mode 100644
index 0000000000..b34d4630a0
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
diff --git a/packages/parted/files/.mtn2git_empty b/packages/parted/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/parted/files/.mtn2git_empty
diff --git a/packages/parted/files/cross-gross-hack.patch b/packages/parted/files/cross-gross-hack.patch
new file mode 100644
index 0000000000..8d2db63661
--- /dev/null
+++ b/packages/parted/files/cross-gross-hack.patch
@@ -0,0 +1,33 @@
+diff -ur parted-1.8.7.org/configure parted-1.8.7/configure
+--- parted-1.8.7.org/configure	2007-05-10 00:01:27.000000000 +0300
++++ parted-1.8.7/configure	2007-07-10 15:46:42.000000000 +0300
+@@ -12556,7 +12556,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  ac_cv_func_malloc_0_nonnull=no
++  ac_cv_func_malloc_0_nonnull=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+diff -ur parted-1.8.7.org/configure parted-1.8.7/configure
+--- parted-1.8.7.org/configure	2007-07-10 15:48:07.000000000 +0300
++++ parted-1.8.7/configure	2007-07-10 15:57:26.000000000 +0300
+@@ -12889,7 +12889,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  ac_cv_func_memcmp_working=no
++  ac_cv_func_memcmp_working=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13574,7 +13574,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  ac_cv_func_realloc_0_nonnull=no
++  ac_cv_func_realloc_0_nonnull=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
diff --git a/packages/parted/files/syscalls.h b/packages/parted/files/syscalls.h
new file mode 100644
index 0000000000..9278704b29
--- /dev/null
+++ b/packages/parted/files/syscalls.h
@@ -0,0 +1,166 @@
+/*
+ *  linux/include/asm-arm/unistd.h
+ *
+ *  Copyright (C) 2001-2005 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Please forward _all_ changes to this file to rmk@arm.linux.org.uk,
+ * no matter what the change is.  Thanks!
+ */
+#ifndef __ASM_ARM_UNISTD_H2
+#define __ASM_ARM_UNISTD_H2
+
+
+#define __sys2(x) #x
+#define __sys1(x) __sys2(x)
+
+#ifndef __syscall
+#if defined(__thumb__) || defined(__ARM_EABI__)
+#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name;
+#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs
+#define __syscall(name) "swi\t0"
+#else
+#define __SYS_REG(name)
+#define __SYS_REG_LIST(regs...) regs
+#define __syscall(name) "swi\t" __sys1(__NR_##name) ""
+#endif
+#endif
+
+#define __syscall_return(type, res)					\
+do {									\
+	if ((unsigned long)(res) >= (unsigned long)(-129)) {		\
+		errno = -(res);						\
+		res = -1;						\
+	}								\
+	return (type) (res);						\
+} while (0)
+
+#define _syscall0(type,name)						\
+type name(void) {							\
+  __SYS_REG(name)							\
+  register long __res_r0 __asm__("r0");					\
+  long __res;								\
+  __asm__ __volatile__ (						\
+  __syscall(name)							\
+	: "=r" (__res_r0)						\
+	: __SYS_REG_LIST() );						\
+  __res = __res_r0;							\
+  __syscall_return(type,__res);						\
+}
+
+#define _syscall1(type,name,type1,arg1) 				\
+type name(type1 arg1) { 						\
+  __SYS_REG(name)							\
+  register long __r0 __asm__("r0") = (long)arg1;			\
+  register long __res_r0 __asm__("r0");					\
+  long __res;								\
+  __asm__ __volatile__ (						\
+  __syscall(name)							\
+	: "=r" (__res_r0)						\
+	: __SYS_REG_LIST( "0" (__r0) ) );				\
+  __res = __res_r0;							\
+  __syscall_return(type,__res);						\
+}
+
+#define _syscall2(type,name,type1,arg1,type2,arg2)			\
+type name(type1 arg1,type2 arg2) {					\
+  __SYS_REG(name)							\
+  register long __r0 __asm__("r0") = (long)arg1;			\
+  register long __r1 __asm__("r1") = (long)arg2;			\
+  register long __res_r0 __asm__("r0");					\
+  long __res;								\
+  __asm__ __volatile__ (						\
+  __syscall(name)							\
+	: "=r" (__res_r0)						\
+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) );			\
+  __res = __res_r0;							\
+  __syscall_return(type,__res);						\
+}
+
+
+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)		\
+type name(type1 arg1,type2 arg2,type3 arg3) {				\
+  __SYS_REG(name)							\
+  register long __r0 __asm__("r0") = (long)arg1;			\
+  register long __r1 __asm__("r1") = (long)arg2;			\
+  register long __r2 __asm__("r2") = (long)arg3;			\
+  register long __res_r0 __asm__("r0");					\
+  long __res;								\
+  __asm__ __volatile__ (						\
+  __syscall(name)							\
+	: "=r" (__res_r0)						\
+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) );	\
+  __res = __res_r0;							\
+  __syscall_return(type,__res);						\
+}
+
+
+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {		\
+  __SYS_REG(name)							\
+  register long __r0 __asm__("r0") = (long)arg1;			\
+  register long __r1 __asm__("r1") = (long)arg2;			\
+  register long __r2 __asm__("r2") = (long)arg3;			\
+  register long __r3 __asm__("r3") = (long)arg4;			\
+  register long __res_r0 __asm__("r0");					\
+  long __res;								\
+  __asm__ __volatile__ (						\
+  __syscall(name)							\
+	: "=r" (__res_r0)						\
+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) ); \
+  __res = __res_r0;							\
+  __syscall_return(type,__res);						\
+}
+  
+
+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)	\
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {	\
+  __SYS_REG(name)							\
+  register long __r0 __asm__("r0") = (long)arg1;			\
+  register long __r1 __asm__("r1") = (long)arg2;			\
+  register long __r2 __asm__("r2") = (long)arg3;			\
+  register long __r3 __asm__("r3") = (long)arg4;			\
+  register long __r4 __asm__("r4") = (long)arg5;			\
+  register long __res_r0 __asm__("r0");					\
+  long __res;								\
+  __asm__ __volatile__ (						\
+  __syscall(name)							\
+	: "=r" (__res_r0)						\
+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2),		\
+			  "r" (__r3), "r" (__r4) ) );			\
+  __res = __res_r0;							\
+  __syscall_return(type,__res);						\
+}
+
+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6)	\
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) {	\
+  __SYS_REG(name)							\
+  register long __r0 __asm__("r0") = (long)arg1;			\
+  register long __r1 __asm__("r1") = (long)arg2;			\
+  register long __r2 __asm__("r2") = (long)arg3;			\
+  register long __r3 __asm__("r3") = (long)arg4;			\
+  register long __r4 __asm__("r4") = (long)arg5;			\
+  register long __r5 __asm__("r5") = (long)arg6;			\
+  register long __res_r0 __asm__("r0");					\
+  long __res;								\
+  __asm__ __volatile__ (						\
+  __syscall(name)							\
+	: "=r" (__res_r0)						\
+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2),		\
+			  "r" (__r3), "r" (__r4), "r" (__r5) ) );	\
+  __res = __res_r0;							\
+  __syscall_return(type,__res);						\
+}
+
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
+#endif /* __ASM_ARM_UNISTD_H2 */
diff --git a/packages/parted/files/syscalls.patch b/packages/parted/files/syscalls.patch
new file mode 100644
index 0000000000..be9b91cb9c
--- /dev/null
+++ b/packages/parted/files/syscalls.patch
@@ -0,0 +1,10 @@
+--- parted-1.8.7/libparted/arch/linux.c.org	2007-05-09 23:40:13.000000000 +0300
++++ parted-1.8.7/libparted/arch/linux.c	2007-07-10 18:20:27.000000000 +0300
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <syscall.h>
+ #include <unistd.h>
++#include "syscalls.h"
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
diff --git a/packages/parted/parted_1.8.7.bb b/packages/parted/parted_1.8.7.bb
index dcb3ad7cb4..59e3aeaece 100644
--- a/packages/parted/parted_1.8.7.bb
+++ b/packages/parted/parted_1.8.7.bb
@@ -3,25 +3,28 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
+           file://syscalls.h \
+           file://syscalls.patch;patch=1 \
+           file://cross-gross-hack.patch;patch=1"
            
 EXTRA_OECONF = "--disable-Werror"
 
 inherit autotools pkgconfig
 
+do_configure_prepend() {
+	cp ${WORKDIR}/syscalls.h ${S}/libparted/arch/
+}
+
 do_configure() {
-        libtoolize --force
         gnu-configize
+        libtoolize --force
+        autoconf
         oe_runconf
 }
 
 do_stage() {
 	autotools_stage_all
 }
-
-# Requires autoconf 2.61. Without it, will build, but there
-# will be link errors when some other package will link against
-# libparted.
-DEFAULT_PREFERENCE = "-1"