summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2025-02-12 21:59:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-02-18 11:56:04 +0000
commit6fa6995c1e93abb3246366ae29a68c638feafb46 (patch)
treed1e2fe2d7706f86d625f33beaec2a9d2aead6171 /meta
parent6b3c2666e62c454932cd265c800e019bde40f791 (diff)
downloadpoky-6fa6995c1e93abb3246366ae29a68c638feafb46.tar.gz
shadow: upgrade from 4.17.1 to 4.17.2
Upgrade shadow from 4.17.1 to 4.17.2. 0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch is dropped because it has been merged. (From OE-Core rev: 6170d60175237dd4a0471d6f88cee2db4a37b7c4) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch29
-rw-r--r--meta/recipes-extended/shadow/shadow_4.17.2.bb (renamed from meta/recipes-extended/shadow/shadow_4.17.1.bb)3
2 files changed, 1 insertions, 31 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch b/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch
deleted file mode 100644
index 4e2d3a89c3..0000000000
--- a/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From f2d8d96e8586772becd68593a5bd9e14632841af Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 7 Jan 2025 17:03:32 +0100
4Subject: [PATCH] lib/attr.h: use C23 attributes only with gcc >= 10
5
6These are not available on earlier versions and builds break there.
7
8Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/1172]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10---
11 lib/attr.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/lib/attr.h b/lib/attr.h
15index 02c7e252..290514d8 100644
16--- a/lib/attr.h
17+++ b/lib/attr.h
18@@ -5,7 +5,7 @@
19 #include "config.h"
20
21
22-#if defined(__GNUC__)
23+#if defined(__GNUC__) && (__GNUC__ >= 10)
24 # define MAYBE_UNUSED [[gnu::unused]]
25 # define NORETURN [[gnu::__noreturn__]]
26 # define format_attr(type, fmt, va) [[gnu::format(type, fmt, va)]]
27--
282.45.2
29
diff --git a/meta/recipes-extended/shadow/shadow_4.17.1.bb b/meta/recipes-extended/shadow/shadow_4.17.2.bb
index 7c89062646..5459d4e57f 100644
--- a/meta/recipes-extended/shadow/shadow_4.17.1.bb
+++ b/meta/recipes-extended/shadow/shadow_4.17.2.bb
@@ -14,7 +14,6 @@ GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases"
14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ 14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \
15 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ 15 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
16 file://useradd \ 16 file://useradd \
17 file://0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch \
18 " 17 "
19 18
20SRC_URI:append:class-target = " \ 19SRC_URI:append:class-target = " \
@@ -25,7 +24,7 @@ SRC_URI:append:class-target = " \
25SRC_URI:append:class-native = " \ 24SRC_URI:append:class-native = " \
26 file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ 25 file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \
27 " 26 "
28SRC_URI[sha256sum] = "51a946bbce141c5de14b6d47cab167206cd685d2307e917611dbc1be46c84a18" 27SRC_URI[sha256sum] = "064a7c048e613ef5b5f3613e137d79d35d062ab434e89020f743e90844ec5c4f"
29UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" 28UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
30 29
31# Additional Policy files for PAM 30# Additional Policy files for PAM