On 2013?06?18? 21:05, Kai Kang wrote: > Update strace to 4.8. > > * Update License file. > * Remove the backport patches which are already in version 4.8. > * Add file git-version-gen from git repo. Without this file configure > fails. > * Add libaio and acl to PACKAGECONFIG for target package. Make libaio as a > dependency by default which could be covered easily. > > Signed-off-by: Kai Kang > --- > ...ilding-when-glibc-has-a-stub-process_vm_r.patch | 54 - > .../strace-4.7/0014-x32-update-syscall-table.patch | 91 - > ...-x32-update-g-s-etsockopt-syscall-numbers.patch | 43 - > .../0024-x32-add-64bit-annotation-too.patch | 231 -- > .../0025-Add-e-trace-memory-option.patch | 2898 -------------------- > ...ew-errno-values-for-EPROBE_DEFER-and-EOPE.patch | 36 - > .../0027-Add-AArch64-support-to-strace.patch | 542 ---- > .../0028-Enhance-quotactl-decoding.patch | 391 --- > ...029-Filter-out-redundant-32-ioctl-entries.patch | 145 - > ...neric-ioctl-definitions-to-linux-ioctlent.patch | 571 ---- > ...-for-tracing-32-bit-ARM-EABI-binaries-on-.patch | 963 ------- > .../0032-Fix-kernel-release-string-parsing.patch | 38 - > .../strace/strace-4.8/git-version-gen | 225 ++ > meta/recipes-devtools/strace/strace_4.7.bb | 34 - > meta/recipes-devtools/strace/strace_4.8.bb | 32 + > 15 files changed, 257 insertions(+), 6037 deletions(-) > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0014-x32-update-syscall-table.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0018-x32-update-g-s-etsockopt-syscall-numbers.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0024-x32-add-64bit-annotation-too.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0025-Add-e-trace-memory-option.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0026-linux-add-new-errno-values-for-EPROBE_DEFER-and-EOPE.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0028-Enhance-quotactl-decoding.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0029-Filter-out-redundant-32-ioctl-entries.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0030-Move-asm-generic-ioctl-definitions-to-linux-ioctlent.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0031-Add-support-for-tracing-32-bit-ARM-EABI-binaries-on-.patch > delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch > create mode 100755 meta/recipes-devtools/strace/strace-4.8/git-version-gen > delete mode 100644 meta/recipes-devtools/strace/strace_4.7.bb > create mode 100644 meta/recipes-devtools/strace/strace_4.8.bb > > diff --git a/meta/recipes-devtools/strace/strace-4.7/0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch b/meta/recipes-devtools/strace/strace-4.7/0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch > deleted file mode 100644 > index 2fd80ec..0000000 > --- a/meta/recipes-devtools/strace/strace-4.7/0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch > +++ /dev/null > @@ -1,54 +0,0 @@ > -Upstream-Status: Backport > - > -From 24ee60b836ad33bb4ac694ca99d6c94a8cc5ff92 Mon Sep 17 00:00:00 2001 > -From: Mike Frysinger > -Date: Fri, 4 May 2012 19:37:29 -0400 > -Subject: [PATCH 03/31] util: fix building when glibc has a stub > - process_vm_readv > - > -If you have a newer glibc which provides process_vm_readv, but it is built > -against older kernel headers which lack __NR_process_vm_readv, the library > -will contain a stub implementation that just returns ENOSYS. Autoconf > -checks for this case explicitly and will declare it as unavailable. So we > -end up in a case where the headers provide the prototype, but autoconf has > -not defined HAVE_PROCESS_VM_READV, so we hit the same build failure again: > - > -util.c:738:16: error: static declaration of 'process_vm_readv' follows non-static declaration > -/usr/include/bits/uio.h:58:16: note: previous declaration of 'process_vm_readv' was here > - > -So rename our local function to something unique, and add a define so the > -callers all hit the right place. > - > -* util.c (strace_process_vm_readv): Rename from process_vm_readv. > -(process_vm_readv): Define to strace_process_vm_readv. > - > -Signed-off-by: Mike Frysinger > ---- > - util.c | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > ... snip ... > diff --git a/meta/recipes-devtools/strace/strace_4.7.bb b/meta/recipes-devtools/strace/strace_4.7.bb > deleted file mode 100644 > index e360e63..0000000 > --- a/meta/recipes-devtools/strace/strace_4.7.bb > +++ /dev/null > @@ -1,34 +0,0 @@ > -DESCRIPTION = "strace is a system call tracing tool." > -HOMEPAGE = "http://strace.sourceforge.net" > -SECTION = "console/utils" > -LICENSE = "BSD" > -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7" > -PR = "r4" > - > -SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ > - file://0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch \ > - file://0014-x32-update-syscall-table.patch \ > - file://0018-x32-update-g-s-etsockopt-syscall-numbers.patch \ > - file://0024-x32-add-64bit-annotation-too.patch \ > - file://0025-Add-e-trace-memory-option.patch \ > - file://0026-linux-add-new-errno-values-for-EPROBE_DEFER-and-EOPE.patch \ > - file://0027-Add-AArch64-support-to-strace.patch \ > - file://0028-Enhance-quotactl-decoding.patch \ > - file://0029-Filter-out-redundant-32-ioctl-entries.patch \ > - file://0030-Move-asm-generic-ioctl-definitions-to-linux-ioctlent.patch \ > - file://0031-Add-support-for-tracing-32-bit-ARM-EABI-binaries-on-.patch \ > - file://0032-Fix-kernel-release-string-parsing.patch \ > - " > - > -SRC_URI[md5sum] = "6054c3880a00c6703f83b57f15e04642" > -SRC_URI[sha256sum] = "c49cd98873c119c5f201356200a9b9687da1ceea83a05047e2ae0a7ac1e41195" > -inherit autotools > - > -export INCLUDES = "-I. -I./linux" > - > -do_install_append() { > - # We don't ship strace-graph here because it needs perl > - rm ${D}${bindir}/strace-graph > -} > - > -BBCLASSEXTEND = "native" > diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb > new file mode 100644 > index 0000000..92a7d14 > --- /dev/null > +++ b/meta/recipes-devtools/strace/strace_4.8.bb > @@ -0,0 +1,32 @@ > +DESCRIPTION = "strace is a system call tracing tool." > +HOMEPAGE = "http://strace.sourceforge.net" > +SECTION = "console/utils" > +LICENSE = "BSD" > +LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" > +PR = "r0" > + > +SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ > + file://git-version-gen" > + > +SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" > +SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8" > +inherit autotools > + > +PACKAGECONFIG_class-target ?= "libaio \ > + ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" Would this be better? PACKAGECONFIG_class-target ?= "libaio" PACKAGECONFIG_class-target += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" If so, I would update and send a new version. Thanks, Kai > + > +PACKAGECONFIG[libaio] = ",,libaio," > +PACKAGECONFIG[acl] = ",,acl," > + > +export INCLUDES = "-I. -I./linux" > + > +do_configure_prepend() { > + cp ${WORKDIR}/git-version-gen ${S} > +} > + > +do_install_append() { > + # We don't ship strace-graph here because it needs perl > + rm ${D}${bindir}/strace-graph > +} > + > +BBCLASSEXTEND = "native" -- Regards, Neil | Kai Kang