From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../strace/strace/Makefile-ptest.patch | 35 +++++------- .../strace/strace/disable-git-version-gen.patch | 27 +++++++-- ...-robust-test-for-m32-mx32-compile-support.patch | 22 ++++---- poky/meta/recipes-devtools/strace/strace/run-ptest | 2 +- poky/meta/recipes-devtools/strace/strace_4.20.bb | 59 -------------------- poky/meta/recipes-devtools/strace/strace_4.24.bb | 64 ++++++++++++++++++++++ 6 files changed, 112 insertions(+), 97 deletions(-) delete mode 100644 poky/meta/recipes-devtools/strace/strace_4.20.bb create mode 100644 poky/meta/recipes-devtools/strace/strace_4.24.bb (limited to 'poky/meta/recipes-devtools/strace') diff --git a/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index a12f4c3e4..460b6e26e 100644 --- a/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,36 +1,31 @@ -From 0574ae9926308dcbca78bd8cd0f0f143f19cbcb5 Mon Sep 17 00:00:00 2001 +From 207fc7814bbeb0241382329215d21fd3b57066f9 Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 -Subject: [PATCH 4/8] strace: Add ptest +Subject: [PATCH] strace: Add ptest Upstream-Status: Inappropriate Signed-off-by: Gabriel Barbu Signed-off-by: Chong Lu +Signed-off-by: Anuj Mittal --- - configure.ac | 2 +- - tests/Makefile.am | 18 ++++++++++++++++++ - 2 files changed, 19 insertions(+), 1 deletion(-) + tests/Makefile.am | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) -diff --git a/configure.ac b/configure.ac -index 5f0aec4..8eaacc6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,7 +42,7 @@ AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.]) - AC_CONFIG_SRCDIR([strace.c]) - AC_CONFIG_AUX_DIR([.]) - AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests 1.13]) -+AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules serial-tests 1.13]) - AM_MAINTAINER_MODE - AC_CANONICAL_HOST - diff --git a/tests/Makefile.am b/tests/Makefile.am -index b4ba22a..5836438 100644 +index a2f3950..4fa97e2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -408,3 +408,21 @@ BUILT_SOURCES = ksysent.h +@@ -34,6 +34,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ + MPERS_NAME = + MPERS_CC_FLAGS = + ARCH_MFLAGS = ++TEST_SUITE_LOG = test-suite.log + AM_CFLAGS = $(WARN_CFLAGS) + AM_CPPFLAGS = $(ARCH_MFLAGS) \ + -I$(builddir) \ +@@ -490,3 +491,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 76daf3a3b..9e5ec1109 100644 --- a/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,20 +1,37 @@ -The git-version-gen script is not included in tarball releases, -so we need to avoid attempts to call it when running autoreconf. +From bee0680754730498485e24dd037303318c68916c Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Mon, 18 Jan 2016 13:33:50 -0800 +Subject: [PATCH] strace: remove need for scripts + +git-version-gen copyright-year-gen file-date-gen are not included in +tarball releases, so we need to avoid attempts to call them. Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy +Signed-off-by: Anuj Mittal + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 7004bd3..b2b03c6 100644 +index ad1d00f..96fa205 100644 --- a/configure.ac +++ b/configure.ac -@@ -31,7 +31,7 @@ +@@ -32,12 +32,12 @@ 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], + [strace-devel@lists.strace.io], [strace], [https://strace.io]) +-m4_define([copyright_year], m4_esyscmd([./copyright-year-gen .year])) +-m4_define([manpage_date], m4_esyscmd([./file-date-gen strace.1.in])) ++m4_define([copyright_year], m4_esyscmd_s([cat .year])) ++m4_define([manpage_date], m4_esyscmd_s([cat .strace.1.in.date])) + AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.]) + AC_CONFIG_SRCDIR([strace.c]) + AC_CONFIG_AUX_DIR([.]) diff --git a/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch index 756cd8bb8..3d4913d68 100644 --- a/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ b/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch @@ -22,25 +22,23 @@ Signed-off-by: Andre McCurdy m4/mpers.m4 | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/m4/mpers.m4 b/m4/mpers.m4 -index 1fe8a8e..d72c717 100644 ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -53,12 +53,14 @@ case "$arch" in - CFLAGS="$CFLAGS CFLAG $IFLAG" - AC_CACHE_CHECK([for CFLAG compile support], [st_cv_cc], +Index: strace-4.22/m4/mpers.m4 +=================================================================== +--- strace-4.22.orig/m4/mpers.m4 ++++ strace-4.22/m4/mpers.m4 +@@ -108,6 +108,7 @@ case "$arch" in + CFLAGS="$CFLAGS MPERS_CFLAGS $IFLAG" + AC_CACHE_CHECK([for mpers_name personality compile support], [st_cv_cc], [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include + #include int main(){return 0;}]])], [st_cv_cc=yes], [st_cv_cc=no])]) - if test $st_cv_cc = yes; then - AC_CACHE_CHECK([for CFLAG runtime support], [st_cv_runtime], +@@ -115,6 +116,7 @@ case "$arch" in + AC_CACHE_CHECK([for mpers_name personality runtime support], + [st_cv_runtime], [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + #include int main(){return 0;}]])], [st_cv_runtime=yes], [st_cv_runtime=no], --- -1.9.1 - diff --git a/poky/meta/recipes-devtools/strace/strace/run-ptest b/poky/meta/recipes-devtools/strace/strace/run-ptest index 133cf92d0..8070d8317 100755 --- a/poky/meta/recipes-devtools/strace/strace/run-ptest +++ b/poky/meta/recipes-devtools/strace/strace/run-ptest @@ -1,2 +1,2 @@ #!/bin/sh -make -C tests -k runtest-TESTS +make -B -C tests -k test-suite.log diff --git a/poky/meta/recipes-devtools/strace/strace_4.20.bb b/poky/meta/recipes-devtools/strace/strace_4.20.bb deleted file mode 100644 index 869c12f65..000000000 --- a/poky/meta/recipes-devtools/strace/strace_4.20.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "System call tracing tool" -HOMEPAGE = "http://strace.io" -SECTION = "console/utils" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=f132b4d2adfccc63da4139a609367711" - -SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ - file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ - file://update-gawk-paths.patch \ - file://Makefile-ptest.patch \ - file://run-ptest \ - file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ - file://mips-SIGEMT.patch \ - file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ - file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ - " - -SRC_URI[md5sum] = "f2271ab0fac49ebee9cbd7f3469227cb" -SRC_URI[sha256sum] = "5bf3148dd17306a42566f7da17368fdd781afa147db05ea63a4ca2b50f58c523" - -inherit autotools ptest bluetooth - -RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" - -PACKAGECONFIG_class-target ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ -" - -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" - -do_install_append() { - # We don't ship strace-graph here because it needs perl - rm ${D}${bindir}/strace-graph -} - -do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} - sed -i -e '/^src/s/strace.*[1-9]/ptest/' \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${RECIPE_SYSROOT}::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -e '/^DEB_CHANGELOGTIME/d' \ - -e '/^RPM_CHANGELOGTIME/d' \ - ${D}/${PTEST_PATH}/${TESTDIR}/Makefile -} - -BBCLASSEXTEND = "native" -TOOLCHAIN = "gcc" diff --git a/poky/meta/recipes-devtools/strace/strace_4.24.bb b/poky/meta/recipes-devtools/strace/strace_4.24.bb new file mode 100644 index 000000000..9e40a064f --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace_4.24.bb @@ -0,0 +1,64 @@ +SUMMARY = "System call tracing tool" +HOMEPAGE = "http://strace.io" +SECTION = "console/utils" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ddb91734b9c705f3e87362e97e5f64b" + +SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ + file://disable-git-version-gen.patch \ + file://more-robust-test-for-m32-mx32-compile-support.patch \ + file://update-gawk-paths.patch \ + file://Makefile-ptest.patch \ + file://run-ptest \ + file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ + file://mips-SIGEMT.patch \ + file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ + file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ + " +SRC_URI[md5sum] = "8780136849c85acf76ad3a522aa4462a" +SRC_URI[sha256sum] = "1f4e59fc1edfa2bfb4adf2a748623dc25b105ec79713dd84404199f91b0b0634" + +inherit autotools ptest bluetooth + +PACKAGECONFIG_class-target ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ +" + +PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" +PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" + +EXTRA_OECONF += "--enable-mpers=no" + +CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" + +TESTDIR = "tests" + +do_install_append() { + # We don't ship strace-graph here because it needs perl + rm ${D}${bindir}/strace-graph +} + +do_compile_ptest() { + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} + install -m 755 ${S}/test-driver ${D}${PTEST_PATH} + install -m 644 ${B}/config.h ${D}${PTEST_PATH} + sed -i -e '/^src/s/strace.*[1-9]/ptest/' \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${RECIPE_SYSROOT}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -e '/^DEB_CHANGELOGTIME/d' \ + -e '/^RPM_CHANGELOGTIME/d' \ + ${D}/${PTEST_PATH}/${TESTDIR}/Makefile +} + +RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" + +BBCLASSEXTEND = "native" +TOOLCHAIN = "gcc" -- cgit v1.2.3