Skip to contentSkip to conversation

Update strace and fix autogen-native build failure

PATCH In review Kai Kang 1 participant 4 messages Jun 18, 2013 – Jun 19, 2013

lore
Share & tools
lore

Kai Kang

author
#0 lore raw

cover Update strace and fix autogen-native build failure

The following changes since commit 1dd643b142c69ac9035e29bff11d02201638dc65:

licences: Add SGI license (2013-06-17 16:45:37 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/update-strace
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/update-strace

Kai Kang (2):
autogen-native: fix build failure on overloaded hosts
strace: update to 4.8

 .../autogen/autogen-native_5.17.4.bb               |    3 +-
 .../autogen/files/increase-timeout-limit.patch     |   33 +
 ...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 +
 17 files changed, 292 insertions(+), 6038 deletions(-)
 create mode 100644 meta/recipes-devtools/autogen/files/increase-timeout-limit.patch
 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
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/2 autogen-native: fix build failure on overloaded hosts

On some overloaded hosts, shell commands of autogen may can not finish in 5 secs. This has caused many build failures, so increase the timeout limit to fix this.

---
 .../autogen/autogen-native_5.17.4.bb               |    3 +-
 .../autogen/files/increase-timeout-limit.patch     |   33 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/autogen/files/increase-timeout-limit.patch
meta/recipes-devtools/autogen/autogen-native_5.17.4.bb +2 -1
index e5234c2..230c3a7 100644
@@ -9,7 +9,8 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 
 
 SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
-           file://guile.patch"
+           file://guile.patch \
+           file://increase-timeout-limit.patch"
 
 SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90"
 SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed"
meta/recipes-devtools/autogen/files/increase-timeout-limit.patch new file +33 -0
new file mode 100644
index 0000000..3d4c1d6
@@ -0,0 +1,33 @@
+Subject: [PATCH] autogen: increase timeout limit for shell commands
+
+On some overloaded hosts, shell commands of autogen may can not
+finish in 5 secs. This has caused many build failures, so increase
+the timeout limit to fix this.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Xin Ouyang <[email protected]>
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0af7c18..5544f59 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -175,9 +175,9 @@ config_end_time=`date +%s 2>/dev/null`
+ time_delta=`expr ${config_end_time} - ${config_start_time} 2>/dev/null`
+ 
+ if test -z "${time_delta}"
+-then time_delta=10
+-elif test ${time_delta} -lt 5
+-then time_delta=5 ; fi
++then time_delta=60
++elif test ${time_delta} -lt 30
++then time_delta=30 ; fi
+ 
+ AG_TIMEOUT=${time_delta}
+ ]
+-- 
+1.7.9.5
+
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/2 strace: update to 4.8

In reply to Kai Kang

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.

---
 ...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
meta/recipes-devtools/strace/strace-4.7/0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch deleted +0 -54
deleted file mode 100644
index 2fd80ec..0000000
@@ -1,54 +0,0 @@
-Upstream-Status: Backport
-
-From 24ee60b836ad33bb4ac694ca99d6c94a8cc5ff92 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-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 <[email protected]>
----
- util.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/util.c b/util.c
-index d347bd8..f27acdf 100644
---- a/util.c
-+++ b/util.c
-@@ -735,7 +735,8 @@ static bool process_vm_readv_not_supported = 0;
- 
- #if defined(__NR_process_vm_readv)
- static bool process_vm_readv_not_supported = 0;
--static ssize_t process_vm_readv(pid_t pid,
-+/* Have to avoid duplicating with the C library headers. */
-+static ssize_t strace_process_vm_readv(pid_t pid,
- 		 const struct iovec *lvec,
- 		 unsigned long liovcnt,
- 		 const struct iovec *rvec,
-@@ -744,6 +745,7 @@ static ssize_t process_vm_readv(pid_t pid,
- {
- 	return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags);
- }
-+#define process_vm_readv strace_process_vm_readv
- #else
- static bool process_vm_readv_not_supported = 1;
- # define process_vm_readv(...) (errno = ENOSYS, -1)
--- 
-1.8.0
-
meta/recipes-devtools/strace/strace-4.7/0014-x32-update-syscall-table.patch deleted +0 -91

91 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0018-x32-update-g-s-etsockopt-syscall-numbers.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0024-x32-add-64bit-annotation-too.patch deleted +0 -231

231 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0025-Add-e-trace-memory-option.patch deleted +0 -2898

2,581 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0026-linux-add-new-errno-values-for-EPROBE_DEFER-and-EOPE.patch deleted +0 -36
deleted file mode 100644
index 1f84d46..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch deleted +0 -542

542 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0028-Enhance-quotactl-decoding.patch deleted +0 -391

391 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0029-Filter-out-redundant-32-ioctl-entries.patch deleted +0 -145

145 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0030-Move-asm-generic-ioctl-definitions-to-linux-ioctlent.patch deleted +0 -571

571 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0031-Add-support-for-tracing-32-bit-ARM-EABI-binaries-on-.patch deleted +0 -963

963 lines not on this page · raw message

meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch deleted +0 -38
deleted file mode 100644
index cef4222..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-devtools/strace/strace-4.8/git-version-gen new file +225 -0

225 lines not on this page · raw message

meta/recipes-devtools/strace/strace_4.7.bb deleted +0 -34
deleted file mode 100644
index e360e63..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-devtools/strace/strace_4.8.bb new file +32 -0
new file mode 100644
index 0000000..92a7d14

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.5.4

Part of the diff is not shown here. View the raw message.

author
#3 lore raw

Re: [PATCH 2/2] strace: update to 4.8

Quoted 79 lines · Kai Kang

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.

---
  ...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

meta/recipes-devtools/strace/strace-4.7/0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch deleted +0 -29
deleted file mode 100644
index 2fd80ec..0000000
@@ -1,54 +0,0 @@
-Upstream-Status: Backport
-
-From 24ee60b836ad33bb4ac694ca99d6c94a8cc5ff92 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-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 <[email protected]>
----
- util.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-

...
snip
...

Quoted 52 lines
meta/recipes-devtools/strace/strace_4.7.bb deleted +0 -34
deleted file mode 100644
index e360e63..0000000
@@ -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"
meta/recipes-devtools/strace/strace_4.8.bb new file +6 -0
new file mode 100644
index 0000000..92a7d14
@@ -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"

meta/recipes-devtools/strace/strace_4.8.bb line 16

Quoted 10 lines
meta/recipes-devtools/strace/strace_4.8.bb new file +10 -0
+
+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

Quoted 16 lines
meta/recipes-devtools/strace/strace_4.8.bb new file +16 -0
+
+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"
Signature · 2 lines
Regards,
Neil | Kai Kang