b9d633fa81
Modify patch name and add in changelogs. OBS-URL: https://build.opensuse.org/request/show/925957 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=109
69 lines
3.2 KiB
Diff
69 lines
3.2 KiB
Diff
https://en.opensuse.org/openSUSE:Usr_merge
|
|
|
|
diff -Naur drbd-utils-9.19.0.orig/scripts/Makefile.in drbd-utils-9.19.0/scripts/Makefile.in
|
|
--- drbd-utils-9.19.0.orig/scripts/Makefile.in 2021-10-11 17:59:20.189282860 +0800
|
|
+++ drbd-utils-9.19.0/scripts/Makefile.in 2021-10-11 18:01:25.988786913 +0800
|
|
@@ -39,6 +39,7 @@
|
|
UDEV_RULE_SUFFIX = @UDEV_RULE_SUFFIX@
|
|
INITDIR = @INITDIR@
|
|
LIBDIR = @prefix@/lib/@PACKAGE_TARNAME@
|
|
+LIBSCRIPTDIR = @prefix@/lib/@PACKAGE_TARNAME@/scripts
|
|
LN_S = @LN_S@
|
|
|
|
# features enabled or disabled by configure
|
|
@@ -87,11 +88,11 @@
|
|
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)$(LIBSCRIPTDIR)
|
|
+ install -m 755 drbd $(DESTDIR)$(LIBSCRIPTDIR)
|
|
+ install -m 755 drbd-service-shim.sh $(DESTDIR)$(LIBSCRIPTDIR)
|
|
+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)$(LIBSCRIPTDIR)
|
|
+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)$(LIBSCRIPTDIR)
|
|
install -d $(DESTDIR)$(tmpfilesdir)/
|
|
install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
|
|
endif
|
|
diff -Naur drbd-utils-9.19.0.orig/user/v83/Makefile.in drbd-utils-9.19.0/user/v83/Makefile.in
|
|
--- drbd-utils-9.19.0.orig/user/v83/Makefile.in 2021-10-11 17:59:20.217282750 +0800
|
|
+++ drbd-utils-9.19.0/user/v83/Makefile.in 2021-10-11 18:07:39.967312613 +0800
|
|
@@ -98,11 +98,11 @@
|
|
install -d $(DESTDIR)$(localstatedir)/lock
|
|
install -d $(DESTDIR)/lib/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)$(LIBDIR) ; \
|
|
+ install -m 755 drbdadm-83 $(DESTDIR)$(LIBDIR) ; \
|
|
else \
|
|
- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
|
|
- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \
|
|
+ install -m 755 drbdsetup-83 $(DESTDIR)$(LIBDIR) ; \
|
|
+ install -m 755 drbdadm-83 $(DESTDIR)$(LIBDIR) ; \
|
|
fi
|
|
endif
|
|
|
|
diff -Naur drbd-utils-9.19.0.orig/user/v84/Makefile.in drbd-utils-9.19.0/user/v84/Makefile.in
|
|
--- drbd-utils-9.19.0.orig/user/v84/Makefile.in 2021-10-11 17:59:20.221282734 +0800
|
|
+++ drbd-utils-9.19.0/user/v84/Makefile.in 2021-10-11 18:07:39.967312613 +0800
|
|
@@ -112,11 +112,11 @@
|
|
install -d $(DESTDIR)$(localstatedir)/lock
|
|
install -d $(DESTDIR)/lib/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)$(LIBDIR) ; \
|
|
+ install -m 755 drbdadm-84 $(DESTDIR)$(LIBDIR) ; \
|
|
else \
|
|
- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
|
|
- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
|
|
+ install -m 755 drbdsetup-84 $(DESTDIR)$(LIBDIR) ; \
|
|
+ install -m 755 drbdadm-84 $(DESTDIR)$(LIBDIR) ; \
|
|
fi
|
|
endif
|
|
|