diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/drbd')
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch | 43 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb (renamed from meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb) | 10 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch | 79 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.17-1.bb (renamed from meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.16-1.bb) | 8 |
4 files changed, 89 insertions, 51 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch deleted file mode 100644 index c0f3adf240..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch +++ /dev/null @@ -1,43 +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 - -Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/2] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> - -[ refresh to 8.4.4: squash Aws' and Jason's patches ] -Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com> - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -Signed-off-by: Changqing Li <changqing.li@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-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb index bd1e8576f3..70e04b943c 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ - file://0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch \ " -# v9.5.0 -SRCREV_drbd-utils = "ee126652638328b55dc6bff47d07d6161ab768db" -SRCREV_drbd-headers = "b47cc11bcabe1a65c40ad23f71dcaf2da6419630" +# v9.8.0 +SRCREV_drbd-utils = "c30216b49330216bf8a567b7727da6e24f099f08" +SRCREV_drbd-headers = "2357a11fb49bcbadf6b490e6d4cfe982a3d24813" S = "${WORKDIR}/git" @@ -48,8 +47,9 @@ do_configure_prepend() { } do_install_append() { - # don't install empty /var/lock to avoid conflict with base-files + # don't install empty /var/lock and /var/run to avoid conflict with base-files rm -rf ${D}${localstatedir}/lock + rm -rf ${D}${localstatedir}/run } RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch new file mode 100644 index 0000000000..fbf94d5136 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch @@ -0,0 +1,79 @@ +Upstream-Status: Backport [https://github.com/LINBIT/drbd-9.0/commit/46e8e3f] + +Backport patch to fix compile errors: + +| LD [M] /home/kkang/buildarea/Yocto/build/tmp/work/qemux86_64-poky-linux/drbd/9.0.17-1-r0/drbd-9.0.17-1/drbd/drbd.o +| x86_64-poky-linux-ld.bfd: cannot find .../tmp/work/qemux86_64-poky-linux/drbd/9.0.17-1-r0/drbd-9.0.17-1/drbd/drbd_bitmap.o: No such file or directory + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +From 46e8e3fc31b651fb56ea38134dcf14382fc43000 Mon Sep 17 00:00:00 2001 +From: Lars Ellenberg <lars.ellenberg@linbit.com> +Date: Wed, 3 Apr 2019 10:57:46 +0200 +Subject: [PATCH] drbd: kbuild fix: use M=; don't forget addprefix $(obj) + +Kernel build started to warn about using SUBDIRS instead of M, +and we don't support "very old" kernels anymore anyways. + +Our list of dependencies for drbd_buildtag.c needs to depend on the +actual files $(obj)/*.o resulting from the build, +not on just the list of *.o names. + +This apparently also fixes a build failure in opensuse build service for +tumbleweed when using make-4.2.1-7.5 against kernel 5.0.5-something. +--- + drbd/Kbuild | 11 +++++------ + drbd/Makefile | 4 +--- + 2 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/drbd/Kbuild b/drbd/Kbuild +index 285f7a81..99228029 100644 +--- a/drbd/Kbuild ++++ b/drbd/Kbuild +@@ -1,4 +1,5 @@ +-obj-m := drbd.o drbd_transport_tcp.o ++obj-m += drbd.o drbd_transport_tcp.o ++# obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o drbd_transport_tcp.o + + clean-files := compat.h $(wildcard .config.$(KERNELVERSION).timestamp) + +@@ -56,10 +57,8 @@ ifndef DISABLE_KREF_DEBUGGING_HERE + drbd-y += kref_debug.o drbd_kref_debug.o + endif + +-$(patsubst %,$(obj)/%,$(drbd-y)): $(obj)/compat.h +-$(patsubst %,$(obj)/%,drbd_transport_tcp.o): $(obj)/compat.h +- +-obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o ++$(addprefix $(obj)/,$(drbd-y)): $(obj)/compat.h ++$(obj)/drbd_transport_tcp.o: $(obj)/compat.h + + # ====================================================================== + +@@ -124,7 +123,7 @@ endif + # and not in e.g. dash. I'm too lazy to fix it to be compatible. + SHELL=/bin/bash + +-$(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y)) ++$(obj)/drbd_buildtag.c: $(addprefix $(obj)/,$(filter-out drbd_buildtag.o,$(drbd-y))) + @$(kecho) ' GEN $@ $(echo-why)' + @set -e; exec > $@.new; \ + echo -e "/* automatically generated. DO NOT EDIT. */"; \ +diff --git a/drbd/Makefile b/drbd/Makefile +index 5f768fc6..f9e8792a 100644 +--- a/drbd/Makefile ++++ b/drbd/Makefile +@@ -102,9 +102,7 @@ else + + kbuild: + @rm -f .drbd_kernelrelease* +- # previous to 2.6.6 (suse: 2.6.5-dunno), this should be: +- $(MAKE) -C $(KDIR) $(if $(O),O=$(O),) SUBDIRS=$(DRBDSRC) $(ARCH_UM) modules +-# $(MAKE) -C $(KDIR) M=$(DRBDSRC) $(ARCH_UM) modules ++ $(MAKE) -C $(KDIR) $(if $(O),O=$(O),) M=$(DRBDSRC) $(ARCH_UM) modules + -mv .drbd_kernelrelease.new .drbd_kernelrelease + @echo -n "Memorizing module configuration ... " + @config=$$( (for x in $(KDIR)/.config $(O)/.config ; do \ +-- +2.20.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.16-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.17-1.bb index 8794c4f917..1eada269cb 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.16-1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.17-1.bb @@ -9,10 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" DEPENDS = "virtual/kernel" SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ - file://check_existence_of_modules_before_installing.patch" + file://check_existence_of_modules_before_installing.patch \ + file://0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch \ + " -SRC_URI[md5sum] = "6414a9eef2807c8210b6403e36ce3ea4" -SRC_URI[sha256sum] = "6074b0d643f4bbae4641d3b4bc30f4840e74f2a212dd9c6555b8141e530e5789" +SRC_URI[md5sum] = "ae8d5030760b2820a4b3e250447890a0" +SRC_URI[sha256sum] = "86dd6cc0fdc8123056a3bb67a634cd7ba62a7b05b23caab9995cce7730891da8" inherit module |