summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/drbd/drbd-utils
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-support/drbd/drbd-utils')
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch34
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch55
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch190
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch17
4 files changed, 55 insertions, 241 deletions
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..00105fb844
--- /dev/null
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,34 @@
1From b42265af87d9efcc9aac91b3a3da3df5c5c66e29 Mon Sep 17 00:00:00 2001
2From: Nguyen Dat Tho <tho3.nguyen@lge.com>
3Date: Wed, 9 Apr 2025 17:33:25 +0900
4Subject: [PATCH] Fix build with gcc-15
5
6To fix the following error:
7In file included from string_matching.cpp:1:
8./string_matching.h:10:18: error: 'uint16_t' does not name a type
9 10 | extern const uint16_t PATTERN_LIMIT;
10 | ^~~~~~~~
11./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
12
13Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/50]
14
15Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
16---
17 user/drbdmon/string_matching.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/user/drbdmon/string_matching.h b/user/drbdmon/string_matching.h
21index 9b3918fe..b783ba48 100644
22--- a/user/drbdmon/string_matching.h
23+++ b/user/drbdmon/string_matching.h
24@@ -4,6 +4,7 @@
25 #include <string>
26 #include <memory>
27 #include <stdexcept>
28+#include <cstdint>
29
30 namespace string_matching
31 {
32--
332.34.1
34
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch
deleted file mode 100644
index b98e1e70c7..0000000000
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001
2From: Yoann Congal <yoann.congal@smile.fr>
3Date: Sat, 2 Mar 2024 16:23:07 +0100
4Subject: [PATCH] configure.ac: Add an option to disable host udev version
5 checks
6
7In cross-compilation environment, the build host might have an outdated
8udev or no udev at all. But the user may still want to build with the
9enabled udev rule (for its udev-enabled target).
10
11This patch adds a "--disable-udevchecks" option the disable build host
12udev version check at configure-time and unconditionally install the
13enabled udev rule. Without this new option, the behavior stays the same
14(checks enabled).
15
16Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
17Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a]
18---
19 configure.ac | 9 +++++++--
20 1 file changed, 7 insertions(+), 2 deletions(-)
21
22diff --git a/configure.ac b/configure.ac
23index f1d69ea3..4c56d33b 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -71,6 +71,11 @@ AC_ARG_WITH([udev],
27 [AS_HELP_STRING([--with-udev],
28 [Enable udev integration])],
29 [WITH_UDEV=$withval])
30+AC_ARG_ENABLE([udevchecks],
31+ [AS_HELP_STRING([--disable-udevchecks],
32+ [Disable host udev version checks])],
33+ [],
34+ [enable_udevchecks=yes])
35 AC_ARG_WITH([xen],
36 [AS_HELP_STRING([--with-xen],
37 [Enable Xen integration])],
38@@ -315,7 +320,7 @@ if test -z $GIT; then
39 AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.)
40 fi
41
42-if test $UDEVADM = false && test $UDEVINFO = false; then
43+if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then
44 if test "$WITH_UDEV" = "yes"; then
45 AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.])
46 fi
47@@ -423,7 +428,7 @@ else
48 test -z $INITDIR && INITDIR="$sysconfdir/init.d"
49
50 dnl Our udev rules file is known to work only with udev >= 85
51- if test "$WITH_UDEV" = "yes"; then
52+ if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then
53 udev_version=$( set -- $($UDEVADM version); echo $1 )
54 if test -z "$udev_version"; then
55 udev_version=$( set -- $($UDEVINFO -V); echo $3 )
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 27f0a9b54a..93cb8e185e 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,30 +1,21 @@
1From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 1From a019fbe36ab965e754b818fe1bdb0cea0e3ffb60 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 21 Apr 2022 17:22:35 +0800 3Date: Thu, 21 Apr 2022 17:22:35 +0800
4Subject: [PATCH] drbd-utils: support usermerge 4Subject: [PATCH] drbd-utils: support usrmerge
5 5
6Upstream-Status: Inappropriate [oe-specific] 6Upstream-Status: Inappropriate [oe-specific]
7 7
8Signed-off-by: Changqing Li <changqing.li@windriver.com> 8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> 9Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
10--- 10---
11 configure.ac | 2 +- 11 configure.ac | 2 +-
12 scripts/Makefile.in | 10 +++++----- 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 scripts/drbd-demote-or-escalate@.service | 2 +-
14 scripts/drbd-promote@.service | 4 ++--
15 scripts/drbd-wait-promotable@.service | 2 +-
16 scripts/drbd.service | 6 +++---
17 scripts/drbd@.service | 6 +++---
18 scripts/ocf.ra@.service | 4 ++--
19 user/v83/Makefile.in | 14 +++++++-------
20 user/v84/Makefile.in | 14 +++++++-------
21 10 files changed, 32 insertions(+), 32 deletions(-)
22 13
23diff --git a/configure.ac b/configure.ac 14diff --git a/configure.ac b/configure.ac
24index f1d69ea3..3289ac7d 100644 15index 37148597..52015fb2 100644
25--- a/configure.ac 16--- a/configure.ac
26+++ b/configure.ac 17+++ b/configure.ac
27@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, 18@@ -217,7 +217,7 @@ AC_ARG_WITH(tmpfilesdir,
28 AC_SUBST(tmpfilesdir) 19 AC_SUBST(tmpfilesdir)
29 20
30 # set default early 21 # set default early
@@ -33,169 +24,6 @@ index f1d69ea3..3289ac7d 100644
33 if test x"$with_udev" = x || \ 24 if test x"$with_udev" = x || \
34 test x"$with_udev" = xyes ; then 25 test x"$with_udev" = xyes ; then
35 if test x"$PKG_CONFIG" != x; then 26 if test x"$PKG_CONFIG" != x; then
36diff --git a/scripts/Makefile.in b/scripts/Makefile.in 27--
37index aca15a22..a1cd2ffe 100644 282.25.1
38--- a/scripts/Makefile.in 29
39+++ b/scripts/Makefile.in
40@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
41 install -d $(DESTDIR)$(systemdunitdir)
42 install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/
43 install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
44- install -d $(DESTDIR)/lib/drbd/scripts
45- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
46- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
47- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts
48- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
49+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts
50+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts
51+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
52+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
53+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
54 install -d $(DESTDIR)$(tmpfilesdir)/
55 install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
56 endif
57diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service
58index 20932238..8b5ce4a2 100644
59--- a/scripts/drbd-demote-or-escalate@.service
60+++ b/scripts/drbd-demote-or-escalate@.service
61@@ -28,5 +28,5 @@ TimeoutSec=60
62 # "Type=forking" would be an option to have it retry a number of times,
63 # and then only escalate to FailureAction if that did not help.
64 Type=oneshot
65-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
66+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
67 ExecStopPost=-/bin/journalctl --sync
68diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service
69index 71345d9b..678e0703 100644
70--- a/scripts/drbd-promote@.service
71+++ b/scripts/drbd-promote@.service
72@@ -24,5 +24,5 @@ RemainAfterExit=yes
73 # (ab)using systemd features
74 # if we cannot configure and promote, that's a condition, not a failure
75 # See the comment above wrt. FailureAction vs OnFailure
76-ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I
77-ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I
78+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I
79+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I
80diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service
81index 81c3789f..3416abc6 100644
82--- a/scripts/drbd-wait-promotable@.service
83+++ b/scripts/drbd-wait-promotable@.service
84@@ -10,7 +10,7 @@ Type=oneshot
85
86 # on first start, wait for access to "good data"
87 # let systemd handle timeouts
88-ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I
89+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I
90 RemainAfterExit=yes
91
92 [Install]
93diff --git a/scripts/drbd.service b/scripts/drbd.service
94index 96c599e7..c81e95a6 100644
95--- a/scripts/drbd.service
96+++ b/scripts/drbd.service
97@@ -12,11 +12,11 @@ RemainAfterExit=yes
98 # A check for INIT_VERSION already exists, just set it to something.
99 Environment=INIT_VERSION=systemd
100
101-ExecStart=/lib/drbd/scripts/drbd start
102-ExecStop=/lib/drbd/scripts/drbd stop
103+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start
104+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop
105
106 # Re-adjust everything on reload
107-ExecReload=/lib/drbd/scripts/drbd reload
108+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload
109
110 [Install]
111 WantedBy=multi-user.target
112diff --git a/scripts/drbd@.service b/scripts/drbd@.service
113index 0fad10be..556f3857 100644
114--- a/scripts/drbd@.service
115+++ b/scripts/drbd@.service
116@@ -35,8 +35,8 @@ RemainAfterExit=yes
117
118 # depends... do we want this as ExecCondition or as ExecStart
119 # failed start is "failed", failed condition is just "not startable yet"
120-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
121-ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
122+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
123+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
124
125 # can only succeed, if you first stop all depending services
126-ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I
127+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I
128diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service
129index 9c2268a6..1666c482 100644
130--- a/scripts/ocf.ra@.service
131+++ b/scripts/ocf.ra@.service
132@@ -22,5 +22,5 @@ Environment=monitor_inverval=30
133 # Only the first argument is used by the wrapper,
134 # the %n is just to identify which is which in the process list.
135 # All parameterization is done via Environment= in per instance override.conf
136-ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n
137-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n
138+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
140diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in
141index 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:
171diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
172index 0fcefc5f..81f7d5ec 100644
173--- a/user/v84/Makefile.in
174+++ b/user/v84/Makefile.in
175@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
176 install -d $(DESTDIR)$(localstatedir)/lib/drbd
177 install -d $(DESTDIR)$(localstatedir)/run/drbd
178 install -d $(DESTDIR)$(localstatedir)/lock
179- install -d $(DESTDIR)/lib/drbd/
180+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/
181 if getent group haclient > /dev/null 2> /dev/null ; then \
182- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
183- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
184+ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
185+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
186 else \
187- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
188- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
189+ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
190+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
191 fi
192 endif
193
194 uninstall:
195- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84
196- rm -f $(DESTDIR)/lib/drbd/drbdadm-84
197+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84
198+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84
199
200 spell:
201 for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
index c7766067a1..ac2626c1c8 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
@@ -1,4 +1,4 @@
1From bb044160faf4ae7615ddfdb17641dd88c33cde57 Mon Sep 17 00:00:00 2001 1From 26ed5003847a14a16d0c1d4030aa1a361c0289fb Mon Sep 17 00:00:00 2001
2From: Sakib Sajal <sakib.sajal@windriver.com> 2From: Sakib Sajal <sakib.sajal@windriver.com>
3Date: Thu, 31 Mar 2022 15:09:58 -0400 3Date: Thu, 31 Mar 2022 15:09:58 -0400
4Subject: [PATCH] drbdmon: add LDFLAGS when linking 4Subject: [PATCH] drbdmon: add LDFLAGS when linking
@@ -7,11 +7,11 @@ Upstream-Status: Pending
7 7
8Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> 8Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
9--- 9---
10 user/drbdmon/Makefile.in | 4 ++-- 10 user/drbdmon/Makefile.in | 6 +++---
11 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 3 insertions(+), 3 deletions(-)
12 12
13diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in 13diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in
14index 7bd8987e..115a81b8 100644 14index 9c5427e9..0101a60b 100644
15--- a/user/drbdmon/Makefile.in 15--- a/user/drbdmon/Makefile.in
16+++ b/user/drbdmon/Makefile.in 16+++ b/user/drbdmon/Makefile.in
17@@ -1,6 +1,6 @@ 17@@ -1,6 +1,6 @@
@@ -22,12 +22,19 @@ index 7bd8987e..115a81b8 100644
22 CXX = @CXX@ 22 CXX = @CXX@
23 LIBS = @LIBS@ 23 LIBS = @LIBS@
24 24
25@@ -72,7 +72,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h 25@@ -76,10 +76,10 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
26 $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h 26 $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h
27 27
28 drbdmon: $(ls-obj) 28 drbdmon: $(ls-obj)
29- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) 29- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS)
30+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) 30+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS)
31 31
32 drbd-events-log-supplier: $(supplier-obj)
33- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^
34+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^
35
32 # do not try to rebuild Makefile itself 36 # do not try to rebuild Makefile itself
33 Makefile: ; 37 Makefile: ;
38--
392.25.1
40
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-03 06:47:37 +0000