Update three packages
cover Update three packages
The following changes since commit 39ca8b429b6244e9649e7303cbb240adf007bf22:
bitbake: toastergui fix size rendering in dirinfo page (2014-09-29 14:11:59 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib chonglu/updatepkg
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/updatepkg
Chong Lu (3):
tcl: Upgrade to 8.6.2
strace: Upgrade to 4.9
byacc: Upgrade to 20140715
...-conflict-between-sys-ptrace.h-and-linux-.patch | 108 ---------------------
.../strace-fix-64-bit-process-detection.patch | 34 -------
.../Makefile-ptest.patch | 44 ++++++---
.../{strace-4.8 => strace-4.9}/git-version-gen | 0
.../strace/{strace-4.8 => strace-4.9}/run-ptest | 0
.../strace-add-configure-options.patch | 37 ++++---
.../strace/{strace_4.8.bb => strace_4.9.bb} | 8 +-
.../tcltk/{tcl_8.6.1.bb => tcl_8.6.2.bb} | 5 +-
.../byacc/{byacc_20140422.bb => byacc_20140715.bb} | 4 +-
9 files changed, 57 insertions(+), 183 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
delete mode 100644 meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/Makefile-ptest.patch (61%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/git-version-gen (100%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/run-ptest (100%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/strace-add-configure-options.patch (63%)
rename meta/recipes-devtools/strace/{strace_4.8.bb => strace_4.9.bb} (77%)
rename meta/recipes-devtools/tcltk/{tcl_8.6.1.bb => tcl_8.6.2.bb} (94%)
rename meta/recipes-extended/byacc/{byacc_20140422.bb => byacc_20140715.bb} (74%)Signature · 1 line
1.9.1
PATCH 1/3 tcl: Upgrade to 8.6.2
libgcc_s.so.1 is needed by running ptest, so add libgcc to RDEPENDS_${PN}-ptest.
---
meta/recipes-devtools/tcltk/{tcl_8.6.1.bb => tcl_8.6.2.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/tcltk/{tcl_8.6.1.bb => tcl_8.6.2.bb} (94%)meta/recipes-devtools/tcltk/tcl_8.6.2.bb renamed from meta/recipes-devtools/tcltk/tcl_8.6.1.bb +3 -2
@@ -24,8 +24,8 @@ SRC_URI = "${BASE_SRC_URI} \ file://alter-includedir.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e" -SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514" +SRC_URI[md5sum] = "8103eaf6d71acb716a64224492f09d5f" +SRC_URI[sha256sum] = "86f7ae5f581dd0904d04415637ab3aef5a50986c1b6d04c340e2b1b0258da9c4" SRC_URI_class-native = "${BASE_SRC_URI}"
@@ -81,6 +81,7 @@ FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" # isn't getting picked up by shlibs code RDEPENDS_${PN} += "tcl-lib" RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}-ptest += "libgcc" BBCLASSEXTEND = "native"
Signature · 1 line
1.9.1
PATCH 2/3 strace: Upgrade to 4.9
In reply to Chong LuRemove two backported patches:
0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch strace-fix-64-bit-process-detection.patch
Update two patches to fit new version:
Makefile-ptest.patch
strace-add-configure-options.patch
Add coreutils, grep and gawk to RDEPENDS_${PN}-ptest for making ptest pass.
---
...-conflict-between-sys-ptrace.h-and-linux-.patch | 108 ---------------------
.../strace-fix-64-bit-process-detection.patch | 34 -------
.../Makefile-ptest.patch | 44 ++++++---
.../{strace-4.8 => strace-4.9}/git-version-gen | 0
.../strace/{strace-4.8 => strace-4.9}/run-ptest | 0
.../strace-add-configure-options.patch | 37 ++++---
.../strace/{strace_4.8.bb => strace_4.9.bb} | 8 +-
7 files changed, 52 insertions(+), 179 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
delete mode 100644 meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/Makefile-ptest.patch (61%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/git-version-gen (100%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/run-ptest (100%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/strace-add-configure-options.patch (63%)
rename meta/recipes-devtools/strace/{strace_4.8.bb => strace_4.9.bb} (77%)meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch deleted +0 -108
@@ -1,108 +0,0 @@ -Upstream-Status: Backport - -From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001 -From: Ali Polatel <[email protected]> -Date: Tue, 24 Sep 2013 20:04:32 +0300 -Subject: [PATCH] Work around conflict between <sys/ptrace.h> and - <linux/ptrace.h> - -Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args -which collides with <linux/ptrace.h>. - -* configure.ac: Check for `struct ptrace_peeksiginfo_args' in -<sys/ptrace.h>. -* process.c: Work around potential conflict between <sys/ptrace.h> -and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args. -* signal.c: Likewise. -* syscall.c: Likewise. -* util.c: Likewise. - -Signed-off-by: Ali Polatel <[email protected]> ---- - configure.ac | 2 +- - process.c | 4 ++++ - signal.c | 4 ++++ - syscall.c | 4 ++++ - util.c | 4 ++++ - 5 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f19e4f2..aa4923a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr, - - AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>]) - --AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,, -+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,, - [#include <sys/ptrace.h>]) - - AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>]) -diff --git a/process.c b/process.c -index 1a2181b..59428a4 100644 ---- a/process.c -+++ b/process.c -@@ -63,7 +63,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/signal.c b/signal.c -index 7fb9abf..3411ddd 100644 ---- a/signal.c -+++ b/signal.c -@@ -51,7 +51,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/syscall.c b/syscall.c -index 83a95bd..3477dcd 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -48,7 +48,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/util.c b/util.c -index 0dab902..30a7f19 100644 ---- a/util.c -+++ b/util.c -@@ -55,7 +55,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif --- -1.8.2.1 -
meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch deleted +0 -34
@@ -1,34 +0,0 @@ -powerpc64: fix 64-bit process detection on embedded - -* syscall.c (get_scno) [POWERPC64]: Fix 64-bit process detection -on embedded powerpc. - -Upstream-Status: Backport - -Signed-off-by: James Yang <[email protected]> -Signed-off-by: Dmitry V. Levin <[email protected]> - -diff --git a/syscall.c.orig b/syscall.c -index 7efee0e..72d9453 100644 ---- a/syscall.c.orig -+++ b/syscall.c -@@ -1207,11 +1207,14 @@ get_scno(struct tcb *tcp) - /* Check for 64/32 bit mode. */ - if (upeek(tcp, sizeof(unsigned long)*PT_MSR, &val) < 0) - return -1; -- /* SF is bit 0 of MSR */ -- if (val < 0) -- currpers = 0; -- else -- currpers = 1; -+ -+ /* -+ * Check for 64/32 bit mode. -+ * Embedded implementations covered by Book E extension of PPC use -+ * bit 0 (CM) of 32-bit Machine state register (MSR). -+ * Other implementations use bit 0 (SF) of 64-bit MSR. -+ */ -+ currpers = (val & 0x8000000080000000) ? 0 : 1; - update_personality(tcp, currpers); - # endif - #elif defined(AVR32)
meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch renamed from meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch +28 -16
55 lines not on this page · raw message
meta/recipes-devtools/strace/strace-4.9/git-version-gen renamed from meta/recipes-devtools/strace/strace-4.8/git-version-gen +0 -0
meta/recipes-devtools/strace/strace-4.9/run-ptest renamed from meta/recipes-devtools/strace/strace-4.8/run-ptest +0 -0
meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch renamed from meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch +21 -16
@@ -3,18 +3,24 @@ Add options "aio" and "acl" to enable/disable libaio and acl support. Upstream-Status: Pending Signed-off-by: Kai Kang <[email protected]> +Signed-off-by: Chong Lu <[email protected]> +--- + configure.ac | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) ---- strace-4.8/configure.ac.orig 2013-06-21 15:37:52.145892182 +0800 -+++ strace-4.8/configure.ac 2013-06-21 15:45:49.029909004 +0800 -@@ -219,7 +219,6 @@ AC_CHECK_HEADERS(m4_normalize([ - netinet/sctp.h +diff --git a/configure.ac b/configure.ac +index 054f85b..8ed49f1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([ poll.h + scsi/sg.h stropts.h - sys/acl.h sys/asynch.h sys/conf.h sys/epoll.h -@@ -231,6 +230,19 @@ AC_CHECK_HEADERS(m4_normalize([ +@@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([ sys/uio.h sys/vfs.h ]))
@@ -22,30 +28,25 @@ Signed-off-by: Kai Kang <[email protected]> +AC_ARG_ENABLE([acl], + [AS_HELP_STRING([--enable-acl], [turn on acl support])], + [case $enableval in -+ yes) ++ yes) + AC_CHECK_HEADERS([sys/acl.h]) + ;; + no) ;; + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; + esac] -+ +) + AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], [], [], [#include <stddef.h> #include <sys/socket.h> -@@ -301,10 +313,19 @@ AC_CHECK_SIZEOF([long]) - AC_CHECK_SIZEOF([long long]) - AC_CHECK_SIZEOF([rlim_t],,[#include <sys/resource.h>]) +@@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then + [Define to 1 if the system provides __builtin_popcount function]) + fi --AC_CHECK_HEADERS([libaio.h], [ -- AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) -- AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) --]) +AC_ARG_ENABLE([aio], + [AS_HELP_STRING([--enable-aio], [turn on libaio support])], + [case $enableval in -+ yes) ++ yes) + AC_CHECK_HEADERS([libaio.h], [ + AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) + AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>])
@@ -55,6 +56,10 @@ Signed-off-by: Kai Kang <[email protected]> + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; + esac] +) - ++ AC_PATH_PROG([PERL], [perl]) + dnl stack trace with libunwind +-- +1.9.1 +
meta/recipes-devtools/strace/strace_4.9.bb renamed from meta/recipes-devtools/strace/strace_4.8.bb +3 -5
@@ -8,16 +8,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://git-version-gen \ file://strace-add-configure-options.patch \ file://Makefile-ptest.patch \ - file://strace-fix-64-bit-process-detection.patch \ file://run-ptest \ - file://0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch \ " -SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" -SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8" +SRC_URI[md5sum] = "885eafadb10f6c60464a266d3929a2a4" +SRC_URI[sha256sum] = "095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65" inherit autotools ptest -RDEPENDS_${PN}-ptest += "make" +RDEPENDS_${PN}-ptest += "make coreutils grep gawk" PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
Signature · 1 line
1.9.1
Re: [PATCH 2/3] strace: Upgrade to 4.9
Quoted 11 lines · Chong Lu
Remove two backported patches:
0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch strace-fix-64-bit-process-detection.patchUpdate two patches to fit new version:
Makefile-ptest.patch
strace-add-configure-options.patchAdd coreutils, grep and gawk to RDEPENDS_${PN}-ptest for making ptest pass.
This is failing on the minnow autobuilder:
| /home/pokybuild/yocto-autobuilder/yocto-worker/minnow/build/build/tmp/work/core2-32-poky-linux/strace/4.9-r0/strace-4.9/unwind.c:29:30:
fatal error: libunwind-ptrace.h: No such file or directory
Maybe there's an optional dependency on unwind which was being rebuilt as strace was being built?
Ross
Re: [PATCH 2/3] strace: Upgrade to 4.9
Quoted 15 lines · Ross
On 30 September 2014 10:33, Chong Lu <[email protected] <mailto:[email protected]>> wrote:
Remove two backported patches:
0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch strace-fix-64-bit-process-detection.patchUpdate two patches to fit new version:
Makefile-ptest.patch
strace-add-configure-options.patchAdd coreutils, grep and gawk to RDEPENDS_${PN}-ptest for making ptest pass.
Quoted 7 lines
This is failing on the minnow autobuilder:
|
/home/pokybuild/yocto-autobuilder/yocto-worker/minnow/build/build/tmp/work/core2-32-poky-linux/strace/4.9-r0/strace-4.9/unwind.c:29:30: fatal error:libunwind-ptrace.h: No such file or directoryMaybe there's an optional dependency on unwind which was being rebuilt as strace was being built?
Ross
OK, I will fix it.
Best Regards
Chong
PATCH 3/3 byacc: Upgrade to 20140715
In reply to Chong Lu---
meta/recipes-extended/byacc/{byacc_20140422.bb => byacc_20140715.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/byacc/{byacc_20140422.bb => byacc_20140715.bb} (74%)meta/recipes-extended/byacc/byacc_20140715.bb renamed from meta/recipes-extended/byacc/byacc_20140422.bb +2 -2
@@ -7,5 +7,5 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=f186cf0d59bac042b75830396ec389a3" require byacc.inc -SRC_URI[md5sum] = "e7c13c5e207dc05eab9145cc9972397b" -SRC_URI[sha256sum] = "2f104c7e200dd86844d5f3521e12cb55fc48a9c3da3480a65fde2ca8c053bdcc" +SRC_URI[md5sum] = "814d2ebedd738a526e5aeb00b1ad38af" +SRC_URI[sha256sum] = "ecd0d87bf7e62b5536fb096ada96ecd564c6411866bbe6644e30ee7963e97fe5"
Signature · 1 line
1.9.1
ping
Quoted 34 lines · Chong Lu
The following changes since commit
39ca8b429b6244e9649e7303cbb240adf007bf22:bitbake: toastergui fix size rendering in dirinfo page (2014-09-29 14:11:59 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contribchonglu/updatepkg
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/updatepkgChong Lu (3):
tcl: Upgrade to 8.6.2 strace: Upgrade to 4.9 byacc: Upgrade to 20140715...-conflict-between-sys-ptrace.h-and-linux-.patch | 108 --------------------- .../strace-fix-64-bit-process-detection.patch | 34 ------- .../Makefile-ptest.patch | 44 ++++++--- .../{strace-4.8 => strace-4.9}/git-version-gen | 0 .../strace/{strace-4.8 => strace-4.9}/run-ptest | 0 .../strace-add-configure-options.patch | 37 ++++--- .../strace/{strace_4.8.bb => strace_4.9.bb} | 8 +- .../tcltk/{tcl_8.6.1.bb => tcl_8.6.2.bb} | 5 +- .../byacc/{byacc_20140422.bb => byacc_20140715.bb} | 4 +- 9 files changed, 57 insertions(+), 183 deletions(-)delete mode 100644
meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patchdelete mode 100644meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patchrename meta/recipes-devtools/strace/{strace-4.8 =>strace-4.9}/Makefile-ptest.patch(61%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/git-version-gen (100%)
rename meta/recipes-devtools/strace/{strace-4.8 => strace-4.9}/run-ptest (100%)
rename meta/recipes-devtools/strace/{strace-4.8 =>strace-4.9}/strace-add-configure-options.patch(63%) rename meta/recipes-devtools/strace/{strace_4.8.bb => strace_4.9.bb} (77%)
rename meta/recipes-devtools/tcltk/{tcl_8.6.1.bb => tcl_8.6.2.bb} (94%)
rename meta/recipes-extended/byacc/{byacc_20140422.bb => byacc_20140715.bb} (74%)
Quoted 19 lines · Chong Lu
ping
Quoted 16 lines · Chong Lu
The following changes since commit
39ca8b429b6244e9649e7303cbb240adf007bf22:bitbake: toastergui fix size rendering in dirinfo page (2014-09-29
14:11:59 +0100)are available in the git repository at:
git://git.pokylinux.org/poky-contribchonglu/updatepkg
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/updatepkgChong Lu (3):
tcl: Upgrade to 8.6.2 strace: Upgrade to 4.9 byacc: Upgrade to 20140715
As you should be aware, we're in feature freeze for 1.7. As such these are waiting for the freeze to be released and 1.7 branching off from master before they are merged.
Ross
Quoted 19 lines · Ross
Quoted 18 lines · Chong Lu
ping
Quoted 15 lines · Chong Lu
The following changes since commit
39ca8b429b6244e9649e7303cbb240adf007bf22:bitbake: toastergui fix size rendering in dirinfo page (2014-09-29
14:11:59 +0100)are available in the git repository at:
git://git.pokylinux.org/poky-contribchonglu/updatepkg
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/updatepkgChong Lu (3):
tcl: Upgrade to 8.6.2 strace: Upgrade to 4.9 byacc: Upgrade to 20140715
Quoted 6 lines
As you should be aware, we're in feature freeze for 1.7. As such these are waiting for the freeze to be released and 1.7 branching off from master before they are merged.
Ross
Got it, thanks.
//Chong