diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2025-03-04 17:08:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-06 11:16:47 +0000 |
commit | 4a5c7454481f1f7dc342224d289f710866089d5b (patch) | |
tree | e927877a17f01d5e0cb0a58d170bd281fbdc2809 /meta | |
parent | 7fdc0c3c86e01ced327e06d995ce643f85d65074 (diff) | |
download | poky-4a5c7454481f1f7dc342224d289f710866089d5b.tar.gz |
liburcu: update 0.15.0 -> 0.15.1
0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch
removed since it's included in 0.15.1
(From OE-Core rev: c8dcd773a062685f249a020af7858a794b556617)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/liburcu/liburcu/0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch | 45 | ||||
-rw-r--r-- | meta/recipes-support/liburcu/liburcu_0.15.1.bb (renamed from meta/recipes-support/liburcu/liburcu_0.15.0.bb) | 6 |
2 files changed, 2 insertions, 49 deletions
diff --git a/meta/recipes-support/liburcu/liburcu/0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch b/meta/recipes-support/liburcu/liburcu/0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch deleted file mode 100644 index 5872f45f43..0000000000 --- a/meta/recipes-support/liburcu/liburcu/0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From c534091fc6924e76e6d24e861da9cf7272714231 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Tue, 21 Jan 2025 11:02:05 +0800 | ||
4 | Subject: [PATCH] uatomic/generic.h: add missing stdlib.h header file for | ||
5 | abort() | ||
6 | |||
7 | We encountered the following error when building multipath-tools on | ||
8 | qemuppc64 platform: | ||
9 | |||
10 | | In file included from /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic/ppc.h:228, | ||
11 | | from /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic.h:73, | ||
12 | | from lock.h:5, | ||
13 | | from lock.c:1: | ||
14 | | /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic/generic.h: In function '_uatomic_and': | ||
15 | | /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic/generic.h:422:24: error: implicit declaration of function 'abort' [-Wimplicit-function-declaration] | ||
16 | | 422 | oldt = uatomic_read((uint32_t *) addr); | ||
17 | | | ^~~~~~~~~~~~ | ||
18 | | /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic/generic.h:1:1: note: include '<stdlib.h>' or provide a declaration of 'abort' | ||
19 | | +++ |+#include <stdlib.h> | ||
20 | | 1 | // SPDX-FileCopyrightText: 1991-1994 by Xerox Corporation. All rights reserved. | ||
21 | | make[1]: *** [../Makefile.inc:155: lock.o] Error 1 | ||
22 | | make[1]: Leaving directory '/build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/git/libmultipath' | ||
23 | |||
24 | Upstream-Status: Submitted [https://github.com/urcu/userspace-rcu/pull/28] | ||
25 | |||
26 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
27 | --- | ||
28 | include/urcu/uatomic/generic.h | 1 + | ||
29 | 1 file changed, 1 insertion(+) | ||
30 | |||
31 | diff --git a/include/urcu/uatomic/generic.h b/include/urcu/uatomic/generic.h | ||
32 | index 5a81e00..5c8cb6c 100644 | ||
33 | --- a/include/urcu/uatomic/generic.h | ||
34 | +++ b/include/urcu/uatomic/generic.h | ||
35 | @@ -15,6 +15,7 @@ | ||
36 | */ | ||
37 | |||
38 | #include <stdint.h> | ||
39 | +#include <stdlib.h> | ||
40 | #include <urcu/compiler.h> | ||
41 | #include <urcu/system.h> | ||
42 | |||
43 | -- | ||
44 | 2.25.1 | ||
45 | |||
diff --git a/meta/recipes-support/liburcu/liburcu_0.15.0.bb b/meta/recipes-support/liburcu/liburcu_0.15.1.bb index a029b88111..811e59f853 100644 --- a/meta/recipes-support/liburcu/liburcu_0.15.0.bb +++ b/meta/recipes-support/liburcu/liburcu_0.15.1.bb | |||
@@ -12,11 +12,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c2a92498b6e88e276f986877995425b8 \ | |||
12 | " | 12 | " |
13 | 13 | ||
14 | 14 | ||
15 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ | 15 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" |
16 | file://0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch \ | ||
17 | " | ||
18 | 16 | ||
19 | SRC_URI[sha256sum] = "4f2d839af67905ad396d6d53ba5649b66113d90840dcbc89941e0da64bccd38c" | 17 | SRC_URI[sha256sum] = "98d66cc12f2c5881879b976f0c55d10d311401513be254e3bd28cf3811fb50c8" |
20 | 18 | ||
21 | S = "${WORKDIR}/userspace-rcu-${PV}" | 19 | S = "${WORKDIR}/userspace-rcu-${PV}" |
22 | inherit autotools multilib_header | 20 | inherit autotools multilib_header |