summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-02-08 08:20:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-09 09:57:24 +0000
commite0ea87498dfb50d27c7bdf6fda1dcc77094cb5f5 (patch)
tree65b95497da28b08d69f25e278f273b295549d6af /meta/recipes-extended
parent1ab438d7d36f799cce8d578c0cea234f4a68511e (diff)
downloadpoky-e0ea87498dfb50d27c7bdf6fda1dcc77094cb5f5.tar.gz
diffutils: update 3.8 -> 3.9
Drop patch as issue fixed upstream. (From OE-Core rev: e5ec5de7217de28bccf3243496df6b41ca8a1d0b) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch11
-rw-r--r--meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch33
-rw-r--r--meta/recipes-extended/diffutils/diffutils_3.9.bb (renamed from meta/recipes-extended/diffutils/diffutils_3.8.bb)3
3 files changed, 6 insertions, 41 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
index aac1c43465..8b88c308f2 100644
--- a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
+++ b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
@@ -1,4 +1,4 @@
1From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001 1From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001
2From: Peiran Hong <peiran.hong@windriver.com> 2From: Peiran Hong <peiran.hong@windriver.com>
3Date: Thu, 5 Sep 2019 15:42:22 -0400 3Date: Thu, 5 Sep 2019 15:42:22 -0400
4Subject: [PATCH] Skip strip-trailing-cr test case 4Subject: [PATCH] Skip strip-trailing-cr test case
@@ -10,19 +10,21 @@ package.
10Upstream-Status: Inappropriate [embedded specific] 10Upstream-Status: Inappropriate [embedded specific]
11 11
12Signed-off-by: Peiran Hong <peiran.hong@windriver.com> 12Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
13
13--- 14---
14 tests/Makefile.am | 4 +++- 15 tests/Makefile.am | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-) 16 1 file changed, 3 insertions(+), 1 deletion(-)
16 17
17diff --git a/tests/Makefile.am b/tests/Makefile.am 18diff --git a/tests/Makefile.am b/tests/Makefile.am
18index 83a7c9d..04d51b5 100644 19index d98df82..757ea52 100644
19--- a/tests/Makefile.am 20--- a/tests/Makefile.am
20+++ b/tests/Makefile.am 21+++ b/tests/Makefile.am
21@@ -21,8 +21,10 @@ TESTS = \ 22@@ -21,9 +21,11 @@ TESTS = \
22 stdin \ 23 stdin \
23 strcoll-0-names \ 24 strcoll-0-names \
24 filename-quoting \ 25 filename-quoting \
25- strip-trailing-cr \ 26- strip-trailing-cr \
27 timezone \
26 colors 28 colors
27+# Skipping this test since it requires valgrind 29+# Skipping this test since it requires valgrind
28+# and thus is too heavy for diffutils package 30+# and thus is too heavy for diffutils package
@@ -30,6 +32,3 @@ index 83a7c9d..04d51b5 100644
30 32
31 XFAIL_TESTS = large-subopt 33 XFAIL_TESTS = large-subopt
32 34
33--
342.21.0
35
diff --git a/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch b/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch
deleted file mode 100644
index 4928e1eaff..0000000000
--- a/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From f385ad6639380eb6dfa8b8eb4a5ba65dd12db744 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 25 Mar 2022 13:43:19 -0700
4Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ
5
6This is already applied to libsigsegv upstream, hopefully next version
7of grep will update its internal copy and we can drop this patch
8
9Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 lib/sigsegv.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/lib/sigsegv.c b/lib/sigsegv.c
17index 998c827..b6f4841 100644
18--- a/lib/sigsegv.c
19+++ b/lib/sigsegv.c
20@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
21 # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
22 # else /* 32-bit */
23 /* both should be equivalent */
24-# if 0
25-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
26+# if ! defined __GLIBC__
27+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1]
28 # else
29 # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
30 # endif
31--
322.35.1
33
diff --git a/meta/recipes-extended/diffutils/diffutils_3.8.bb b/meta/recipes-extended/diffutils/diffutils_3.9.bb
index 8889c83ee2..2bb9e6f32d 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.8.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.9.bb
@@ -6,10 +6,9 @@ require diffutils.inc
6SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ 6SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
7 file://run-ptest \ 7 file://run-ptest \
8 file://0001-Skip-strip-trailing-cr-test-case.patch \ 8 file://0001-Skip-strip-trailing-cr-test-case.patch \
9 file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \
10 " 9 "
11 10
12SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" 11SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1"
13 12
14EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" 13EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix"
15 14