5 files changed, 59 insertions, 246 deletions

diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..00105fb844
--- /dev/null
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,34 @@
+From b42265af87d9efcc9aac91b3a3da3df5c5c66e29 Mon Sep 17 00:00:00 2001
+From: Nguyen Dat Tho <tho3.nguyen@lge.com>
+Date: Wed, 9 Apr 2025 17:33:25 +0900
+Subject: [PATCH] Fix build with gcc-15
+
+To fix the following error:
+In file included from string_matching.cpp:1:
+./string_matching.h:10:18: error: 'uint16_t' does not name a type
+   10 |     extern const uint16_t   PATTERN_LIMIT;
+      |                  ^~~~~~~~
+./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
+
+Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/50]
+
+Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
+---
+ user/drbdmon/string_matching.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/user/drbdmon/string_matching.h b/user/drbdmon/string_matching.h
+index 9b3918fe..b783ba48 100644
+--- a/user/drbdmon/string_matching.h
++++ b/user/drbdmon/string_matching.h
+@@ -4,6 +4,7 @@
+ #include <string>
+ #include <memory>
+ #include <stdexcept>
++#include <cstdint>
+ 
+ namespace string_matching
+ {
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch
deleted file mode 100644
index b98e1e70c7..0000000000
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001
-From: Yoann Congal <yoann.congal@smile.fr>
-Date: Sat, 2 Mar 2024 16:23:07 +0100
-Subject: [PATCH] configure.ac: Add an option to disable host udev version
- checks
-
-In cross-compilation environment, the build host might have an outdated
-udev or no udev at all. But the user may still want to build with the
-enabled udev rule (for its udev-enabled target).
-
-This patch adds a "--disable-udevchecks" option the disable build host
-udev version check at configure-time and unconditionally install the
-enabled udev rule. Without this new option, the behavior stays the same
-(checks enabled).
-
-Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
-Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a]
----
- configure.ac | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f1d69ea3..4c56d33b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,6 +71,11 @@ AC_ARG_WITH([udev],
-        [AS_HELP_STRING([--with-udev],
-                        [Enable udev integration])],
-        [WITH_UDEV=$withval])
-+AC_ARG_ENABLE([udevchecks],
-+       [AS_HELP_STRING([--disable-udevchecks],
-+                       [Disable host udev version checks])],
-+       [],
-+       [enable_udevchecks=yes])
- AC_ARG_WITH([xen],
-        [AS_HELP_STRING([--with-xen],
-                        [Enable Xen integration])],
-@@ -315,7 +320,7 @@ if test -z $GIT; then
-    AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.)
- fi
- 
--if test $UDEVADM = false && test $UDEVINFO = false; then
-+if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then
-    if test "$WITH_UDEV" = "yes"; then
-      AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.])
-    fi
-@@ -423,7 +428,7 @@ else
-     test -z $INITDIR && INITDIR="$sysconfdir/init.d"
- 
-     dnl Our udev rules file is known to work only with udev >= 85
--    if test "$WITH_UDEV" = "yes"; then
-+    if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then
-        udev_version=$( set -- $($UDEVADM version); echo $1 )
-        if test -z "$udev_version"; then
-            udev_version=$( set -- $($UDEVINFO -V); echo $3 )
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
index 27f0a9b54a..93cb8e185e 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
@@ -1,30 +1,21 @@
-From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001
+From a019fbe36ab965e754b818fe1bdb0cea0e3ffb60 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 21 Apr 2022 17:22:35 +0800
-Subject: [PATCH] drbd-utils: support usermerge
+Subject: [PATCH] drbd-utils: support usrmerge
 
 Upstream-Status: Inappropriate [oe-specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
 ---
- configure.ac                             |  2 +-
- scripts/Makefile.in                      | 10 +++++-----
- scripts/drbd-demote-or-escalate@.service |  2 +-
- scripts/drbd-promote@.service            |  4 ++--
- scripts/drbd-wait-promotable@.service    |  2 +-
- scripts/drbd.service                     |  6 +++---
- scripts/drbd@.service                    |  6 +++---
- scripts/ocf.ra@.service                  |  4 ++--
- user/v83/Makefile.in                     | 14 +++++++-------
- user/v84/Makefile.in                     | 14 +++++++-------
- 10 files changed, 32 insertions(+), 32 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f1d69ea3..3289ac7d 100644
+index 37148597..52015fb2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir,
+@@ -217,7 +217,7 @@ AC_ARG_WITH(tmpfilesdir,
  AC_SUBST(tmpfilesdir)
  
  # set default early
@@ -33,169 +24,6 @@ index f1d69ea3..3289ac7d 100644
  if test x"$with_udev" = x || \
     test x"$with_udev" = xyes ; then
         if test x"$PKG_CONFIG" != x; then
-diff --git a/scripts/Makefile.in b/scripts/Makefile.in
-index aca15a22..a1cd2ffe 100644
---- a/scripts/Makefile.in
-+++ b/scripts/Makefile.in
-@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
-        install -d $(DESTDIR)$(systemdunitdir)
-        install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/
-        install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
--       install -d $(DESTDIR)/lib/drbd/scripts
--       install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
--       install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
--       install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts
--       install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
-+       install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-        install -d $(DESTDIR)$(tmpfilesdir)/
-        install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
- endif
-diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service
-index 20932238..8b5ce4a2 100644
---- a/scripts/drbd-demote-or-escalate@.service
-+++ b/scripts/drbd-demote-or-escalate@.service
-@@ -28,5 +28,5 @@ TimeoutSec=60
- # "Type=forking" would be an option to have it retry a number of times,
- # and then only escalate to FailureAction if that did not help.
- Type=oneshot
--ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
- ExecStopPost=-/bin/journalctl --sync
-diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service
-index 71345d9b..678e0703 100644
---- a/scripts/drbd-promote@.service
-+++ b/scripts/drbd-promote@.service
-@@ -24,5 +24,5 @@ RemainAfterExit=yes
- # (ab)using systemd features
- # if we cannot configure and promote, that's a condition, not a failure
- # See the comment above wrt. FailureAction vs OnFailure
--ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I
--ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I
-+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I
-+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I
-diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service
-index 81c3789f..3416abc6 100644
---- a/scripts/drbd-wait-promotable@.service
-+++ b/scripts/drbd-wait-promotable@.service
-@@ -10,7 +10,7 @@ Type=oneshot
- 
- # on first start, wait for access to "good data"
- # let systemd handle timeouts
--ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I
- RemainAfterExit=yes
- 
- [Install]
-diff --git a/scripts/drbd.service b/scripts/drbd.service
-index 96c599e7..c81e95a6 100644
---- a/scripts/drbd.service
-+++ b/scripts/drbd.service
-@@ -12,11 +12,11 @@ RemainAfterExit=yes
- # A check for INIT_VERSION already exists, just set it to something.
- Environment=INIT_VERSION=systemd
- 
--ExecStart=/lib/drbd/scripts/drbd start
--ExecStop=/lib/drbd/scripts/drbd stop
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start
-+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop
- 
- # Re-adjust everything on reload
--ExecReload=/lib/drbd/scripts/drbd reload
-+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/scripts/drbd@.service b/scripts/drbd@.service
-index 0fad10be..556f3857 100644
---- a/scripts/drbd@.service
-+++ b/scripts/drbd@.service
-@@ -35,8 +35,8 @@ RemainAfterExit=yes
- 
- # depends... do we want this as ExecCondition or as ExecStart
- # failed start is "failed", failed condition is just "not startable yet"
--ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
--ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
-+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
- 
- # can only succeed, if you first stop all depending services
--ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I
-+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I
-diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service
-index 9c2268a6..1666c482 100644
---- a/scripts/ocf.ra@.service
-+++ b/scripts/ocf.ra@.service
-@@ -22,5 +22,5 @@ Environment=monitor_inverval=30
- # Only the first argument is used by the wrapper,
- # the %n is just to identify which is which in the process list.
- # All parameterization is done via Environment= in per instance override.conf
--ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n
--ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n
-+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n
-+ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n
-diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in
-index 08cfe574..4c4971b6 100644
---- a/user/v83/Makefile.in
-+++ b/user/v83/Makefile.in
-@@ -96,19 +96,19 @@ install:
- ifeq ($(WITH_83_SUPPORT),yes)
-        install -d $(DESTDIR)$(localstatedir)/lib/drbd
-        install -d $(DESTDIR)$(localstatedir)/lock
--       install -d $(DESTDIR)/lib/drbd/
-+       install -d $(DESTDIR)/${nonarch_libdir}/drbd/
-        if getent group haclient > /dev/null 2> /dev/null ; then                \
--               install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
--               install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ;                \
-+               install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ;   \
-+               install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ;          \
-        else                                                                    \
--               install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ;              \
--               install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ;                \
-+               install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ;                \
-+               install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ;          \
-        fi
- endif
- 
- uninstall:
--       rm -f $(DESTDIR)/lib/drbd/drbdsetup-83
--       rm -f $(DESTDIR)/lib/drbd/drbdadm-83
-+       rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83
-+       rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83
- 
- .PHONY: install uninstall clean distclean
- ../../configure:
-diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
-index 0fcefc5f..81f7d5ec 100644
---- a/user/v84/Makefile.in
-+++ b/user/v84/Makefile.in
-@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
-        install -d $(DESTDIR)$(localstatedir)/lib/drbd
-        install -d $(DESTDIR)$(localstatedir)/run/drbd
-        install -d $(DESTDIR)$(localstatedir)/lock
--       install -d $(DESTDIR)/lib/drbd/
-+       install -d $(DESTDIR)/${nonarch_libdir}/drbd/
-        if getent group haclient > /dev/null 2> /dev/null ; then        \
--               install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
--               install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ;                \
-+               install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;   \
-+               install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;          \
-        else                                                            \
--               install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ;              \
--               install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ;                \
-+               install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;                \
-+               install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;          \
-        fi
- endif
- 
- uninstall:
--       rm -f $(DESTDIR)/lib/drbd/drbdsetup-84
--       rm -f $(DESTDIR)/lib/drbd/drbdadm-84
-+       rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84
-+       rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84
- 
- spell:
-        for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
index c7766067a1..ac2626c1c8 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
@@ -1,4 +1,4 @@
-From bb044160faf4ae7615ddfdb17641dd88c33cde57 Mon Sep 17 00:00:00 2001
+From 26ed5003847a14a16d0c1d4030aa1a361c0289fb Mon Sep 17 00:00:00 2001
 From: Sakib Sajal <sakib.sajal@windriver.com>
 Date: Thu, 31 Mar 2022 15:09:58 -0400
 Subject: [PATCH] drbdmon: add LDFLAGS when linking
@@ -7,11 +7,11 @@ Upstream-Status: Pending
 
 Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
 ---
- user/drbdmon/Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ user/drbdmon/Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in
-index 7bd8987e..115a81b8 100644
+index 9c5427e9..0101a60b 100644
 --- a/user/drbdmon/Makefile.in
 +++ b/user/drbdmon/Makefile.in
 @@ -1,6 +1,6 @@
@@ -22,12 +22,19 @@ index 7bd8987e..115a81b8 100644
  CXX = @CXX@
  LIBS = @LIBS@
  
-@@ -72,7 +72,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
+@@ -76,10 +76,10 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
  $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h
  
  drbdmon: $(ls-obj)
 -       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS)
 +       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS)
  
+ drbd-events-log-supplier: $(supplier-obj)
+-       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^
++       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^
+ 
  # do not try to rebuild Makefile itself
  Makefile: ;
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb
index 63f0fd18c1..4c520e8c78 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb
@@ -8,17 +8,16 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
 SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \
-           git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \
+           git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/drbd-headers;branch=master;protocol=https \
            file://0001-drbdmon-add-LDFLAGS-when-linking.patch \
            ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \
-           file://0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch \
+           file://0001-Fix-build-with-gcc-15.patch \
            "
-SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e"
-SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a"
+SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9"
+SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc"
 
 SRCREV_FORMAT = "drbd-utils_drbd-headers"
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases"