From 3fe1bcb6c788483eace461d0ab5416dfe23238d8 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 18 Aug 2017 02:58:46 -0700 Subject: strace: 4.17 -> 4.18 - Updated update-gawk-paths.patch. - Updated Makefile-ptest.patch - Removed 0008-replace-struct-ucontext-with-ucontext_t.patch which is already in the source. - The LIC_FILES_CHKSUM is changed because the years have been updated, the contents are the same. Signed-off-by: Robert Yang --- ...8-replace-struct-ucontext-with-ucontext_t.patch | 31 ------------ .../strace/strace/Makefile-ptest.patch | 2 +- .../strace/strace/update-gawk-paths.patch | 58 +++++++++++----------- meta/recipes-devtools/strace/strace_4.17.bb | 50 ------------------- meta/recipes-devtools/strace/strace_4.18.bb | 49 ++++++++++++++++++ 5 files changed, 79 insertions(+), 111 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch delete mode 100644 meta/recipes-devtools/strace/strace_4.17.bb create mode 100644 meta/recipes-devtools/strace/strace_4.18.bb diff --git a/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch deleted file mode 100644 index 1985d8104d..0000000000 --- a/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 28 Jun 2017 11:36:57 -0700 -Subject: [PATCH 8/8] replace struct ucontext with ucontext_t - -glibc >= 2.26 has dropped the tag struct ucontext -from ucontext_t type - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj ---- - linux/arm/arch_sigreturn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c -index b60dad8..a2b7100 100644 ---- a/linux/arm/arch_sigreturn.c -+++ b/linux/arm/arch_sigreturn.c -@@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp) - #ifdef AARCH64 - tcp->currpers == 0 ? - (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + -- offsetof(struct ucontext, uc_sigmask)) : -+ offsetof(ucontext_t, uc_sigmask)) : - #endif - (*arm_sp_ptr + - OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK); --- -2.13.2 - diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 07ea0b37f2..97bcc90a88 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -51,7 +51,7 @@ index 5aa7f89..a55a355 100644 + install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done -+ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done ++ for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done -- 2.13.2 diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 94ee53c7fc..f6ffa8e7a8 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -12,20 +12,20 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy --- - mpers.awk | 2 +- - tests-m32/caps.awk | 2 +- - tests-m32/match.awk | 2 +- - tests-m32/sigaction.awk | 2 +- - tests-mx32/caps.awk | 2 +- - tests-mx32/match.awk | 2 +- - tests-mx32/sigaction.awk | 2 +- - tests/caps.awk | 2 +- - tests/match.awk | 2 +- - tests/sigaction.awk | 2 +- + mpers.awk | 2 +- + tests-m32/caps.awk | 2 +- + tests-m32/match.awk | 2 +- + tests-m32/rt_sigaction.awk | 2 +- + tests-mx32/caps.awk | 2 +- + tests-mx32/match.awk | 2 +- + tests-mx32/rt_sigaction.awk | 2 +- + tests/caps.awk | 2 +- + tests/match.awk | 2 +- + tests/rt_sigaction.awk | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mpers.awk b/mpers.awk -index 99248c5..ff10520 100644 +index fe54763..b5238a8 100644 --- a/mpers.awk +++ b/mpers.awk @@ -1,4 +1,4 @@ @@ -35,7 +35,7 @@ index 99248c5..ff10520 100644 # Copyright (c) 2015 Elvira Khabirova # Copyright (c) 2015-2016 Dmitry V. Levin diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk -index 67003ac..a66f1f0 100644 +index c6e31ef..5efc6cc 100644 --- a/tests-m32/caps.awk +++ b/tests-m32/caps.awk @@ -1,4 +1,4 @@ @@ -54,18 +54,18 @@ index abfbae9..f2740bf 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # All rights reserved. -diff --git a/tests-m32/sigaction.awk b/tests-m32/sigaction.awk -index 5c6b6d0..3e14464 100644 ---- a/tests-m32/sigaction.awk -+++ b/tests-m32/sigaction.awk +diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk +index 9c3a9ed..8414243 100644 +--- a/tests-m32/rt_sigaction.awk ++++ b/tests-m32/rt_sigaction.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # # Copyright (c) 2014-2015 Dmitry V. Levin - # All rights reserved. + # Copyright (c) 2016 Elvira Khabirova diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk -index 67003ac..a66f1f0 100644 +index c6e31ef..5efc6cc 100644 --- a/tests-mx32/caps.awk +++ b/tests-mx32/caps.awk @@ -1,4 +1,4 @@ @@ -84,18 +84,18 @@ index abfbae9..f2740bf 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # All rights reserved. -diff --git a/tests-mx32/sigaction.awk b/tests-mx32/sigaction.awk -index 5c6b6d0..3e14464 100644 ---- a/tests-mx32/sigaction.awk -+++ b/tests-mx32/sigaction.awk +diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk +index 9c3a9ed..8414243 100644 +--- a/tests-mx32/rt_sigaction.awk ++++ b/tests-mx32/rt_sigaction.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # # Copyright (c) 2014-2015 Dmitry V. Levin - # All rights reserved. + # Copyright (c) 2016 Elvira Khabirova diff --git a/tests/caps.awk b/tests/caps.awk -index 67003ac..a66f1f0 100644 +index c6e31ef..5efc6cc 100644 --- a/tests/caps.awk +++ b/tests/caps.awk @@ -1,4 +1,4 @@ @@ -114,13 +114,13 @@ index abfbae9..f2740bf 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # All rights reserved. -diff --git a/tests/sigaction.awk b/tests/sigaction.awk -index 5c6b6d0..3e14464 100644 ---- a/tests/sigaction.awk -+++ b/tests/sigaction.awk +diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk +index 9c3a9ed..8414243 100644 +--- a/tests/rt_sigaction.awk ++++ b/tests/rt_sigaction.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # # Copyright (c) 2014-2015 Dmitry V. Levin - # All rights reserved. + # Copyright (c) 2016 Elvira Khabirova diff --git a/meta/recipes-devtools/strace/strace_4.17.bb b/meta/recipes-devtools/strace/strace_4.17.bb deleted file mode 100644 index 72fa994489..0000000000 --- a/meta/recipes-devtools/strace/strace_4.17.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "System call tracing tool" -HOMEPAGE = "http://strace.sourceforge.net" -SECTION = "console/utils" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=488acb3aaaf5d14a2e1a852d13668a70" - -SRC_URI = "${SOURCEFORGE_MIRROR}/strace/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://0008-replace-struct-ucontext-with-ucontext_t.patch \ - " - -SRC_URI[md5sum] = "8d7eb10eba68bad83a269197e634b626" -SRC_URI[sha256sum] = "81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419" - -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/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile -} - -BBCLASSEXTEND = "native" -TOOLCHAIN = "gcc" diff --git a/meta/recipes-devtools/strace/strace_4.18.bb b/meta/recipes-devtools/strace/strace_4.18.bb new file mode 100644 index 0000000000..bbb82a9d84 --- /dev/null +++ b/meta/recipes-devtools/strace/strace_4.18.bb @@ -0,0 +1,49 @@ +SUMMARY = "System call tracing tool" +HOMEPAGE = "http://strace.sourceforge.net" +SECTION = "console/utils" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=f132b4d2adfccc63da4139a609367711" + +SRC_URI = "${SOURCEFORGE_MIRROR}/strace/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 \ + " + +SRC_URI[md5sum] = "3579b3266bb096cebaefbe2cdb1a3a78" +SRC_URI[sha256sum] = "89ad887c1e6226bdbca8da31d589cadea4be0744b142eb47b768086c937fca08" + +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/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile +} + +BBCLASSEXTEND = "native" +TOOLCHAIN = "gcc" -- cgit 1.2.3-korg