diff mbox series

[meta-networking,21/24] drbd-utils: upgrade 9.34.0 -> 9.35.0

Message ID 20261112064225.2410019-21-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-networking,01/24] frr: upgrade 10.6.2 -> 10.7.1 | expand

Commit Message

Khem Raj Nov. 12, 2026, 6:42 a.m. UTC
Update the drbd-headers submodule revision to the one used by the
v9.35.0 tag and refresh 0001-fix-the-hardcoded-legacy-helper-path.patch.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...001-fix-the-hardcoded-legacy-helper-path.patch | 15 ++++++---------
 ...{drbd-utils_9.34.0.bb => drbd-utils_9.35.0.bb} |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)
 rename meta-networking/recipes-support/drbd/{drbd-utils_9.34.0.bb => drbd-utils_9.35.0.bb} (96%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch
index 3d7c95b4a8..49c3340790 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch
@@ -23,22 +23,22 @@  Signed-off-by: Haiqing Bai <haiqing.bai@windriver.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/user/v9/Makefile.in b/user/v9/Makefile.in
-index fa12f79..980c67c 100644
+index cf23ca1..77bf201 100644
 --- a/user/v9/Makefile.in
 +++ b/user/v9/Makefile.in
-@@ -70,6 +70,7 @@ CFLAGS += -DKEYUTILS
+@@ -72,6 +72,7 @@ CFLAGS += -DKEYUTILS
  endif
  ifeq ($(WITH_84_SUPPORT),yes)
  CFLAGS += -DWITH_84_SUPPORT
 +CFLAGS += -DDRBD_LEGACY_LIB_DIR=\"$(LIBDIR)\"
  endif
- CFLAGS += $(EXTRA_CFLAGS)
- 
+ ifneq ($(filter local package,$(ENABLE_COVERAGE)),)
+ CFLAGS += --coverage
 diff --git a/user/v9/drbdtool_common.c b/user/v9/drbdtool_common.c
-index d07d054..ea95a16 100644
+index f85a067..403ceac 100644
 --- a/user/v9/drbdtool_common.c
 +++ b/user/v9/drbdtool_common.c
-@@ -332,8 +332,7 @@ void add_component_to_path(const char *path)
+@@ -334,8 +334,7 @@ void add_component_to_path(const char *path)
  
  void add_lib_drbd_to_path(void)
  {
@@ -48,6 +48,3 @@  index d07d054..ea95a16 100644
  }
  
  /* from linux/crypto/crc32.c */
--- 
-2.53.0
-
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.34.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.35.0.bb
similarity index 96%
rename from meta-networking/recipes-support/drbd/drbd-utils_9.34.0.bb
rename to meta-networking/recipes-support/drbd/drbd-utils_9.35.0.bb
index abc406b5e0..4bd313823c 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.34.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.35.0.bb
@@ -13,8 +13,8 @@  SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot
            ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \
            file://0001-fix-the-hardcoded-legacy-helper-path.patch \
            "
-SRCREV_drbd-utils = "7fe34d56a7264cfc92fc5270471827bb3f7773e6"
-SRCREV_drbd-headers = "8ab631bfa8eb606e53c86f50b9f2d6f51d0f9ca5"
+SRCREV_drbd-utils = "e1e02e77e6d068f626cef7c3998ed08b0fde7669"
+SRCREV_drbd-headers = "bdf8650ea6e32d1c4518b7ad6c2d7469896d17ff"
 
 SRCREV_FORMAT = "drbd-utils_drbd-headers"