diff options
Diffstat (limited to 'meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch')
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch | 47 |
1 files changed, 9 insertions, 38 deletions
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 27f0a9b54..ef0229d5b 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 | 1 | From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 21 Apr 2022 17:22:35 +0800 | 3 | Date: Thu, 21 Apr 2022 17:22:35 +0800 |
4 | Subject: [PATCH] drbd-utils: support usermerge | 4 | Subject: [PATCH] drbd-utils: support usermerge |
@@ -16,15 +16,14 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | |||
16 | scripts/drbd.service | 6 +++--- | 16 | scripts/drbd.service | 6 +++--- |
17 | scripts/drbd@.service | 6 +++--- | 17 | scripts/drbd@.service | 6 +++--- |
18 | scripts/ocf.ra@.service | 4 ++-- | 18 | scripts/ocf.ra@.service | 4 ++-- |
19 | user/v83/Makefile.in | 14 +++++++------- | ||
20 | user/v84/Makefile.in | 14 +++++++------- | 19 | user/v84/Makefile.in | 14 +++++++------- |
21 | 10 files changed, 32 insertions(+), 32 deletions(-) | 20 | 9 files changed, 25 insertions(+), 25 deletions(-) |
22 | 21 | ||
23 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
24 | index f1d69ea3..3289ac7d 100644 | 23 | index d3ec5ff1..910232b1 100644 |
25 | --- a/configure.ac | 24 | --- a/configure.ac |
26 | +++ b/configure.ac | 25 | +++ b/configure.ac |
27 | @@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, | 26 | @@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir, |
28 | AC_SUBST(tmpfilesdir) | 27 | AC_SUBST(tmpfilesdir) |
29 | 28 | ||
30 | # set default early | 29 | # set default early |
@@ -34,10 +33,10 @@ index f1d69ea3..3289ac7d 100644 | |||
34 | test x"$with_udev" = xyes ; then | 33 | test x"$with_udev" = xyes ; then |
35 | if test x"$PKG_CONFIG" != x; then | 34 | if test x"$PKG_CONFIG" != x; then |
36 | diff --git a/scripts/Makefile.in b/scripts/Makefile.in | 35 | diff --git a/scripts/Makefile.in b/scripts/Makefile.in |
37 | index aca15a22..a1cd2ffe 100644 | 36 | index 15a26f37..ff028310 100644 |
38 | --- a/scripts/Makefile.in | 37 | --- a/scripts/Makefile.in |
39 | +++ b/scripts/Makefile.in | 38 | +++ b/scripts/Makefile.in |
40 | @@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) | 39 | @@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) |
41 | install -d $(DESTDIR)$(systemdunitdir) | 40 | install -d $(DESTDIR)$(systemdunitdir) |
42 | install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ | 41 | install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ |
43 | install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ | 42 | install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ |
@@ -137,37 +136,6 @@ index 9c2268a6..1666c482 100644 | |||
137 | -ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n | 136 | -ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n |
138 | +ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n | 137 | +ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n |
139 | +ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n | 138 | +ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n |
140 | diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in | ||
141 | index 08cfe574..4c4971b6 100644 | ||
142 | --- a/user/v83/Makefile.in | ||
143 | +++ b/user/v83/Makefile.in | ||
144 | @@ -96,19 +96,19 @@ install: | ||
145 | ifeq ($(WITH_83_SUPPORT),yes) | ||
146 | install -d $(DESTDIR)$(localstatedir)/lib/drbd | ||
147 | install -d $(DESTDIR)$(localstatedir)/lock | ||
148 | - install -d $(DESTDIR)/lib/drbd/ | ||
149 | + install -d $(DESTDIR)/${nonarch_libdir}/drbd/ | ||
150 | if getent group haclient > /dev/null 2> /dev/null ; then \ | ||
151 | - install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ | ||
152 | - install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ | ||
153 | + install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
154 | + install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
155 | else \ | ||
156 | - install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ | ||
157 | - install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ | ||
158 | + install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
159 | + install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
160 | fi | ||
161 | endif | ||
162 | |||
163 | uninstall: | ||
164 | - rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 | ||
165 | - rm -f $(DESTDIR)/lib/drbd/drbdadm-83 | ||
166 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 | ||
167 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 | ||
168 | |||
169 | .PHONY: install uninstall clean distclean | ||
170 | ../../configure: | ||
171 | diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in | 139 | diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in |
172 | index 0fcefc5f..81f7d5ec 100644 | 140 | index 0fcefc5f..81f7d5ec 100644 |
173 | --- a/user/v84/Makefile.in | 141 | --- a/user/v84/Makefile.in |
@@ -199,3 +167,6 @@ index 0fcefc5f..81f7d5ec 100644 | |||
199 | 167 | ||
200 | spell: | 168 | spell: |
201 | for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ | 169 | for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ |
170 | -- | ||
171 | 2.25.1 | ||
172 | |||