aboutsummaryrefslogtreecommitdiffstats
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-30 10:59:07 -0700
commitd76329247ae6721efc632cd542c37cb807fc8470 (patch)
tree28d80bcaffd2b4f24da05c6cf7a7787af372aa20
parent11998cf015f8b48531a4f0bfb5d5f986c9ea028f (diff)
downloadmeta-openembedded-contrib-d76329247ae6721efc632cd542c37cb807fc8470.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 439ffc6473..0000000000
--- a/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c955ac2a4d57f21351e53a5209346fdc2325a747 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Mar 2024 15:12:02 -0700
-Subject: [PATCH] include libgen.h for basename
-
-basename prototype has been removed from string.h from latest musl [1]
-compilers e.g. clang-18 flags the absense of prototype as error. therefore
-include libgen.h for providing it.
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- wdmd/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/wdmd/main.c b/wdmd/main.c
-index 38a99f3..7014462 100644
---- a/wdmd/main.c
-+++ b/wdmd/main.c
-@@ -15,6 +15,7 @@
- #include <stddef.h>
- #include <grp.h>
- #include <fcntl.h>
-+#include <libgen.h>
- #include <string.h>
- #include <errno.h>
- #include <limits.h>
---
-2.44.0
-
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 1d0f8b0103..d369af1c6a 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"
SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
file://0001-add-missing-system-header-string.h.patch \
- file://0001-include-libgen.h-for-basename.patch \
- "
-SRCREV = "ecf30a1ccf756776dfea440e4cf9b0b54581075f"
+ "
+SRCREV = "e005fbec2324aa8de7e2f302e5a17483c525b1d1"
S = "${WORKDIR}/git"