diff mbox series

[11/31] liburcu: update 0.15.0 -> 0.15.1

Message ID 1741079356-13445-11-git-send-email-wangmy@fujitsu.com
State Accepted, archived
Commit c8dcd773a062685f249a020af7858a794b556617
Headers show
Series [01/31] bind: upgrade 9.20.5 -> 9.20.6 | expand

Commit Message

Mingyu Wang (Fujitsu) March 4, 2025, 9:08 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch
removed since it's included in 0.15.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...h-add-missing-stdlib.h-header-file-f.patch | 45 -------------------
 .../{liburcu_0.15.0.bb => liburcu_0.15.1.bb}  |  6 +--
 2 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-support/liburcu/liburcu/0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch
 rename meta/recipes-support/liburcu/{liburcu_0.15.0.bb => liburcu_0.15.1.bb} (82%)
diff mbox series

Patch

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 @@ 
-From c534091fc6924e76e6d24e861da9cf7272714231 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Tue, 21 Jan 2025 11:02:05 +0800
-Subject: [PATCH] uatomic/generic.h: add missing stdlib.h header file for
- abort()
-
-We encountered the following error when building multipath-tools on
-qemuppc64 platform:
-
-| In file included from /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic/ppc.h:228,
-|                  from /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic.h:73,
-|                  from lock.h:5,
-|                  from lock.c:1:
-| /build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/recipe-sysroot/usr/include/urcu/uatomic/generic.h: In function '_uatomic_and':
-| /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]
-|   422 |                 oldt = uatomic_read((uint32_t *) addr);
-|       |                        ^~~~~~~~~~~~
-| /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'
-|   +++ |+#include <stdlib.h>
-|     1 | // SPDX-FileCopyrightText: 1991-1994 by Xerox Corporation.  All rights reserved.
-| make[1]: *** [../Makefile.inc:155: lock.o] Error 1
-| make[1]: Leaving directory '/build/tmp/work/ppc64p9le-wrs-linux/multipath-tools/0.10.0/git/libmultipath'
-
-Upstream-Status: Submitted [https://github.com/urcu/userspace-rcu/pull/28]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- include/urcu/uatomic/generic.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/urcu/uatomic/generic.h b/include/urcu/uatomic/generic.h
-index 5a81e00..5c8cb6c 100644
---- a/include/urcu/uatomic/generic.h
-+++ b/include/urcu/uatomic/generic.h
-@@ -15,6 +15,7 @@
-  */
- 
- #include <stdint.h>
-+#include <stdlib.h>
- #include <urcu/compiler.h>
- #include <urcu/system.h>
- 
--- 
-2.25.1
-
diff --git a/meta/recipes-support/liburcu/liburcu_0.15.0.bb b/meta/recipes-support/liburcu/liburcu_0.15.1.bb
similarity index 82%
rename from meta/recipes-support/liburcu/liburcu_0.15.0.bb
rename to 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 \
                     "
 
 
-SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
-           file://0001-uatomic-generic.h-add-missing-stdlib.h-header-file-f.patch \
-          "
+SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2"
 
-SRC_URI[sha256sum] = "4f2d839af67905ad396d6d53ba5649b66113d90840dcbc89941e0da64bccd38c"
+SRC_URI[sha256sum] = "98d66cc12f2c5881879b976f0c55d10d311401513be254e3bd28cf3811fb50c8"
 
 S = "${WORKDIR}/userspace-rcu-${PV}"
 inherit autotools multilib_header