merge of '434c9b83795714321c5e83703daa92ea144962c8'

     and 'df379835be88c87afe28ebc4ac3ec609317fc047'

6 files changed, 84 insertions, 12 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 837b7c3ad6..50fbbfb663 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -52,7 +52,7 @@ KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}
 KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
 
 # Where built kernel lies in the kernel tree
-KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
+KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
 KERNEL_IMAGEDEST = "boot"
 
 #
@@ -451,9 +451,9 @@ python populate_packages_prepend () {
 # with a fixed length or there is a limit in transferring the kernel to memory
 do_sizecheck() {
 	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
-        	size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
+        	size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
         	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
-                	rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+                	rm ${KERNEL_OUTPUT}
                 	die  "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
         	fi
     	fi
@@ -466,7 +466,7 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 
 	if [ -d "${D}/lib" ]; then
diff --git a/packages/kexecboot/initramfs_kexecboot_1.0.bb b/packages/kexecboot/initramfs-kexecboot_1.0.bb
index e1337419b8..e1337419b8 100644
--- a/packages/kexecboot/initramfs_kexecboot_1.0.bb
+++ b/packages/kexecboot/initramfs-kexecboot_1.0.bb
diff --git a/packages/strace/strace/mips-sigcontext.patch b/packages/strace/strace/mips-sigcontext.patch
new file mode 100644
index 0000000000..15f5cc88e4
--- /dev/null
+++ b/packages/strace/strace/mips-sigcontext.patch
@@ -0,0 +1,46 @@
+diff -urN strace-4.5.14/signal.c strace-4.5.14-mips/signal.c
+--- strace-4.5.14/signal.c	2006-01-12 22:34:50.000000000 +0000
++++ strace-4.5.14-mips/signal.c	2007-05-03 06:59:09.000000000 +0000
+@@ -66,7 +66,7 @@
+ 
+ 
+ #ifdef LINUX
+-
++#include <linux/version.h>
+ #ifdef IA64
+ # include <asm/ptrace_offsets.h>
+ #endif /* !IA64 */
+@@ -1420,7 +1420,11 @@
+ 		if (umove(tcp, sp, &sc) < 0)
+ 		  	return 0;
+ 		tcp->u_arg[0] = 1;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 		tcp->u_arg[1] = sc.sc_sigset;
++#else
++		tcp->u_arg[1] = sc.sc_hi2;
++#endif
+ 	} else {
+ 	  	tcp->u_rval = tcp->u_error = 0;
+ 		if(tcp->u_arg[0] == 0)
+diff -urN strace-4.5.14/system.c strace-4.5.14-mips/system.c
+--- strace-4.5.14/system.c	2006-01-12 21:21:06.000000000 +0000
++++ strace-4.5.14-mips/system.c	2007-05-03 06:59:09.000000000 +0000
+@@ -78,6 +78,7 @@
+ #endif
+ 
+ #include <linux/sysctl.h>
++#include <linux/version.h>
+ 
+ static const struct xlat mount_flags[] = {
+ 	{ MS_MGC_VAL,	"MS_MGC_VAL"	},
+@@ -1578,7 +1579,9 @@
+ 	{ CTL_KERN, "CTL_KERN" },
+ 	{ CTL_VM, "CTL_VM" },
+ 	{ CTL_NET, "CTL_NET" },
+-	{ CTL_PROC, "CTL_PROC" },
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
++        { CTL_PROC, "CTL_PROC" },
++#endif
+ 	{ CTL_FS, "CTL_FS" },
+ 	{ CTL_DEBUG, "CTL_DEBUG" },
+ 	{ CTL_DEV, "CTL_DEV" },
diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb
index 0571c466d5..cb697008b8 100644
--- a/packages/strace/strace_4.5.14.bb
+++ b/packages/strace/strace_4.5.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
            file://glibc-2.5.patch;patch=1 \
@@ -13,8 +13,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
            file://strace-undef-syscall.patch;patch=1 \
            file://strace-arm-no-cachectl.patch;patch=1 \
           "
- 
-
 
 # The strace-4.5.14-avr32.patch conflicts with some other patches.
 # These patches are primarly for the ARM and SuperH, so we'll just
@@ -27,6 +25,20 @@ SRC_URI_avr32 = \
      file://strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch;patch=1 \
     "
 
+# Again, a different set of patches for MIPS. See http://bugs.openembedded.net/show_bug.cgi?id=2221
+MIPS = "\
+  ${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
+  file://glibc-2.5.patch;patch=1 \
+  file://arm-eabi.patch;patch=1 \
+  file://sh-arch-update.patch;patch=1 \
+  file://sh-syscall-update.patch;patch=1 \
+  file://strace-fix-arm-bad-syscall.patch;patch=1 \
+  file://strace-undef-syscall.patch;patch=1 \
+  file://strace-arm-no-cachectl.patch;patch=1 \
+  file://mips-sigcontext.patch;patch=1 \
+"
+SRC_URI_mips = "${MIPS}"
+SRC_URI_mipsel = "${MIPS}"
 
 inherit autotools
 
diff --git a/site/mips-linux b/site/mips-linux
index bab92eff63..11c6033b8f 100644
--- a/site/mips-linux
+++ b/site/mips-linux
@@ -49,6 +49,13 @@ glib_cv_uscore=${glib_cv_uscore=no}
 glib_cv_va_copy=${glib_cv_va_copy=yes}
 glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
 
+# glib-2.0
+glib_cv_stack_grows=${glib_cv_stack_grows=no}
+utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
+
 # libpcap
 ac_cv_linux_vers=${ac_cv_linux_vers=2}
 ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
@@ -107,16 +114,16 @@ ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
 # sudo
 sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
 
-#intercom
+# intercom
 ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
 
-#lmbench
+# lmbench
 ac_cv_uint=${ac_cv_unit=yes}
 
 # D-BUS
 ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 
-#mono
+# mono
 cv_mono_sizeof_sunpath=108
 mono_cv_uscore=${mono_cv_uscore=no}
 
diff --git a/site/mipsel-linux b/site/mipsel-linux
index bab92eff63..06602ca054 100644
--- a/site/mipsel-linux
+++ b/site/mipsel-linux
@@ -49,6 +49,13 @@ glib_cv_uscore=${glib_cv_uscore=no}
 glib_cv_va_copy=${glib_cv_va_copy=yes}
 glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
 
+# glib-2.0
+glib_cv_stack_grows=${glib_cv_stack_grows=no}
+utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
+
 # libpcap
 ac_cv_linux_vers=${ac_cv_linux_vers=2}
 ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
@@ -107,7 +114,7 @@ ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
 # sudo
 sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
 
-#intercom
+# intercom
 ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
 
 #lmbench
@@ -116,7 +123,7 @@ ac_cv_uint=${ac_cv_unit=yes}
 # D-BUS
 ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 
-#mono
+# mono
 cv_mono_sizeof_sunpath=108
 mono_cv_uscore=${mono_cv_uscore=no}