3 files changed, 10 insertions, 95 deletions

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..ef0229d5bb 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,4 +1,4 @@
-From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001
+From 9109f15f5b8ae142823194b9ef50c392615fe38d 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
@@ -16,15 +16,14 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
  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(-)
+ 9 files changed, 25 insertions(+), 25 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f1d69ea3..3289ac7d 100644
+index d3ec5ff1..910232b1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir,
+@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir,
  AC_SUBST(tmpfilesdir)
  
  # set default early
@@ -34,10 +33,10 @@ index f1d69ea3..3289ac7d 100644
     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
+index 15a26f37..ff028310 100644
 --- a/scripts/Makefile.in
 +++ b/scripts/Makefile.in
-@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
+@@ -90,11 +90,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)/
@@ -137,37 +136,6 @@ index 9c2268a6..1666c482 100644
 -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
@@ -199,3 +167,6 @@ index 0fcefc5f..81f7d5ec 100644
  
  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_9.27.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb
index 63f0fd18c1..af0afc2a91 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb
@@ -11,9 +11,8 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot
            git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/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 \
            "
-SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e"
+SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1"
 SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a"
 
 SRCREV_FORMAT = "drbd-utils_drbd-headers"