mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

drbd-utils: update 9.13.1 -> 9.20.2

Browse Source 
Dropped patch which is merged upstream:
	0001-v84-Make-setup_options-definitions-as-extern.patch

Refreshed patch:
	0001-drbd-utils-support-usrmerge.patch

The compiled binaries are not linked to LDFLAGS options provided
by the build system cause QA issue:
	do_package_qa: QA Issue: File /usr/sbin/drbdmon in package
	drbd-utils doesn't have GNU_HASH (didn't pass LDFLAGS?)
Add LDFLAGS when linking drmdmon binary.

Suppress new Clang warning -Wdefaulted-function-deleted and -Wunused-private-field

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Sakib Sajal
2022-04-06 12:35:57 -04:00
committed by Khem Raj
parent 6305aacfde
commit ae60e9869b
4 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
+23 -16
View File
@@ -1,4 +1,4 @@
From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001
From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 5 Sep 2019 18:57:39 +0800
Subject: [PATCH] drbd-utils: support usrmerge
@@ -6,18 +6,19 @@ Subject: [PATCH] drbd-utils: support usrmerge
Upstream-Status: Inappropriate[oe-specific]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
---
configure.ac | 2 +-
scripts/Makefile.in | 4 ++--
scripts/Makefile.in | 10 +++++-----
user/v83/Makefile.in | 14 +++++++-------
user/v84/Makefile.in | 14 +++++++-------
4 files changed, 17 insertions(+), 17 deletions(-)
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4df1b4d..c4ef1bc 100644
index ae575586..3d7deeae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir,
@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir,
AC_SUBST(tmpfilesdir)
# set default early
@@ -27,22 +28,28 @@ index 4df1b4d..c4ef1bc 100644
test x"$with_udev" = xyes ; then
if test x"$PKG_CONFIG" != x; then
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index fbb0beb..da701a1 100644
index fcd298e9..2521fb08 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -75,8 +75,8 @@ endif
ifeq ($(subst both,systemd,$(initscripttype)),systemd)
@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
install -d $(DESTDIR)$(systemdunitdir)
install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
- install -d $(DESTDIR)/lib/drbd/
- install -m 755 drbd $(DESTDIR)/lib/drbd/
+ install -d $(DESTDIR)/${nonarch_libdir}/drbd
+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd
install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
- install -d $(DESTDIR)/lib/drbd/scripts
- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts
- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
+ install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts
+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts
+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts
+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts
+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts
install -d $(DESTDIR)$(tmpfilesdir)/
install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
endif
diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in
index 27516de..b301376 100644
index 08cfe574..4c4971b6 100644
--- a/user/v83/Makefile.in
+++ b/user/v83/Makefile.in
@@ -96,19 +96,19 @@ install:
@@ -73,10 +80,10 @@ index 27516de..b301376 100644
.PHONY: install uninstall clean distclean
../../configure:
diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
index 38977c6..05ef060 100644
index 0fcefc5f..81f7d5ec 100644
--- a/user/v84/Makefile.in
+++ b/user/v84/Makefile.in
@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
install -d $(DESTDIR)$(localstatedir)/lib/drbd
install -d $(DESTDIR)$(localstatedir)/run/drbd
install -d $(DESTDIR)$(localstatedir)/lock
@@ -104,5 +111,5 @@ index 38977c6..05ef060 100644
spell:
for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
--
2.7.4
2.33.0
meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
+29
View File
@@ -0,0 +1,29 @@
From a61b9ff2d2cb7387a5cd347b2201535ee45a46ee Mon Sep 17 00:00:00 2001
From: Sakib Sajal <sakib.sajal@windriver.com>
Date: Thu, 31 Mar 2022 15:09:58 -0400
Subject: [PATCH] drbdmon: add LDFLAGS when linking
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
---
user/drbdmon/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/user/drbdmon/Makefile.in
+++ b/user/drbdmon/Makefile.in
@@ -1,6 +1,6 @@
CXXFLAGS=-std=c++11 -I. -I../shared -Icppdsaext/src -Wall -Werror -pedantic-errors -fPIC -O2 \
-Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits \
--Wmissing-declarations -Wshadow
+-Wmissing-declarations -Wshadow -Wno-defaulted-function-deleted -Wno-unused-private-field
CXX = @CXX@
LIBS = @LIBS@
@@ -51,7 +51,7 @@ $(dsaext-obj): $(basename $(dsaext-obj))
$(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h
drbdmon: $(ls-obj)
- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS)
+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS)
# do not try to rebuild Makefile itself
Makefile: ;
meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch
-32
View File
@@ -1,32 +0,0 @@
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
meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb → meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb
+7 -4
View File
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \
git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \
file://0001-v84-Make-setup_options-definitions-as-extern.patch \
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \
file://0001-drbdmon-add-LDFLAGS-when-linking.patch \
"
SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918"
SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087"
SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8"
SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7"
SRCREV_FORMAT = "drbd-utils_drbd-headers"
@@ -56,7 +56,10 @@ RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module
FILES:${PN} += "/run"
FILES:${PN} += "${nonarch_base_libdir}/drbd \
${nonarch_libdir}/drbd \
${nonarch_libdir}/tmpfiles.d"
${nonarch_libdir}/tmpfiles.d \
${nonarch_libdir}/drbdscripts/* \
${systemd_unitdir}/system/* \
"
FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug"
CLEANBROKEN = "1"