summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-04-22 17:15:45 +0800
committerKhem Raj <raj.khem@gmail.com>2024-04-22 22:59:31 -0700
commitbf9b8af24994979b4958d45e95884b77da682c4c (patch)
treec10877bac86e74ff380485cdf94ba92010925887
parentc139b299e5384a7edbebddfc08bd52ffe3675c24 (diff)
downloadmeta-openembedded-bf9b8af24994979b4958d45e95884b77da682c4c.tar.gz
sanlock: upgrade 3.9.1 -> 3.9.2
0001-include-libgen.h-for-basename.patch removed since it's included in 3.9.2 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch32
-rw-r--r--meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb (renamed from meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb)5
2 files changed, 2 insertions, 35 deletions
diff --git a/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch
deleted file mode 100644
index 439ffc647..000000000
--- a/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From c955ac2a4d57f21351e53a5209346fdc2325a747 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Mar 2024 15:12:02 -0700
4Subject: [PATCH] include libgen.h for basename
5
6basename prototype has been removed from string.h from latest musl [1]
7compilers e.g. clang-18 flags the absense of prototype as error. therefore
8include libgen.h for providing it.
9
10[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
11
12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 wdmd/main.c | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/wdmd/main.c b/wdmd/main.c
19index 38a99f3..7014462 100644
20--- a/wdmd/main.c
21+++ b/wdmd/main.c
22@@ -15,6 +15,7 @@
23 #include <stddef.h>
24 #include <grp.h>
25 #include <fcntl.h>
26+#include <libgen.h>
27 #include <string.h>
28 #include <errno.h>
29 #include <limits.h>
30--
312.44.0
32
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb
index 1d0f8b010..d369af1c6 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb
@@ -16,9 +16,8 @@ PV .= "+git"
16SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ 16SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
17 file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ 17 file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
18 file://0001-add-missing-system-header-string.h.patch \ 18 file://0001-add-missing-system-header-string.h.patch \
19 file://0001-include-libgen.h-for-basename.patch \ 19 "
20 " 20SRCREV = "e005fbec2324aa8de7e2f302e5a17483c525b1d1"
21SRCREV = "ecf30a1ccf756776dfea440e4cf9b0b54581075f"
22 21
23S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
24 23