From b7a1a02d5630af988642034d9eae952289c651f4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 29 Aug 2022 11:08:28 -0700 Subject: dlm: Upgrade to 4.1.1 Forward port patches and add a patch to fix compiler warnings Signed-off-by: Khem Raj --- ...pile-error-since-xml2-config-should-not-b.patch | 13 +++-- ...004-include-string.h-for-memset-prototype.patch | 23 +++++++++ meta-networking/recipes-extended/dlm/dlm_4.0.9.bb | 60 ---------------------- meta-networking/recipes-extended/dlm/dlm_4.1.1.bb | 60 ++++++++++++++++++++++ 4 files changed, 89 insertions(+), 67 deletions(-) create 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.0.9.bb create mode 100644 meta-networking/recipes-extended/dlm/dlm_4.1.1.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 index f56359a473..3d1551574e 100644 --- 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 @@ -1,4 +1,4 @@ -From ad207a6f83dac390b2d95e3a8262d27292921863 Mon Sep 17 00:00:00 2001 +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 @@ -9,28 +9,27 @@ 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 b927879..6e16078 100644 +index 2b080468..ff2eda3f 100644 --- a/fence/Makefile +++ b/fence/Makefile -@@ -18,11 +18,11 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ +@@ -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 -pie + LDFLAGS += -Wl,-z,relro -Wl,-z,defs -pie -LDFLAGS += `xml2-config --libs` +LDFLAGS += `pkg-config libxml-2.0 --libs` LDFLAGS += -ldl all: $(BIN_TARGET) --- -2.7.4 - 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 new file mode 100644 index 0000000000..257c5d02ff --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch @@ -0,0 +1,23 @@ +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.0.9.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb deleted file mode 100644 index 3e699d2ff6..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm_4.0.9.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 \ - " - -SRC_URI[md5sum] = "4c57a941a15547859cd38fd55f66388e" -SRC_URI[sha256sum] = "d59142e067cbd603aaf66151a04e9fa34330219680b8827c953d20821b951991" - -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.1.1.bb b/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb new file mode 100644 index 0000000000..bb33890ec9 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb @@ -0,0 +1,60 @@ +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 +} + -- cgit v1.2.3-54-g00ecf