mirror of
https://git.yoctoproject.org/poky
synced 2026-04-02 17:02:21 +02:00
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. (From OE-Core rev: 111e4a8642160c8441e447da32a4ef52995bbe99) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
committed by
Richard Purdie
Richard Purdie
parent
08975348f1
commit
ef4c6534ff
@@ -1,31 +0,0 @@
|
||||
From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -12,20 +12,20 @@ Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
||||
---
|
||||
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 <lineprinter0@gmail.com>
|
||||
# Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
|
||||
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 <ldv@altlinux.org>
|
||||
# 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 <ldv@altlinux.org>
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
|
||||
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 <ldv@altlinux.org>
|
||||
# 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 <ldv@altlinux.org>
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
|
||||
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 <ldv@altlinux.org>
|
||||
# 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 <ldv@altlinux.org>
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
|
||||
|
||||
@@ -2,7 +2,7 @@ SUMMARY = "System call tracing tool"
|
||||
HOMEPAGE = "http://strace.sourceforge.net"
|
||||
SECTION = "console/utils"
|
||||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=488acb3aaaf5d14a2e1a852d13668a70"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=f132b4d2adfccc63da4139a609367711"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
|
||||
file://disable-git-version-gen.patch \
|
||||
@@ -13,11 +13,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
|
||||
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"
|
||||
SRC_URI[md5sum] = "3579b3266bb096cebaefbe2cdb1a3a78"
|
||||
SRC_URI[sha256sum] = "89ad887c1e6226bdbca8da31d589cadea4be0744b142eb47b768086c937fca08"
|
||||
|
||||
inherit autotools ptest bluetooth
|
||||
|
||||
Reference in New Issue
Block a user