summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-01 10:34:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-03 10:51:27 +0000
commitab08f2b57f8553b472818b5b5bb2093f4ab178aa (patch)
tree8174817ebb8f571217ec039297168af9e10fd207 /meta/recipes-support
parentbd50c997ad6e3f0da8216d7a6f97eb7f73db0d48 (diff)
downloadpoky-ab08f2b57f8553b472818b5b5bb2093f4ab178aa.tar.gz
nettle: upgrade 3.10 -> 3.10.1
(From OE-Core rev: 601327a0c8a66226877f03b21bad0c7e67ee14de) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch9
-rw-r--r--meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch7
-rw-r--r--meta/recipes-support/nettle/nettle_3.10.1.bb (renamed from meta/recipes-support/nettle/nettle_3.10.bb)2
3 files changed, 6 insertions, 12 deletions
diff --git a/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch
index 345fc43ebe..ee3e74c43b 100644
--- a/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch
+++ b/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch
@@ -1,4 +1,4 @@
1From e9fcb2177fda228ac065d189240e2d992e86e5bf Mon Sep 17 00:00:00 2001 1From 3ea3eaf5bda21529fc8a8da3d8b07ebc3875ba7e Mon Sep 17 00:00:00 2001
2From: Trevor Gamblin <tgamblin@baylibre.com> 2From: Trevor Gamblin <tgamblin@baylibre.com>
3Date: Fri, 2 Aug 2024 09:48:43 -0400 3Date: Fri, 2 Aug 2024 09:48:43 -0400
4Subject: [PATCH] Makefile.in: Add target to only build tests (not run them) 4Subject: [PATCH] Makefile.in: Add target to only build tests (not run them)
@@ -21,7 +21,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
21 2 files changed, 5 insertions(+) 21 2 files changed, 5 insertions(+)
22 22
23diff --git a/Makefile.in b/Makefile.in 23diff --git a/Makefile.in b/Makefile.in
24index 2bf7f1e8..403a868a 100644 24index 71ad761..0f239f4 100644
25--- a/Makefile.in 25--- a/Makefile.in
26+++ b/Makefile.in 26+++ b/Makefile.in
27@@ -53,6 +53,9 @@ clean distclean mostlyclean maintainer-clean tags: 27@@ -53,6 +53,9 @@ clean distclean mostlyclean maintainer-clean tags:
@@ -35,7 +35,7 @@ index 2bf7f1e8..403a868a 100644
35 true 35 true
36 36
37diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in 37diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
38index 0699fa0d..8ac9983c 100644 38index 0699fa0..8ac9983 100644
39--- a/testsuite/Makefile.in 39--- a/testsuite/Makefile.in
40+++ b/testsuite/Makefile.in 40+++ b/testsuite/Makefile.in
41@@ -137,6 +137,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../non-nettle.$(OBJEXT) \ 41@@ -137,6 +137,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../non-nettle.$(OBJEXT) \
@@ -47,6 +47,3 @@ index 0699fa0d..8ac9983c 100644
47 check: $(TS_ALL) $(TS_ALL:sc-%=%) 47 check: $(TS_ALL) $(TS_ALL:sc-%=%)
48 TEST_SHLIB_DIR="$(TEST_SHLIB_DIR)" \ 48 TEST_SHLIB_DIR="$(TEST_SHLIB_DIR)" \
49 srcdir="$(srcdir)" \ 49 srcdir="$(srcdir)" \
50--
512.39.2
52
diff --git a/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch b/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch
index 49d633b5f7..89b5c7bec4 100644
--- a/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch
+++ b/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch
@@ -1,4 +1,4 @@
1From 5f7cdd2b878298577accade43a38e1a0951d17b4 Mon Sep 17 00:00:00 2001 1From ec2ca7e505e6bfe1fff2a7d6e6bb39b60b93e19a Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com> 2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Fri, 9 Dec 2016 15:23:17 +0800 3Date: Fri, 9 Dec 2016 15:23:17 +0800
4Subject: [PATCH] nettle: check header files of openssl only if 4Subject: [PATCH] nettle: check header files of openssl only if
@@ -23,7 +23,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
23 1 file changed, 5 insertions(+), 3 deletions(-) 23 1 file changed, 5 insertions(+), 3 deletions(-)
24 24
25diff --git a/configure.ac b/configure.ac 25diff --git a/configure.ac b/configure.ac
26index 4f27e663..673c1492 100644 26index 7c003bb..779f7ff 100644
27--- a/configure.ac 27--- a/configure.ac
28+++ b/configure.ac 28+++ b/configure.ac
29@@ -197,9 +197,11 @@ AC_TYPE_SIZE_T 29@@ -197,9 +197,11 @@ AC_TYPE_SIZE_T
@@ -41,6 +41,3 @@ index 4f27e663..673c1492 100644
41 41
42 # For use by the testsuite 42 # For use by the testsuite
43 AC_CHECK_HEADERS([valgrind/memcheck.h]) 43 AC_CHECK_HEADERS([valgrind/memcheck.h])
44--
452.39.2
46
diff --git a/meta/recipes-support/nettle/nettle_3.10.bb b/meta/recipes-support/nettle/nettle_3.10.1.bb
index 92bc78263c..85c470b10d 100644
--- a/meta/recipes-support/nettle/nettle_3.10.bb
+++ b/meta/recipes-support/nettle/nettle_3.10.1.bb
@@ -20,7 +20,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
20 file://check-header-files-of-openssl-only-if-enable_.patch \ 20 file://check-header-files-of-openssl-only-if-enable_.patch \
21 " 21 "
22 22
23SRC_URI[sha256sum] = "b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c" 23SRC_URI[sha256sum] = "b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132"
24 24
25UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" 25UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
26 26