helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 18:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

drbd-utils: Uphgrade to 9.13.1

Browse Source 
Fix build with gcc10

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2020-08-12 13:09:08 -07:00
parent 4928a2b6e9
commit bd499150d2
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch Normal file
View File

@ -0,0 +1,32 @@
From d095caf6f8f77fe056fb90ccd5d89c207a7f346d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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

10
meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb → meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb
View File

@ -8,13 +8,15 @@ SECTION = "admin"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \
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)} \
"
# v9.12.0
SRCREV_drbd-utils = "91629a4cce49ca0d4f917fe0bffa25cfe8db3052"
SRCREV_drbd-headers = "233006b4d26cf319638be0ef6d16ec7dee287b66"
SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918"
SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087"
SRCREV_FORMAT = "drbd-utils_drbd-headers"
S = "${WORKDIR}/git"