[oe-commits] org.oe.dev merge of '0c6c5626491aa3d427ad2222eaa182e53154da9e'
thesing commit
oe at amethyst.openembedded.net
Mon Sep 1 17:51:39 UTC 2008
merge of '0c6c5626491aa3d427ad2222eaa182e53154da9e'
and '1b38165e32339d1af5c9bb0a0200860939e559b3'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 4d50db658eb49ec921eb903f0d6f18de6e4b5dd8
ViewMTN: http://monotone.openembedded.org/revision/info/4d50db658eb49ec921eb903f0d6f18de6e4b5dd8
Files:
1
classes/kernel.bbclass
packages/strace/strace/mips-sigcontext.patch
packages/strace/strace_4.5.14.bb
site/mips-linux
site/mipsel-linux
Diffs:
#
# mt diff -r0c6c5626491aa3d427ad2222eaa182e53154da9e -r4d50db658eb49ec921eb903f0d6f18de6e4b5dd8
#
#
#
# patch "classes/kernel.bbclass"
# from [3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b]
# to [aaee7c587861c7c66d492ee0c8e7540f99932496]
#
============================================================
--- classes/kernel.bbclass 3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b
+++ classes/kernel.bbclass aaee7c587861c7c66d492ee0c8e7540f99932496
@@ -52,7 +52,7 @@ KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${H
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 @@ do_sizecheck() {
# 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 @@ do_deploy() {
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
#
# mt diff -r1b38165e32339d1af5c9bb0a0200860939e559b3 -r4d50db658eb49ec921eb903f0d6f18de6e4b5dd8
#
#
#
# add_file "packages/strace/strace/mips-sigcontext.patch"
# content [ccd084f7dff69f0181af30ba7ac01b23ddfc3678]
#
# patch "packages/strace/strace_4.5.14.bb"
# from [024b28b25f1ee50ef24eb3f59862d67bc1c27c9b]
# to [4fb203edb2b91681028f737a0759796914297980]
#
# patch "site/mips-linux"
# from [6e62c6b2a9dbd94fcd404675ace77e8f072cca30]
# to [e42e1ecf3d371ff63b016d8802bb5c0ef6f1a688]
#
# patch "site/mipsel-linux"
# from [6e62c6b2a9dbd94fcd404675ace77e8f072cca30]
# to [10c30659ccc13c29d2d29be395d5c9409800880a]
#
============================================================
--- packages/strace/strace/mips-sigcontext.patch ccd084f7dff69f0181af30ba7ac01b23ddfc3678
+++ packages/strace/strace/mips-sigcontext.patch ccd084f7dff69f0181af30ba7ac01b23ddfc3678
@@ -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" },
============================================================
--- packages/strace/strace_4.5.14.bb 024b28b25f1ee50ef24eb3f59862d67bc1c27c9b
+++ packages/strace/strace_4.5.14.bb 4fb203edb2b91681028f737a0759796914297980
@@ -1,7 +1,7 @@ LICENSE = "GPL"
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,9 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/
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
# not use them when building for the AVR32.
@@ -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
============================================================
--- site/mips-linux 6e62c6b2a9dbd94fcd404675ace77e8f072cca30
+++ site/mips-linux e42e1ecf3d371ff63b016d8802bb5c0ef6f1a688
@@ -49,6 +49,13 @@ glib_cv_va_val_copy=${glib_cv_va_val_cop
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 @@ sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10
# 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}
============================================================
--- site/mipsel-linux 6e62c6b2a9dbd94fcd404675ace77e8f072cca30
+++ site/mipsel-linux 10c30659ccc13c29d2d29be395d5c9409800880a
@@ -49,6 +49,13 @@ glib_cv_va_val_copy=${glib_cv_va_val_cop
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 @@ sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10
# 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_func_posix_getpwnam_r=${ac_cv_func
# 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}
More information about the Openembedded-commits
mailing list