diff mbox series

[meta-networking,086/109] drbd: upgrade 9.3.2 -> 9.3.3

Message ID 20260814224539.1523174-86-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,001/109] xorg-docs: upgrade 1.7.2 -> 1.7.3 | expand

Commit Message

Khem Raj Aug. 14, 2026, 10:45 p.m. UTC 
This release includes all fixes from 9.2.19 (silent data divergence
and corruption fixes for diskless primaries, false split-brain fix,
list corruption/AB-BA deadlock/use-after-free fixes during connection
teardown, RDMA transport bug fixes) plus new lb-tcp path add/remove
support and a TLS connection page-reference leak fix.

Drop check_existence_of_modules_before_installing.patch: it no longer
applies (confirmed it already fails to apply against the unmodified
9.3.2 source too, since SKIP_RECIPE normally prevents do_patch from
ever running for this recipe). The install-time "module not built"
problem it guarded against is now handled by upstream's own rewritten
drbd/Makefile install logic: the KDIR path now delegates to kbuild's
own modules_install target, and the non-KDIR fallback only globs
*.ko files that actually exist via find | cpio. Neither path can hit
the old "install: cannot stat" failure the patch was working around.

Verified do_fetch/do_unpack/do_patch succeed cleanly with the new
tarball and without the patch (SKIP_RECIPE temporarily lifted for
testing). do_compile still requires coccinelle/spatch or network
access to spaas.drbd.io, neither available in this sandbox, matching
the existing SKIP_RECIPE annotation - not a regression.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...istence_of_modules_before_installing.patch | 24 -------------------
 .../drbd/{drbd_9.3.2.bb => drbd_9.3.3.bb}     |  3 +--
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch
 rename meta-networking/recipes-support/drbd/{drbd_9.3.2.bb => drbd_9.3.3.bb} (82%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch b/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch
deleted file mode 100644
index 6414f7305a..0000000000
--- a/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
-If CONFIG_BLK_DEV_DRBD kernel config is enabled, then DRBD
-does not build drbd.ko here. Under this circumstance do_install
-task is going to fail with a below error:
--- snip --
-| install: cannot stat ‘drbd.ko’: No such file or directory
-| make[1]: *** [install] Error 1
--- snip --
-
-So, check for kernel module existence before installing.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
---- drbd-9.0.1-1/drbd/Makefile	2016-07-03 06:54:19.421538690 -0700
-+++ drbd-9.0.1-1/drbd/Makefile_mod	2016-07-03 06:53:18.938801628 -0700
-@@ -158,7 +158,7 @@ else
- 	fi
- 	install -d $(DESTDIR)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR)
- 	set -e ; for ko in $(MODOBJS); do \
--		install -m 644 $$ko $(DESTDIR)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR); \
-+		[ -e $$ko ] && install -m 644 $$ko $(DESTDIR)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR); \
- 	done
-     ifeq ($(DESTDIR),/)
-       ifeq ($(shell uname -r),$(KERNELRELEASE))
diff --git a/meta-networking/recipes-support/drbd/drbd_9.3.2.bb b/meta-networking/recipes-support/drbd/drbd_9.3.3.bb
similarity index 82%
rename from meta-networking/recipes-support/drbd/drbd_9.3.2.bb
rename to meta-networking/recipes-support/drbd/drbd_9.3.3.bb
index dafda8ea04..86082a2c39 100644
--- a/meta-networking/recipes-support/drbd/drbd_9.3.2.bb
+++ b/meta-networking/recipes-support/drbd/drbd_9.3.3.bb
@@ -9,9 +9,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 DEPENDS = "virtual/kernel"
 
 SRC_URI = "https://pkg.linbit.com//downloads/drbd/9/${BP}.tar.gz \
-           file://check_existence_of_modules_before_installing.patch \
            "
-SRC_URI[sha256sum] = "5ad57634d4b6c118e92080ab5b66e01969ebb251d9ca01562d23598bf3b166fe"
+SRC_URI[sha256sum] = "a7bfb016070c31df1c738569ca8cc5e5fc337dd449147f7bf62e746d87d38f21"
 
 inherit module