diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 5e128727d5..d976680e3b 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -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 |