diff mbox series

[meta-oe,15/15] sanlock: upgrade 3.9.1 -> 3.9.2

Message ID 1713777345-29264-15-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,01/15] asio: upgrade 1.28.0 -> 1.30.2 | expand

Commit Message

Mingyu Wang (Fujitsu) April 22, 2024, 9:15 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-include-libgen.h-for-basename.patch
removed since it's included in 3.9.2

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-include-libgen.h-for-basename.patch  | 32 -------------------
 .../{sanlock_3.9.1.bb => sanlock_3.9.2.bb}    |  5 ++-
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch
 rename meta-oe/recipes-extended/sanlock/{sanlock_3.9.1.bb => sanlock_3.9.2.bb} (93%)
diff mbox series

Patch

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 @@ 
-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
similarity index 93%
rename from meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb
rename to 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"
 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"