It is already in the source, fixed do_patch failure:
Patch 0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch is
already applied; check your series file
ERROR: drbd-utils-8.9.6-r0 do_patch: Function failed: patch_do_patch
Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
---
...drbd-tools-only-rmmod-if-DRBD-is-a-module.patch | 39 ----------------------
.../recipes-support/drbd/drbd-utils_8.9.6.bb | 1 -
2 files changed, 40 deletions(-)
delete mode 100644
meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch
diff --git
a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch
b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch
deleted file mode 100644
index add0b030c..000000000
---
a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Subject: drbd-tools: only rmmod if DRBD is a module
-
-Account for the case if the DRBD drive is built into
-the kernel. Otherwise, errors, like the following,
-will occur:
-
-root@localhost:~# /etc/init.d/drbd stop
- Stopping all DRBD resources: ERROR: Module drbd does not exist in
- /proc/modules
-
-Signed-off-by: Aws Ismail <aws.ism...@windriver.com>
-Signed-off-by: Jason Wessel <jason.wes...@windriver.com>
-
-[ refresh to 8.4.4: squash Aws' and Jason's patches ]
-Signed-off-by: Michel Thebeau <michel.theb...@windriver.com>
-
-Signed-off-by: Chen Qi <qi.c...@windriver.com>
----
- scripts/drbd | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/drbd b/scripts/drbd
-index 20bf628..de589dc 100755
---- a/scripts/drbd
-+++ b/scripts/drbd
-@@ -241,7 +241,9 @@ case "$1" in
- if [ -d /sys/module/drbd/holders ]; then
- (cd /sys/module/drbd/holders; for tr in *; do [ -d
${tr} ] && ${RMMOD} ${tr}; done)
- fi
-- $RMMOD drbd && break
-+ if [ ! -z "$(cat /proc/modules | grep -w drbd)" ]; then
-+ $RMMOD drbd && break
-+ fi
- fi
- done
- run_hook stop
---
-1.9.1
-
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
b/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
index 5979fbb58..5f6c43f7e 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
SRC_URI = "http://oss.linbit.com/drbd/${BP}.tar.gz \
file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \
-
file://0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch \
"
SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b"
SRC_URI[sha256sum] =
"297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913"
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
