From 0b1e0f24f2aeb69c6682d600091423d0d2a8fce7 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 21 Mar 2025 20:59:59 +0800 Subject: drbd-utils: upgrade 9.28.0 -> 9.30.0 ChangeLog: https://github.com/LINBIT/drbd-utils/blob/v9.30.0/ChangeLog * Refresh local patches. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../0001-drbd-utils-support-usrmerge.patch | 155 +-------------------- .../0001-drbdmon-add-LDFLAGS-when-linking.patch | 17 ++- .../recipes-support/drbd/drbd-utils_9.28.0.bb | 75 ---------- .../recipes-support/drbd/drbd-utils_9.30.0.bb | 75 ++++++++++ 4 files changed, 93 insertions(+), 229 deletions(-) delete mode 100644 meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb create mode 100644 meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb (limited to 'meta-networking') 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 ef0229d5bb..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,29 +1,21 @@ -From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001 +From a019fbe36ab965e754b818fe1bdb0cea0e3ffb60 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 21 Apr 2022 17:22:35 +0800 -Subject: [PATCH] drbd-utils: support usermerge +Subject: [PATCH] drbd-utils: support usrmerge Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li Signed-off-by: Sakib Sajal --- - configure.ac | 2 +- - scripts/Makefile.in | 10 +++++----- - scripts/drbd-demote-or-escalate@.service | 2 +- - scripts/drbd-promote@.service | 4 ++-- - scripts/drbd-wait-promotable@.service | 2 +- - scripts/drbd.service | 6 +++--- - scripts/drbd@.service | 6 +++--- - scripts/ocf.ra@.service | 4 ++-- - user/v84/Makefile.in | 14 +++++++------- - 9 files changed, 25 insertions(+), 25 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d3ec5ff1..910232b1 100644 +index 37148597..52015fb2 100644 --- a/configure.ac +++ b/configure.ac -@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir, +@@ -217,7 +217,7 @@ AC_ARG_WITH(tmpfilesdir, AC_SUBST(tmpfilesdir) # set default early @@ -32,141 +24,6 @@ index d3ec5ff1..910232b1 100644 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 15a26f37..ff028310 100644 ---- a/scripts/Makefile.in -+++ b/scripts/Makefile.in -@@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) - install -d $(DESTDIR)$(systemdunitdir) - install -m 644 $(SYSTEMD_UNITS) $(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}/drbd/scripts -+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts -+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts -+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts -+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts - install -d $(DESTDIR)$(tmpfilesdir)/ - install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf - endif -diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service -index 20932238..8b5ce4a2 100644 ---- a/scripts/drbd-demote-or-escalate@.service -+++ b/scripts/drbd-demote-or-escalate@.service -@@ -28,5 +28,5 @@ TimeoutSec=60 - # "Type=forking" would be an option to have it retry a number of times, - # and then only escalate to FailureAction if that did not help. - Type=oneshot --ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I - ExecStopPost=-/bin/journalctl --sync -diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service -index 71345d9b..678e0703 100644 ---- a/scripts/drbd-promote@.service -+++ b/scripts/drbd-promote@.service -@@ -24,5 +24,5 @@ RemainAfterExit=yes - # (ab)using systemd features - # if we cannot configure and promote, that's a condition, not a failure - # See the comment above wrt. FailureAction vs OnFailure --ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I --ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I -+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I -+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I -diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service -index 81c3789f..3416abc6 100644 ---- a/scripts/drbd-wait-promotable@.service -+++ b/scripts/drbd-wait-promotable@.service -@@ -10,7 +10,7 @@ Type=oneshot - - # on first start, wait for access to "good data" - # let systemd handle timeouts --ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I - RemainAfterExit=yes - - [Install] -diff --git a/scripts/drbd.service b/scripts/drbd.service -index 96c599e7..c81e95a6 100644 ---- a/scripts/drbd.service -+++ b/scripts/drbd.service -@@ -12,11 +12,11 @@ RemainAfterExit=yes - # A check for INIT_VERSION already exists, just set it to something. - Environment=INIT_VERSION=systemd - --ExecStart=/lib/drbd/scripts/drbd start --ExecStop=/lib/drbd/scripts/drbd stop -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start -+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop - - # Re-adjust everything on reload --ExecReload=/lib/drbd/scripts/drbd reload -+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload - - [Install] - WantedBy=multi-user.target -diff --git a/scripts/drbd@.service b/scripts/drbd@.service -index 0fad10be..556f3857 100644 ---- a/scripts/drbd@.service -+++ b/scripts/drbd@.service -@@ -35,8 +35,8 @@ RemainAfterExit=yes - - # depends... do we want this as ExecCondition or as ExecStart - # failed start is "failed", failed condition is just "not startable yet" --ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I --ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I -+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I - - # can only succeed, if you first stop all depending services --ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I -+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I -diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service -index 9c2268a6..1666c482 100644 ---- a/scripts/ocf.ra@.service -+++ b/scripts/ocf.ra@.service -@@ -22,5 +22,5 @@ Environment=monitor_inverval=30 - # Only the first argument is used by the wrapper, - # the %n is just to identify which is which in the process list. - # All parameterization is done via Environment= in per instance override.conf --ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n --ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n -+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n -+ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n -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.25.1 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 @@ -From bb044160faf4ae7615ddfdb17641dd88c33cde57 Mon Sep 17 00:00:00 2001 +From 26ed5003847a14a16d0c1d4030aa1a361c0289fb Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Thu, 31 Mar 2022 15:09:58 -0400 Subject: [PATCH] drbdmon: add LDFLAGS when linking @@ -7,11 +7,11 @@ Upstream-Status: Pending Signed-off-by: Sakib Sajal --- - user/drbdmon/Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + user/drbdmon/Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in -index 7bd8987e..115a81b8 100644 +index 9c5427e9..0101a60b 100644 --- a/user/drbdmon/Makefile.in +++ b/user/drbdmon/Makefile.in @@ -1,6 +1,6 @@ @@ -22,12 +22,19 @@ index 7bd8987e..115a81b8 100644 CXX = @CXX@ LIBS = @LIBS@ -@@ -72,7 +72,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h +@@ -76,10 +76,10 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h drbdmon: $(ls-obj) - $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) + $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) + drbd-events-log-supplier: $(supplier-obj) +- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ ++ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ + # do not try to rebuild Makefile itself Makefile: ; +-- +2.25.1 + diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb deleted file mode 100644 index af0afc2a91..0000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb +++ /dev/null @@ -1,75 +0,0 @@ -SUMMARY = "Distributed block device driver for Linux" -DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ -Think of it as networked raid 1. It is a building block for\ -setting up high availability (HA) clusters." -HOMEPAGE = "http://www.drbd.org/" -SECTION = "admin" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" - -SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \ - git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ - file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ - ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ - " -SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1" -SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" - -SRCREV_FORMAT = "drbd-utils_drbd-headers" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" - -SYSTEMD_SERVICE:${PN} = "drbd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -DEPENDS = "flex-native keyutils" - -inherit autotools-brokensep systemd - -# -Wunused-but-set-variable -Wunused-const-variable -Winconsistent-missing-override -CPPFLAGS:append = " -Wno-error" - -EXTRA_OECONF = " \ - --with-initdir=/etc/init.d \ - --without-pacemaker \ - --without-rgmanager \ - --without-bashcompletion \ - --with-distro debian \ - --with-initscripttype=both \ - --with-systemdunitdir=${systemd_unitdir}/system \ - --without-manual \ - --disable-udevchecks \ - " - -# If we have inherited reproducible_build, we want to use it. -export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" - -do_install:append() { - # don't install empty /var/lock and /var/run to avoid conflict with base-files - rm -rf ${D}${localstatedir}/lock - rm -rf ${D}${localstatedir}/run - - sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-demote-or-escalate@.service - sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-promote@.service - sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-wait-promotable@.service - sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd.service - sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd@.service - sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/ocf.ra@.service -} - -RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" - -# The drbd items are explicitly put under /lib when installed. -# -FILES:${PN} += "/run" -FILES:${PN} += "${nonarch_base_libdir}/drbd \ - ${nonarch_libdir}/drbd \ - ${nonarch_libdir}/tmpfiles.d \ - ${nonarch_libdir}/drbdscripts/* \ - ${systemd_unitdir}/system/* \ -" -FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" - -CLEANBROKEN = "1" diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb new file mode 100644 index 0000000000..d9f1ae3f77 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb @@ -0,0 +1,75 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ +Think of it as networked raid 1. It is a building block for\ +setting up high availability (HA) clusters." +HOMEPAGE = "http://www.drbd.org/" +SECTION = "admin" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" + +SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \ + git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ + file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ + " +SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9" +SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc" + +SRCREV_FORMAT = "drbd-utils_drbd-headers" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" + +SYSTEMD_SERVICE:${PN} = "drbd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +DEPENDS = "flex-native keyutils" + +inherit autotools-brokensep systemd + +# -Wunused-but-set-variable -Wunused-const-variable -Winconsistent-missing-override +CPPFLAGS:append = " -Wno-error" + +EXTRA_OECONF = " \ + --with-initdir=/etc/init.d \ + --without-pacemaker \ + --without-rgmanager \ + --without-bashcompletion \ + --with-distro debian \ + --with-initscripttype=both \ + --with-systemdunitdir=${systemd_unitdir}/system \ + --without-manual \ + --disable-udevchecks \ + " + +# If we have inherited reproducible_build, we want to use it. +export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" + +do_install:append() { + # don't install empty /var/lock and /var/run to avoid conflict with base-files + rm -rf ${D}${localstatedir}/lock + rm -rf ${D}${localstatedir}/run + + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-demote-or-escalate@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-promote@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-wait-promotable@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/ocf.ra@.service +} + +RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" + +# The drbd items are explicitly put under /lib when installed. +# +FILES:${PN} += "/run" +FILES:${PN} += "${nonarch_base_libdir}/drbd \ + ${nonarch_libdir}/drbd \ + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/drbdscripts/* \ + ${systemd_unitdir}/system/* \ +" +FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" + +CLEANBROKEN = "1" -- cgit v1.2.3-54-g00ecf