diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/drbd')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb (renamed from meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb) | 9 | ||||
-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.18-1.bb (renamed from meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.17-1.bb) | 5 |
3 files changed, 8 insertions, 85 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb index 70e04b943..d708511d2 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb @@ -11,9 +11,9 @@ 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 \ " -# v9.8.0 -SRCREV_drbd-utils = "c30216b49330216bf8a567b7727da6e24f099f08" -SRCREV_drbd-headers = "2357a11fb49bcbadf6b490e6d4cfe982a3d24813" +# v9.10.0 +SRCREV_drbd-utils = "859151b228d3b3aacefb09d06d515a2589c22e35" +SRCREV_drbd-headers = "0955b3423f08f8e11ff05092bc1b766609fd804b" S = "${WORKDIR}/git" @@ -35,6 +35,9 @@ EXTRA_OECONF = " \ --without-manual \ " +# If we have inherited reproducible_build, we want to use it. +export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" + do_configure_prepend() { # move the the file under folder /lib/drbd/ to /usr/lib/drbd when usrmerge enabled if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then 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 deleted file mode 100644 index fbf94d513..000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch +++ /dev/null @@ -1,79 +0,0 @@ -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.17-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.18-1.bb index 1eada269c..6fb621a1f 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.17-1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.18-1.bb @@ -10,11 +10,10 @@ 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://0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch \ " -SRC_URI[md5sum] = "ae8d5030760b2820a4b3e250447890a0" -SRC_URI[sha256sum] = "86dd6cc0fdc8123056a3bb67a634cd7ba62a7b05b23caab9995cce7730891da8" +SRC_URI[md5sum] = "f2e6eaa92861252af0b564f0100f1859" +SRC_URI[sha256sum] = "d6b4188ed01d8555c78b04b5e31532d5990ca98bf063230f3e949ee8a7338d58" inherit module |