From bd499150d29a7c62d706f85ca5d879b2db772192 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Aug 2020 13:09:08 -0700 Subject: drbd-utils: Uphgrade to 9.13.1 Fix build with gcc10 Signed-off-by: Khem Raj --- ...-Make-setup_options-definitions-as-extern.patch | 32 +++++++++++ .../recipes-support/drbd/drbd-utils_9.12.0.bb | 60 --------------------- .../recipes-support/drbd/drbd-utils_9.13.1.bb | 62 ++++++++++++++++++++++ 3 files changed, 94 insertions(+), 60 deletions(-) create mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch delete mode 100644 meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb create mode 100644 meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb (limited to 'meta-networking/recipes-support/drbd') diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch new file mode 100644 index 0000000000..6702f3bde4 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch @@ -0,0 +1,32 @@ +From d095caf6f8f77fe056fb90ccd5d89c207a7f346d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 12:59:38 -0700 +Subject: [PATCH] v84: Make setup_options definitions as extern + +This is already defined in drbdadm_main.c, therefore make this +declaration to be extern for other modules + +Fixes compatibility with gcc-10 which uses -fno-common by default + +Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/7] +Signed-off-by: Khem Raj +--- + user/v84/drbdadm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/user/v84/drbdadm.h b/user/v84/drbdadm.h +index ed63d78c..8469f1c4 100644 +--- a/user/v84/drbdadm.h ++++ b/user/v84/drbdadm.h +@@ -251,7 +251,7 @@ struct setup_option { + bool explicit; + char *option; + }; +-struct setup_option *setup_options; ++extern struct setup_option *setup_options; + + extern void add_setup_option(bool explicit, char *option); + +-- +2.28.0 + diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb deleted file mode 100644 index 5dabdd51d0..0000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Distributed block device driver for Linux" -DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ -DRBD mirrors a block device over the network to another machine.\ -Think of it as networked raid 1. It is a building block for\ -setting up high availability (HA) clusters." -HOMEPAGE = "http://www.drbd.org/" -SECTION = "admin" -LICENSE = "GPLv2+" -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 \ - ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ - " -# v9.12.0 -SRCREV_drbd-utils = "91629a4cce49ca0d4f917fe0bffa25cfe8db3052" -SRCREV_drbd-headers = "233006b4d26cf319638be0ef6d16ec7dee287b66" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" - -SYSTEMD_SERVICE_${PN} = "drbd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -DEPENDS = "flex-native" - -inherit autotools-brokensep systemd - -EXTRA_OECONF = " \ - --with-initdir=/etc/init.d \ - --without-pacemaker \ - --without-rgmanager \ - --without-bashcompletion \ - --with-distro debian \ - --with-initscripttype=both \ - --with-systemdunitdir=${systemd_unitdir}/system \ - --without-manual \ - " - -# If we have inherited reproducible_build, we want to use it. -export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" - -do_install_append() { - # 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" - -# The drbd items are explicitly put under /lib when installed. -# -FILES_${PN} += "/run" -FILES_${PN} += "${nonarch_base_libdir}/drbd \ - ${nonarch_libdir}/drbd \ - ${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" - -CLEANBROKEN = "1" diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb new file mode 100644 index 0000000000..5b0979f961 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb @@ -0,0 +1,62 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ +DRBD mirrors a block device over the network to another machine.\ +Think of it as networked raid 1. It is a building block for\ +setting up high availability (HA) clusters." +HOMEPAGE = "http://www.drbd.org/" +SECTION = "admin" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" + +SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV} \ + git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ + file://0001-v84-Make-setup_options-definitions-as-extern.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ + " +SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" +SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" + +SRCREV_FORMAT = "drbd-utils_drbd-headers" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" + +SYSTEMD_SERVICE_${PN} = "drbd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +DEPENDS = "flex-native" + +inherit autotools-brokensep systemd + +EXTRA_OECONF = " \ + --with-initdir=/etc/init.d \ + --without-pacemaker \ + --without-rgmanager \ + --without-bashcompletion \ + --with-distro debian \ + --with-initscripttype=both \ + --with-systemdunitdir=${systemd_unitdir}/system \ + --without-manual \ + " + +# If we have inherited reproducible_build, we want to use it. +export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" + +do_install_append() { + # 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" + +# The drbd items are explicitly put under /lib when installed. +# +FILES_${PN} += "/run" +FILES_${PN} += "${nonarch_base_libdir}/drbd \ + ${nonarch_libdir}/drbd \ + ${nonarch_libdir}/tmpfiles.d" +FILES_${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" + +CLEANBROKEN = "1" -- cgit v1.2.3-54-g00ecf