From d3d8e4b7f93941577f977153b352eed12d473c75 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Jul 2023 17:21:30 -0700 Subject: dlm: Upgrade to 4.2.0 Drop upstreamed patch and another patch which is fixed differently upstream Signed-off-by: Khem Raj --- ...pile-error-since-xml2-config-should-not-b.patch | 35 ------------- ...004-include-string.h-for-memset-prototype.patch | 23 --------- meta-networking/recipes-extended/dlm/dlm_4.1.1.bb | 60 ---------------------- meta-networking/recipes-extended/dlm/dlm_4.2.0.bb | 58 +++++++++++++++++++++ 4 files changed, 58 insertions(+), 118 deletions(-) delete mode 100644 meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch delete mode 100644 meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch delete mode 100644 meta-networking/recipes-extended/dlm/dlm_4.1.1.bb create mode 100644 meta-networking/recipes-extended/dlm/dlm_4.2.0.bb diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch deleted file mode 100644 index 3d1551574e..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch +++ /dev/null @@ -1,35 +0,0 @@ -From da08f5ec5e553bd43f92a0b0f7476179b0b74502 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 26 Jun 2019 11:49:33 +0800 -Subject: [PATCH] dlm: fix compile error since xml2-config should not be used - -xml2-config is disabled, so change Makefile to use pkgconfig -to find libxml2. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li - ---- - fence/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fence/Makefile b/fence/Makefile -index 2b080468..ff2eda3f 100644 ---- a/fence/Makefile -+++ b/fence/Makefile -@@ -18,12 +18,12 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - -fstack-clash-protection -Wl,-z,now - - CFLAGS += -fPIE -DPIE --CFLAGS += `xml2-config --cflags` -+CFLAGS += `pkg-config libxml-2.0 --cflags` - CFLAGS += -I../include - CFLAGS += $(shell pkg-config --cflags pacemaker-fencing) - - LDFLAGS += -Wl,-z,relro -Wl,-z,defs -pie --LDFLAGS += `xml2-config --libs` -+LDFLAGS += `pkg-config libxml-2.0 --libs` - LDFLAGS += -ldl - - all: $(BIN_TARGET) diff --git a/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch b/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch deleted file mode 100644 index 257c5d02ff..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9652e6b3c43b4c051f2ff0e000d7ebf5fbab418e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 29 Aug 2022 10:54:51 -0700 -Subject: [PATCH] include string.h for memset prototype - -Upstream-Status: Submitted [https://pagure.io/dlm/pull-request/3] -Signed-off-by: Khem Raj ---- - dlm_controld/lib.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlm_controld/lib.c b/dlm_controld/lib.c -index 8cbdd27f..a7502fcd 100644 ---- a/dlm_controld/lib.c -+++ b/dlm_controld/lib.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb b/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb deleted file mode 100644 index bb33890ec9..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "dlm control daemon and tool" - -SECTION = "utils" -HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \ - file://0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch \ - file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ - file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \ - file://0004-include-string.h-for-memset-prototype.patch \ - " - -SRC_URI[sha256sum] = "f12c0056b9196dfcecbec2fa8930feb87c605a86ef0f3d7bd6fb0b77cd7f45ca" - -UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases" -UPSTREAM_CHECK_REGEX = "dlm-(?P\d+(\.\d+)+)" - -LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" - -S = "${WORKDIR}/dlm-dlm-${PV}" - -DEPENDS += "corosync" - -inherit pkgconfig systemd features_check - -PACKAGECONFIG ??= "" - -PACKAGECONFIG[pacemaker] = ",,pacemaker" - -SYSTEMD_SERVICE:${PN} = "dlm.service" -SYSTEMD_AUTO_ENABLE = "enable" - -export EXTRA_OEMAKE = "" - -DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" - -do_compile:prepend:toolchain-clang() { - sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile -} - -do_compile() { - sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile - sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile - oe_runmake 'CC=${CC}' -} - -do_install() { - oe_runmake install DESTDIR=${D} LIBDIR=${libdir} - install -Dm 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm - install -Dm 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm - - # install systemd unit files - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system/dlm.service - fi -} - diff --git a/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb new file mode 100644 index 0000000000..8cfb27a903 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "dlm control daemon and tool" + +SECTION = "utils" +HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" + +REQUIRED_DISTRO_FEATURES = "systemd" + +SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \ + file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ + file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \ + " + +SRC_URI[sha256sum] = "90237e18af7422ac15fc756899b3bb6932597b13342296de8e0e120e6d8729ab" + +UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases" +UPSTREAM_CHECK_REGEX = "dlm-(?P\d+(\.\d+)+)" + +LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" + +S = "${WORKDIR}/dlm-dlm-${PV}" + +DEPENDS += "corosync" + +inherit pkgconfig systemd features_check + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[pacemaker] = ",,pacemaker" + +SYSTEMD_SERVICE:${PN} = "dlm.service" +SYSTEMD_AUTO_ENABLE = "enable" + +export EXTRA_OEMAKE = "" + +DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" + +do_compile:prepend:toolchain-clang() { + sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile +} + +do_compile() { + sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile + sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile + oe_runmake 'CC=${CC}' +} + +do_install() { + oe_runmake install DESTDIR=${D} LIBDIR=${libdir} + install -Dm 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm + install -Dm 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm + + # install systemd unit files + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -Dm 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system/dlm.service + fi +} + -- cgit v1.2.3-54-g00ecf