mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-02 15:45:16 +00:00
ae60e9869b
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>
116 lines
4.6 KiB
Diff
116 lines
4.6 KiB
Diff
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
|
|
|
|
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 | 10 +++++-----
|
|
user/v83/Makefile.in | 14 +++++++-------
|
|
user/v84/Makefile.in | 14 +++++++-------
|
|
4 files changed, 20 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index ae575586..3d7deeae 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir,
|
|
AC_SUBST(tmpfilesdir)
|
|
|
|
# set default early
|
|
-default_udevdir=/lib/udev
|
|
+default_udevdir=${prefix}/lib/udev
|
|
if test x"$with_udev" = x || \
|
|
test x"$with_udev" = xyes ; then
|
|
if test x"$PKG_CONFIG" != x; then
|
|
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
|
|
index fcd298e9..2521fb08 100644
|
|
--- a/scripts/Makefile.in
|
|
+++ b/scripts/Makefile.in
|
|
@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
|
|
install -d $(DESTDIR)$(systemdunitdir)
|
|
install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
|
|
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 08cfe574..4c4971b6 100644
|
|
--- a/user/v83/Makefile.in
|
|
+++ b/user/v83/Makefile.in
|
|
@@ -96,19 +96,19 @@ install:
|
|
ifeq ($(WITH_83_SUPPORT),yes)
|
|
install -d $(DESTDIR)$(localstatedir)/lib/drbd
|
|
install -d $(DESTDIR)$(localstatedir)/lock
|
|
- install -d $(DESTDIR)/lib/drbd/
|
|
+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/
|
|
if getent group haclient > /dev/null 2> /dev/null ; then \
|
|
- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
|
|
- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \
|
|
+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
else \
|
|
- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
|
|
- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \
|
|
+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
fi
|
|
endif
|
|
|
|
uninstall:
|
|
- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83
|
|
- rm -f $(DESTDIR)/lib/drbd/drbdadm-83
|
|
+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83
|
|
+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83
|
|
|
|
.PHONY: install uninstall clean distclean
|
|
../../configure:
|
|
diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
|
|
index 0fcefc5f..81f7d5ec 100644
|
|
--- a/user/v84/Makefile.in
|
|
+++ b/user/v84/Makefile.in
|
|
@@ -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
|
|
- install -d $(DESTDIR)/lib/drbd/
|
|
+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/
|
|
if getent group haclient > /dev/null 2> /dev/null ; then \
|
|
- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
|
|
- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
|
|
+ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
else \
|
|
- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
|
|
- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
|
|
+ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
|
|
fi
|
|
endif
|
|
|
|
uninstall:
|
|
- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84
|
|
- rm -f $(DESTDIR)/lib/drbd/drbdadm-84
|
|
+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84
|
|
+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84
|
|
|
|
spell:
|
|
for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
|
|
--
|
|
2.33.0
|
|
|