mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 13:59:59 +00:00
Code Issues Projects Releases Wiki Activity

dlm: Upgrade to 4.2.0

Browse Source 
Drop upstreamed patch and another patch which is fixed differently
upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2023-07-13 17:21:30 -07:00
parent 15da208e52
commit d3d8e4b7f9
3 changed files with 1 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch
-35
View File
@@ -1,35 +0,0 @@
From da08f5ec5e553bd43f92a0b0f7476179b0b74502 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
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 <changqing.li@windriver.com>
---
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)
meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch
-23
View File
@@ -1,23 +0,0 @@
From 9652e6b3c43b4c051f2ff0e000d7ebf5fbab418e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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 <stdlib.h>
#include <unistd.h>
#include <stdint.h>
+#include <string.h>
#include <errno.h>
#include <time.h>
#include <sys/types.h>
meta-networking/recipes-extended/dlm/dlm_4.1.1.bb → meta-networking/recipes-extended/dlm/dlm_4.2.0.bb
+1 -3
View File
@@ -6,13 +6,11 @@ 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"
SRC_URI[sha256sum] = "90237e18af7422ac15fc756899b3bb6932597b13342296de8e0e120e6d8729ab"
UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases"
UPSTREAM_CHECK_REGEX = "dlm-(?P<pver>\d+(\.\d+)+)"