* [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11
@ 2016-01-12 7:18 Andre McCurdy
2016-01-12 7:18 ` [PATCH 1/5] strace: drop unnecessary dependency on acl Andre McCurdy
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 7:18 UTC (permalink / raw)
To: openembedded-core
Andre McCurdy (5):
strace: drop unnecessary dependency on acl
strace: fix --disable-aio configure option
strace: remove need for git-version-gen script
strace: fix ARCH definition in tests/Makefile
strace: update 4.10 -> 4.11
.../0001-Add-linux-aarch64-arch_regs.h.patch | 25 ---
.../Include-linux-ioctl.h-for-_IOC_-macros.patch | 69 -------
.../strace/Include-sys-stat.h-for-S_I-macros.patch | 52 -----
.../strace/strace/Makefile-ptest.patch | 18 +-
.../strace/strace/disable-git-version-gen.patch | 20 ++
.../recipes-devtools/strace/strace/git-version-gen | 225 ---------------------
.../strace/strace-add-configure-options.patch | 57 ------
.../strace/{strace_4.10.bb => strace_4.11.bb} | 22 +-
8 files changed, 35 insertions(+), 453 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch
delete mode 100644 meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
delete mode 100644 meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch
create mode 100644 meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
delete mode 100755 meta/recipes-devtools/strace/strace/git-version-gen
delete mode 100644 meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
rename meta/recipes-devtools/strace/{strace_4.10.bb => strace_4.11.bb} (53%)
--
1.9.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/5] strace: drop unnecessary dependency on acl
2016-01-12 7:18 [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11 Andre McCurdy
@ 2016-01-12 7:18 ` Andre McCurdy
2016-01-12 7:18 ` [PATCH 2/5] strace: fix --disable-aio configure option Andre McCurdy
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 7:18 UTC (permalink / raw)
To: openembedded-core
The dependency on acl was removed from strace prior to the v4.10
release, so it's no longer necessary to add a configure option to
allow acl to be disabled.
http://sourceforge.net/p/strace/code/ci/681452b0f854833d4bd443fcd9bb0bab2b46339f
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../strace/strace-add-configure-options.patch | 24 ++--------------------
meta/recipes-devtools/strace/strace_4.10.bb | 3 +--
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
index e48e4b3..a3f8ec4 100644
--- a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
+++ b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
@@ -1,4 +1,4 @@
-Add options "aio" and "acl" to enable/disable libaio and acl support.
+Add option "aio" to enable/disable libaio support.
Upstream-Status: Pending
@@ -12,26 +12,7 @@ diff --git a/configure.ac b/configure.ac
index e73958c..9099370 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -270,6 +270,18 @@ AC_CHECK_HEADERS(m4_normalize([
- sys/vfs.h
- sys/xattr.h
- ]))
-+
-+AC_ARG_ENABLE([acl],
-+ [AS_HELP_STRING([--enable-acl], [turn on acl support])],
-+ [case $enableval in
-+ 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>
-@@ -745,6 +757,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then
+@@ -745,6 +745,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes;
fi
AC_SUBST(dl_LIBS)
@@ -54,4 +35,3 @@ index e73958c..9099370 100644
dnl stack trace with libunwind
--
1.9.1
-
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.10.bb
index 20b7e3d..fe250b7 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -21,12 +21,11 @@ inherit autotools ptest bluetooth
RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
PACKAGECONFIG_class-target ??= "\
- libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
+ libaio \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
"
PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
-PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/5] strace: fix --disable-aio configure option
2016-01-12 7:18 [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11 Andre McCurdy
2016-01-12 7:18 ` [PATCH 1/5] strace: drop unnecessary dependency on acl Andre McCurdy
@ 2016-01-12 7:18 ` Andre McCurdy
2016-01-12 7:18 ` [PATCH 3/5] strace: remove need for git-version-gen script Andre McCurdy
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 7:18 UTC (permalink / raw)
To: openembedded-core
Remove the original unconditional check for libaio.h,
since it's included in the newly added conditional check.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../strace/strace/strace-add-configure-options.patch | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
index a3f8ec4..84b9f9c 100644
--- a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
+++ b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
@@ -12,7 +12,19 @@ diff --git a/configure.ac b/configure.ac
index e73958c..9099370 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -745,6 +745,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes;
+@@ -303,11 +303,6 @@ AC_CHECK_MEMBERS([struct sysinfo.totalhi
+
+ AC_CHECK_TYPES([struct flock64],,, [#include <fcntl.h>])
+
+-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_CHECK_HEADERS([linux/input.h], [
+ AC_CHECK_MEMBERS([struct input_absinfo.resolution],,, [#include <linux/input.h>])
+ ])
+@@ -745,6 +740,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes;
fi
AC_SUBST(dl_LIBS)
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] strace: remove need for git-version-gen script
2016-01-12 7:18 [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11 Andre McCurdy
2016-01-12 7:18 ` [PATCH 1/5] strace: drop unnecessary dependency on acl Andre McCurdy
2016-01-12 7:18 ` [PATCH 2/5] strace: fix --disable-aio configure option Andre McCurdy
@ 2016-01-12 7:18 ` Andre McCurdy
2016-01-12 7:18 ` [PATCH 4/5] strace: fix ARCH definition in tests/Makefile Andre McCurdy
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 7:18 UTC (permalink / raw)
To: openembedded-core
The git-version-gen isn't really needed in order to determine the
version of tarball releases, so avoid the need to provide our own
copy.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../strace/strace/disable-git-version-gen.patch | 20 ++
.../recipes-devtools/strace/strace/git-version-gen | 225 ---------------------
meta/recipes-devtools/strace/strace_4.10.bb | 6 +-
3 files changed, 21 insertions(+), 230 deletions(-)
create mode 100644 meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
delete mode 100755 meta/recipes-devtools/strace/strace/git-version-gen
diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
new file mode 100644
index 0000000..7bc1436
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
@@ -0,0 +1,20 @@
+The git-version-gen script is not included in tarball releases,
+so we need to avoid attempts to call it when running autoreconf.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
+Index: strace-4.10/configure.ac
+===================================================================
+--- strace-4.10.orig/configure.ac
++++ strace-4.10/configure.ac
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to create configure. Use autoreconf.
+ AC_PREREQ(2.57)
+ AC_INIT([strace],
+- m4_esyscmd([./git-version-gen .tarball-version]),
++ m4_esyscmd_s([cat .tarball-version]),
+ [strace-devel@lists.sourceforge.net])
+ AC_CONFIG_SRCDIR([strace.c])
+ AC_CONFIG_AUX_DIR([.])
diff --git a/meta/recipes-devtools/strace/strace/git-version-gen b/meta/recipes-devtools/strace/strace/git-version-gen
deleted file mode 100755
index 8fee74e..0000000
--- a/meta/recipes-devtools/strace/strace/git-version-gen
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/sh
-# Print a version string.
-scriptversion=2012-12-31.23; # UTC
-
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
-# It may be run two ways:
-# - from a git repository in which the "git describe" command below
-# produces useful output (thus requiring at least one signed tag)
-# - from a non-git-repo directory containing a .tarball-version file, which
-# presumes this script is invoked like "./git-version-gen .tarball-version".
-
-# In order to use intra-version strings in your project, you will need two
-# separate generated version string files:
-#
-# .tarball-version - present only in a distribution tarball, and not in
-# a checked-out repository. Created with contents that were learned at
-# the last time autoconf was run, and used by git-version-gen. Must not
-# be present in either $(srcdir) or $(builddir) for git-version-gen to
-# give accurate answers during normal development with a checked out tree,
-# but must be present in a tarball when there is no version control system.
-# Therefore, it cannot be used in any dependencies. GNUmakefile has
-# hooks to force a reconfigure at distribution time to get the value
-# correct, without penalizing normal development with extra reconfigures.
-#
-# .version - present in a checked-out repository and in a distribution
-# tarball. Usable in dependencies, particularly for files that don't
-# want to depend on config.h but do want to track version changes.
-# Delete this file prior to any autoconf run where you want to rebuild
-# files to pick up a version string change; and leave it stale to
-# minimize rebuild time after unrelated changes to configure sources.
-#
-# As with any generated file in a VC'd directory, you should add
-# /.version to .gitignore, so that you don't accidentally commit it.
-# .tarball-version is never generated in a VC'd directory, so needn't
-# be listed there.
-#
-# Use the following line in your configure.ac, so that $(VERSION) will
-# automatically be up-to-date each time configure is run (and note that
-# since configure.ac no longer includes a version string, Makefile rules
-# should not depend on configure.ac for version updates).
-#
-# AC_INIT([GNU project],
-# m4_esyscmd([build-aux/git-version-gen .tarball-version]),
-# [bug-project@example])
-#
-# Then use the following lines in your Makefile.am, so that .version
-# will be present for dependencies, and so that .version and
-# .tarball-version will exist in distribution tarballs.
-#
-# EXTRA_DIST = $(top_srcdir)/.version
-# BUILT_SOURCES = $(top_srcdir)/.version
-# $(top_srcdir)/.version:
-# echo $(VERSION) > $@-t && mv $@-t $@
-# dist-hook:
-# echo $(VERSION) > $(distdir)/.tarball-version
-
-
-me=$0
-
-version="git-version-gen $scriptversion
-
-Copyright 2011 Free Software Foundation, Inc.
-There is NO warranty. You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING."
-
-usage="\
-Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT]
-Print a version string.
-
-Options:
-
- --prefix prefix of git tags (default 'v')
- --fallback fallback version to use if \"git --version\" fails
-
- --help display this help and exit
- --version output version information and exit
-
-Running without arguments will suffice in most cases."
-
-prefix=v
-fallback=
-
-while test $# -gt 0; do
- case $1 in
- --help) echo "$usage"; exit 0;;
- --version) echo "$version"; exit 0;;
- --prefix) shift; prefix="$1";;
- --fallback) shift; fallback="$1";;
- -*)
- echo "$0: Unknown option '$1'." >&2
- echo "$0: Try '--help' for more information." >&2
- exit 1;;
- *)
- if test "x$tarball_version_file" = x; then
- tarball_version_file="$1"
- elif test "x$tag_sed_script" = x; then
- tag_sed_script="$1"
- else
- echo "$0: extra non-option argument '$1'." >&2
- exit 1
- fi;;
- esac
- shift
-done
-
-if test "x$tarball_version_file" = x; then
- echo "$usage"
- exit 1
-fi
-
-tag_sed_script="${tag_sed_script:-s/x/x/}"
-
-nl='
-'
-
-# Avoid meddling by environment variable of the same name.
-v=
-v_from_git=
-
-# First see if there is a tarball-only version file.
-# then try "git describe", then default.
-if test -f $tarball_version_file
-then
- v=`cat $tarball_version_file` || v=
- case $v in
- *$nl*) v= ;; # reject multi-line output
- [0-9]*) ;;
- *) v= ;;
- esac
- test "x$v" = x \
- && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
-fi
-
-if test "x$v" != x
-then
- : # use $v
-# Otherwise, if there is at least one git commit involving the working
-# directory, and "git describe" output looks sensible, use that to
-# derive a version string.
-elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
- && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
- || git describe --abbrev=4 HEAD 2>/dev/null` \
- && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
- && case $v in
- $prefix[0-9]*) ;;
- *) (exit 1) ;;
- esac
-then
- # Is this a new git that lists number of commits since the last
- # tag or the previous older version that did not?
- # Newer: v6.10-77-g0f8faeb
- # Older: v6.10-g0f8faeb
- case $v in
- *-*-*) : git describe is okay three part flavor ;;
- *-*)
- : git describe is older two part flavor
- # Recreate the number of commits and rewrite such that the
- # result is the same as if we were using the newer version
- # of git describe.
- vtag=`echo "$v" | sed 's/-.*//'`
- commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \
- || { commit_list=failed;
- echo "$0: WARNING: git rev-list failed" 1>&2; }
- numcommits=`echo "$commit_list" | wc -l`
- v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
- test "$commit_list" = failed && v=UNKNOWN
- ;;
- esac
-
- # Change the first '-' to a '.', so version-comparing tools work properly.
- # Remove the "g" in git describe's output string, to save a byte.
- v=`echo "$v" | sed 's/-/.0./;s/\(.*\)-g/\1-/'`;
- v_from_git=1
-elif test "x$fallback" = x || git --version >/dev/null 2>&1; then
- v=UNKNOWN
-else
- v=$fallback
-fi
-
-v=`echo "$v" |sed "s/^$prefix//"`
-
-# Test whether to append the "-dirty" suffix only if the version
-# string we're using came from git. I.e., skip the test if it's "UNKNOWN"
-# or if it came from .tarball-version.
-if test "x$v_from_git" != x; then
- # Don't declare a version "dirty" merely because a time stamp has changed.
- git update-index --refresh > /dev/null 2>&1
-
- dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty=
- case "$dirty" in
- '') ;;
- *) # Append the suffix only if there isn't one already.
- case $v in
- *-dirty) ;;
- *) v="$v-dirty" ;;
- esac ;;
- esac
-fi
-
-# Omit the trailing newline, so that m4_esyscmd can use the result directly.
-echo "$v" | tr -d "$nl"
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.10.bb
index fe250b7..0b2316b 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7"
SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
file://0001-Add-linux-aarch64-arch_regs.h.patch \
- file://git-version-gen \
+ file://disable-git-version-gen.patch \
file://strace-add-configure-options.patch \
file://Makefile-ptest.patch \
file://run-ptest \
@@ -31,10 +31,6 @@ PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_blue
TESTDIR = "tests"
-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
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/5] strace: fix ARCH definition in tests/Makefile
2016-01-12 7:18 [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11 Andre McCurdy
` (2 preceding siblings ...)
2016-01-12 7:18 ` [PATCH 3/5] strace: remove need for git-version-gen script Andre McCurdy
@ 2016-01-12 7:18 ` Andre McCurdy
2016-01-12 7:18 ` [PATCH 5/5] strace: update 4.10 -> 4.11 Andre McCurdy
2016-01-12 21:32 ` [PATCH 0/5] strace: misc fixes + " Richard Purdie
5 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 7:18 UTC (permalink / raw)
To: openembedded-core
TARGET_ARCH doesn't map to strace's ARCH variable, so we can't assign
one from the other. Forcing the incorrect value via the make command
line doesn't cause any problems with strace v4.10, but it will do for
strace v4.11.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../define-OS-ARCH-in-tests-Makefile-am.patch | 26 ++++++++++++++++++++++
meta/recipes-devtools/strace/strace_4.10.bb | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch
diff --git a/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch b/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch
new file mode 100644
index 0000000..4b1bb26
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch
@@ -0,0 +1,26 @@
+Ensure that OS and ARCH are defined in tests/Makefile.am
+
+For strace v4.10 this is a purely cosmetic fix, since the include
+paths derived from $(OS)/${ARCH) are never used. These variables are
+correctly defined by default in strace v4.11.
+
+Partial backport of upstream commit:
+
+ http://sourceforge.net/p/strace/code/ci/25c804ce42261b24b19d35c637bf2745c237ee07
+
+Upstream-Status: Backport
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
+Index: strace-4.10/tests/Makefile.am
+===================================================================
+--- strace-4.10.orig/tests/Makefile.am
++++ strace-4.10/tests/Makefile.am
+@@ -1,5 +1,7 @@
+ # Automake input for strace tests.
+
++OS = linux
++ARCH = @arch@
+ AM_CFLAGS = $(WARN_CFLAGS)
+ AM_CPPFLAGS = -I$(top_builddir)/$(OS)/$(ARCH) \
+ -I$(top_srcdir)/$(OS)/$(ARCH) \
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.10.bb
index 0b2316b..1b64743 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -12,6 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
file://run-ptest \
file://Include-sys-stat.h-for-S_I-macros.patch \
file://Include-linux-ioctl.h-for-_IOC_-macros.patch \
+ file://define-OS-ARCH-in-tests-Makefile-am.patch \
"
SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912"
@@ -37,7 +38,7 @@ do_install_append() {
}
do_compile_ptest() {
- oe_runmake -C ${TESTDIR} buildtest-TESTS OS=linux ARCH="${TARGET_ARCH}"
+ oe_runmake -C ${TESTDIR} buildtest-TESTS
}
do_install_ptest() {
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] strace: update 4.10 -> 4.11
2016-01-12 7:18 [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11 Andre McCurdy
` (3 preceding siblings ...)
2016-01-12 7:18 ` [PATCH 4/5] strace: fix ARCH definition in tests/Makefile Andre McCurdy
@ 2016-01-12 7:18 ` Andre McCurdy
2016-01-12 21:32 ` [PATCH 0/5] strace: misc fixes + " Richard Purdie
5 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 7:18 UTC (permalink / raw)
To: openembedded-core
Noteworthy changes in release 4.11 (2015-12-21)
===============================================
* Changes in behavior
* Some syscalls have different names depending on architecture and
personality. In these cases, syscall filtering and printing now
consistently uses the names that match corresponding __NR_* kernel
macros of the tracee's architecture and personality.
* Added strace prefix to all diagnostic messages.
* Improvements
* Enhanced and extended test suite.
* Implemented reliable tracing of processes whose personality differs
from the personality of strace, fixed decoding of 32-bit personality
syscalls on 64-bit architectures.
* When some data referenced by syscall arguments is irrelevant or cannot
be read from tracee's memory, strace now prints its address consistently.
* When a syscall is restarted using restart_syscall mechanism, strace now
shows the syscall name on architectures that expose this information.
* Print values returned by epoll_create1, eventfd, eventfd2, fanotify_init,
inotify_init1, perf_event_open, pipe, pipe2, signalfd, signalfd4, socket,
socketpair, timerfd, and timerfd_create syscalls, as well as F_DUPFD and
F_DUPFD_CLOEXEC fcntl commands, as file descriptors.
* Optimized decoding of indirect socket syscalls.
* Implemented decoding of nanoseconds along with seconds in stat family
syscalls (addresses Fedora bug #1251176).
* Implemented decoding of struct statfs.f_flags in statfs syscall.
* Implemented decoding of siginfo_t.si_syscall and siginfo_t.si_arch
in SIGSYS signal.
* Implemented decoding of indirect syscall on mips o32.
* Implemented decoding of IPPROTO_IP control messages.
* Implemented decoding of setsockopt syscall multicast arguments.
* Enhanced decoding of struct sigevent.
* Enhanced decoding of block, loop, mtd, ptp, rtc, SG_IO, socket, tty,
and v4l2 ioctl syscall arguments.
* Enhanced decoding of epoll_create, fcntl, fcntl64, futex, getdents,
getdents64, getsockopt, io_*, mount, msgctl, prctl, quotactl, recvfrom,
sendfile, setsockopt, and shmctl syscalls.
* Implemented decoding of bpf, execveat, ioperm, iopl, kcmp, kexec_file_load,
lookup_dcookie, membarrier, memfd_create, mlock2, name_to_handle_at,
open_by_handle_at, sched_getattr, sched_setattr, and userfaultfd syscalls.
* Updated lists of AF_*, EPOLL_*, FALLOC_FL_*, F_*, INPUT_PROP_*, IPPROTO_*,
IPV6_*, IP_*, KEY_*, LOCK_*, MNT_*, MS_*, PACKET_*, PERF_FLAG_*, PF_*,
PR_*, PTRACE_O_*, RENAME_*, SCTP_*, SECBIT_*, SO_*, TCP_*, and siginfo_t
constants.
* Added Nios II architecture support.
* Added new syscall entries to match Linux 4.4.
* Bug fixes
* Fixed potential short read of strings from tracee's memory.
* Fixed -qq option in conjunction with -o option.
* Fixed filtering of <unavailable> syscalls.
* Fixed decoding of ioctl syscall command on aarch64 and 32-bit architectures
with 64-bit aligned structures.
* Fixed decoding of eventfd2, epoll_create1, signalfd4, and sync_file_range2
syscall flags arguments.
* Fixed decoding of 4th argument of clock_nanosleep syscall.
* Fixed decoding of getpagesize syscall on m68k.
* Fixed decoding of getrandom and seccomp syscalls on aarch64.
* Fixed decoding of timezone argument of gettimeofday and settimeofday
* syscalls.
* Fixed decoding of offset argument of mmap2 syscall on arm, sparc,
and sparc64.
* Fixed decoding of pipe syscall on alpha and mips.
* Fixed decoding of pipe2 syscall on ia64, sh, sparc, and sparc64.
* Fixed decoding of signal mask argument of pselect6 syscall on x32.
* Fixed decoding of signal mask of rt_sigreturn syscall on aarch64, m68k,
and x32.
* Fixed decoding of 4th argument of semctl indirect syscall.
* Fixed decoding of sa_restorer and sa_mask of sigaction syscall on m68k.
* Fixed decoding of statfs64 and fstatfs64 syscalls on arm eabi.
* Fixed decoding of struct dirent on x32.
* Fixed decoding of times syscall return value on mips n32 and x32.
* Fixed decoding of path argument of umount2 syscall
(addresses Debian bug #785050).
* Worked around a kernel bug in tracing privileged executables.
* Fixed various errors in mapping between syscall numbers and associated
information like the number of syscall arguments, the name of syscall,
and syscall decoder.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../0001-Add-linux-aarch64-arch_regs.h.patch | 25 --------
.../Include-linux-ioctl.h-for-_IOC_-macros.patch | 69 ----------------------
.../strace/Include-sys-stat.h-for-S_I-macros.patch | 52 ----------------
.../strace/strace/Makefile-ptest.patch | 18 +++---
.../define-OS-ARCH-in-tests-Makefile-am.patch | 26 --------
.../strace/strace-add-configure-options.patch | 49 ---------------
.../strace/{strace_4.10.bb => strace_4.11.bb} | 14 ++---
7 files changed, 13 insertions(+), 240 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch
delete mode 100644 meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
delete mode 100644 meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch
delete mode 100644 meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch
delete mode 100644 meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
rename meta/recipes-devtools/strace/{strace_4.10.bb => strace_4.11.bb} (63%)
diff --git a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch b/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch
deleted file mode 100644
index 0853959..0000000
--- a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f85854131c8265f2eb59c714dcea5c4b3dc09bed Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen.kooi@linaro.org>
-Date: Wed, 15 Apr 2015 14:29:37 +0200
-Subject: [PATCH] Add linux/aarch64/arch_regs.h
-
-It is missing from the tarball, but it is present in git for v4.10
-
-Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-Upstream-Status: Pending
----
- linux/aarch64/arch_regs.h | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 linux/aarch64/arch_regs.h
-
-diff --git a/linux/aarch64/arch_regs.h b/linux/aarch64/arch_regs.h
-new file mode 100644
-index 0000000..9a5e33e
---- /dev/null
-+++ b/linux/aarch64/arch_regs.h
-@@ -0,0 +1,2 @@
-+extern uint64_t *const aarch64_sp_ptr;
-+extern uint32_t *const arm_sp_ptr;
---
-1.9.3
-
diff --git a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch b/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
deleted file mode 100644
index d9346a8..0000000
--- a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Backport
-
- http://sourceforge.net/p/strace/code/ci/3460dc486d333231998de0f19918204aacee9ae3
-
-Expected to be released officially as part of strace 4.11
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
-
-From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sat, 28 Mar 2015 18:40:13 +0100
-Subject: [PATCH] Include <linux/ioctl.h> for _IOC_* macros
-
-Fix a compilation failure with musl libc.
-
-* evdev.c: Include <linux/ioctl.h>.
-* ioctl.c: Include <linux/ioctl.h> instead of <asm/ioctl.h>.
-* ioctlsort.c: Likewise.
-
-Reported-by: Dima Krasner <dima@dimakrasner.com>
-Acked-by: Mike Frysinger <vapier@gentoo.org>
----
- evdev.c | 2 ++
- ioctl.c | 2 +-
- ioctlsort.c | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/evdev.c b/evdev.c
-index 9a7430d..e06f9c1 100644
---- a/evdev.c
-+++ b/evdev.c
-@@ -28,6 +28,8 @@
-
- #include "defs.h"
-
-+#include <linux/ioctl.h>
-+
- #ifdef HAVE_LINUX_INPUT_H
- #include <linux/input.h>
- #include "xlat/evdev_abs.h"
-diff --git a/ioctl.c b/ioctl.c
-index 46f8334..c67d048 100644
---- a/ioctl.c
-+++ b/ioctl.c
-@@ -29,7 +29,7 @@
- */
-
- #include "defs.h"
--#include <asm/ioctl.h>
-+#include <linux/ioctl.h>
- #include "xlat/ioctl_dirs.h"
-
- #ifdef HAVE_LINUX_INPUT_H
-diff --git a/ioctlsort.c b/ioctlsort.c
-index 333556c..9c31691 100644
---- a/ioctlsort.c
-+++ b/ioctlsort.c
-@@ -33,7 +33,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <asm/ioctl.h>
-+#include <linux/ioctl.h>
-
- struct ioctlent {
- const char *info;
---
-1.9.1
-
diff --git a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch b/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch
deleted file mode 100644
index 0b072fe..0000000
--- a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream-Status: Backport
-
- http://sourceforge.net/p/strace/code/ci/d34e00b293942b1012ddc49ed3ab379a32337611
-
-Expected to be released officially as part of strace 4.11
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
-
-From d34e00b293942b1012ddc49ed3ab379a32337611 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sat, 28 Mar 2015 18:21:09 +0100
-Subject: [PATCH] Include <sys/stat.h> for S_I* macros
-
-Fix a compilation failure with musl libc.
-
-* mknod.c: Include <sys/stat.h>.
-* printmode.c: Likewise.
-
-Reported-by: Dima Krasner <dima@dimakrasner.com>
-Acked-by: Mike Frysinger <vapier@gentoo.org>
----
- mknod.c | 1 +
- printmode.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/mknod.c b/mknod.c
-index 07e9a45..1463232 100644
---- a/mknod.c
-+++ b/mknod.c
-@@ -1,6 +1,7 @@
- #include "defs.h"
-
- #include <fcntl.h>
-+#include <sys/stat.h>
-
- #ifdef MAJOR_IN_SYSMACROS
- # include <sys/sysmacros.h>
-diff --git a/printmode.c b/printmode.c
-index 4df1b9f..a721936 100644
---- a/printmode.c
-+++ b/printmode.c
-@@ -1,6 +1,7 @@
- #include "defs.h"
-
- #include <fcntl.h>
-+#include <sys/stat.h>
-
- #include "xlat/modetypes.h"
-
---
-1.9.1
-
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index f360301..824031e 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -10,32 +10,32 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index e73958c..5f0dfee 100644
+index 0209bac..b969e25 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -6,7 +6,7 @@ AC_INIT([strace],
+@@ -36,7 +36,7 @@ AC_INIT([strace],
AC_CONFIG_SRCDIR([strace.c])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests])
-+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests])
+-AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules parallel-tests])
++AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules serial-tests])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index ff5e136..984bdb6 100644
+index 0f23b4b..429f7e9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -101,3 +101,21 @@ EXTRA_DIST = init.sh run.sh \
- $(TESTS)
+@@ -332,3 +332,21 @@ ksysent.h: $(srcdir)/ksysent.sed
- CLEANFILES = $(TESTS:=.tmp)
+ BUILT_SOURCES = ksysent.h
+ CLEANFILES = ksysent.h $(TESTS:=.tmp)
+
+buildtest-TESTS: $(check_PROGRAMS) $(TESTS)
+
+install-ptest:
+ install $(BUILDDIR)/strace $(DESTDIR)
-+ install "$(srcdir)/.."/strace-log-merge $(DESTDIR)
++ install $(srcdir)/../strace-log-merge $(DESTDIR)
+ install -d $(DESTDIR)/$(TESTDIR)
+ cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR)
+ sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile
diff --git a/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch b/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch
deleted file mode 100644
index 4b1bb26..0000000
--- a/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Ensure that OS and ARCH are defined in tests/Makefile.am
-
-For strace v4.10 this is a purely cosmetic fix, since the include
-paths derived from $(OS)/${ARCH) are never used. These variables are
-correctly defined by default in strace v4.11.
-
-Partial backport of upstream commit:
-
- http://sourceforge.net/p/strace/code/ci/25c804ce42261b24b19d35c637bf2745c237ee07
-
-Upstream-Status: Backport
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
-
-Index: strace-4.10/tests/Makefile.am
-===================================================================
---- strace-4.10.orig/tests/Makefile.am
-+++ strace-4.10/tests/Makefile.am
-@@ -1,5 +1,7 @@
- # Automake input for strace tests.
-
-+OS = linux
-+ARCH = @arch@
- AM_CFLAGS = $(WARN_CFLAGS)
- AM_CPPFLAGS = -I$(top_builddir)/$(OS)/$(ARCH) \
- -I$(top_srcdir)/$(OS)/$(ARCH) \
diff --git a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
deleted file mode 100644
index 84b9f9c..0000000
--- a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Add option "aio" to enable/disable libaio support.
-
-Upstream-Status: Pending
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
----
- configure.ac | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e73958c..9099370 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,11 +303,6 @@ AC_CHECK_MEMBERS([struct sysinfo.totalhi
-
- AC_CHECK_TYPES([struct flock64],,, [#include <fcntl.h>])
-
--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_CHECK_HEADERS([linux/input.h], [
- AC_CHECK_MEMBERS([struct input_absinfo.resolution],,, [#include <linux/input.h>])
- ])
-@@ -745,6 +740,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes;
- fi
- AC_SUBST(dl_LIBS)
-
-+AC_ARG_ENABLE([aio],
-+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])],
-+ [case $enableval in
-+ 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>])
-+ ])
-+ ;;
-+ no) ;;
-+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;;
-+ esac]
-+)
-+
- AC_PATH_PROG([PERL], [perl])
-
- dnl stack trace with libunwind
---
-1.9.1
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.11.bb
similarity index 63%
rename from meta/recipes-devtools/strace/strace_4.10.bb
rename to meta/recipes-devtools/strace/strace_4.11.bb
index 1b64743..d3e4aef 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/meta/recipes-devtools/strace/strace_4.11.bb
@@ -5,30 +5,24 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7"
SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
- file://0001-Add-linux-aarch64-arch_regs.h.patch \
file://disable-git-version-gen.patch \
- file://strace-add-configure-options.patch \
file://Makefile-ptest.patch \
file://run-ptest \
- file://Include-sys-stat.h-for-S_I-macros.patch \
- file://Include-linux-ioctl.h-for-_IOC_-macros.patch \
- file://define-OS-ARCH-in-tests-Makefile-am.patch \
"
-SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912"
-SRC_URI[sha256sum] = "e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2"
+SRC_URI[md5sum] = "a15d2555a7febb56d00c6e1a51c655dc"
+SRC_URI[sha256sum] = "e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152"
inherit autotools ptest bluetooth
+
RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
PACKAGECONFIG_class-target ??= "\
- libaio \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
"
-PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
-PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}"
+PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
TESTDIR = "tests"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11
2016-01-12 7:18 [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11 Andre McCurdy
` (4 preceding siblings ...)
2016-01-12 7:18 ` [PATCH 5/5] strace: update 4.10 -> 4.11 Andre McCurdy
@ 2016-01-12 21:32 ` Richard Purdie
2016-01-12 22:02 ` Andre McCurdy
5 siblings, 1 reply; 9+ messages in thread
From: Richard Purdie @ 2016-01-12 21:32 UTC (permalink / raw)
To: Andre McCurdy, openembedded-core
On Mon, 2016-01-11 at 23:18 -0800, Andre McCurdy wrote:
> Andre McCurdy (5):
> strace: drop unnecessary dependency on acl
> strace: fix --disable-aio configure option
> strace: remove need for git-version-gen script
> strace: fix ARCH definition in tests/Makefile
> strace: update 4.10 -> 4.11
I included this in a -next build but it failed on the autobuilder:
http://errors.yoctoproject.org/Errors/Details/27173/
http://errors.yoctoproject.org/Errors/Details/27101/
http://errors.yoctoproject.org/Errors/Details/27101/
One is poky, one is poky-lsb, looks like it might be a debian system
specific issue :/.
Cheers,
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11
2016-01-12 21:32 ` [PATCH 0/5] strace: misc fixes + " Richard Purdie
@ 2016-01-12 22:02 ` Andre McCurdy
2016-01-12 22:58 ` Andre McCurdy
0 siblings, 1 reply; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 22:02 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE Core mailing list
On Tue, Jan 12, 2016 at 1:32 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2016-01-11 at 23:18 -0800, Andre McCurdy wrote:
>> Andre McCurdy (5):
>> strace: drop unnecessary dependency on acl
>> strace: fix --disable-aio configure option
>> strace: remove need for git-version-gen script
>> strace: fix ARCH definition in tests/Makefile
>> strace: update 4.10 -> 4.11
>
> I included this in a -next build but it failed on the autobuilder:
>
> http://errors.yoctoproject.org/Errors/Details/27173/
> http://errors.yoctoproject.org/Errors/Details/27101/
> http://errors.yoctoproject.org/Errors/Details/27101/
>
> One is poky, one is poky-lsb, looks like it might be a debian system
> specific issue :/.
Looks like it's calling the host gcc with -isystem set to OE's
x86_64-linux sysroot, and then gets confused because host gcc seems to
be generating 32bit binaries by default.
Does adding "-m64" to the failing gcc command line fix it?
> Cheers,
>
> Richard
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11
2016-01-12 22:02 ` Andre McCurdy
@ 2016-01-12 22:58 ` Andre McCurdy
0 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2016-01-12 22:58 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE Core mailing list
On Tue, Jan 12, 2016 at 2:02 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Tue, Jan 12, 2016 at 1:32 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> On Mon, 2016-01-11 at 23:18 -0800, Andre McCurdy wrote:
>>> Andre McCurdy (5):
>>> strace: drop unnecessary dependency on acl
>>> strace: fix --disable-aio configure option
>>> strace: remove need for git-version-gen script
>>> strace: fix ARCH definition in tests/Makefile
>>> strace: update 4.10 -> 4.11
>>
>> I included this in a -next build but it failed on the autobuilder:
>>
>> http://errors.yoctoproject.org/Errors/Details/27173/
>> http://errors.yoctoproject.org/Errors/Details/27101/
>> http://errors.yoctoproject.org/Errors/Details/27101/
>>
>> One is poky, one is poky-lsb, looks like it might be a debian system
>> specific issue :/.
>
> Looks like it's calling the host gcc with -isystem set to OE's
> x86_64-linux sysroot, and then gets confused because host gcc seems to
> be generating 32bit binaries by default.
>
> Does adding "-m64" to the failing gcc command line fix it?
Clearing CFLAGS_FOR_BUILD, CPPFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD
from within the recipe looks like it's going to fix it.
CPPFLAGS_FOR_BUILD = ""
CFLAGS_FOR_BUILD = ""
CXXFLAGS_FOR_BUILD=""
LDFLAGS_FOR_BUILD = ""
It raises some questions though. We setup CFLAGS_FOR_BUILD etc
unconditionally from autotools.bbclass with -isystem pointing to the
native sysroot, but I don't see any default dependency to ensure that
the native sysroot actually contains anything. Should CFLAGS_FOR_BUILD
etc perhaps only be setup for packages which are known to need it,
when we know there's an appropriate dependency in place to populate
the native sysroot?
>> Cheers,
>>
>> Richard
>>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-01-12 22:58 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-12 7:18 [PATCH 0/5] strace: misc fixes + update 4.10 -> 4.11 Andre McCurdy
2016-01-12 7:18 ` [PATCH 1/5] strace: drop unnecessary dependency on acl Andre McCurdy
2016-01-12 7:18 ` [PATCH 2/5] strace: fix --disable-aio configure option Andre McCurdy
2016-01-12 7:18 ` [PATCH 3/5] strace: remove need for git-version-gen script Andre McCurdy
2016-01-12 7:18 ` [PATCH 4/5] strace: fix ARCH definition in tests/Makefile Andre McCurdy
2016-01-12 7:18 ` [PATCH 5/5] strace: update 4.10 -> 4.11 Andre McCurdy
2016-01-12 21:32 ` [PATCH 0/5] strace: misc fixes + " Richard Purdie
2016-01-12 22:02 ` Andre McCurdy
2016-01-12 22:58 ` Andre McCurdy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.