added my Recipes
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
From a55ab8a07770296bf6a622df14f2f0445be16327 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 19 Aug 2018 15:58:49 -0700
|
||||
Subject: [PATCH] Include sys/sysmacros.h for major/minor macros in glibc 2.25+
|
||||
|
||||
sys/sysmacros.h was included though sys/types.h until 2.28
|
||||
glibc release removed it therefore it must be included
|
||||
explicitly now.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
dlm_controld/action.c | 2 ++
|
||||
libdlm/libdlm.c | 1 +
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/dlm_controld/action.c b/dlm_controld/action.c
|
||||
index 84637f1..2b8ad6c 100644
|
||||
--- a/dlm_controld/action.c
|
||||
+++ b/dlm_controld/action.c
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
#include "dlm_daemon.h"
|
||||
|
||||
+#include <sys/sysmacros.h>
|
||||
+
|
||||
#include <corosync/corotypes.h>
|
||||
#include <corosync/cmap.h>
|
||||
|
||||
diff --git a/libdlm/libdlm.c b/libdlm/libdlm.c
|
||||
index a9e6195..499eb6a 100644
|
||||
--- a/libdlm/libdlm.c
|
||||
+++ b/libdlm/libdlm.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <inttypes.h>
|
||||
@@ -0,0 +1,35 @@
|
||||
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)
|
||||
@@ -0,0 +1,51 @@
|
||||
From 2f72f9271b8dd61ca5092e025b0f8243c6fd68f2 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 3 Mar 2020 12:38:19 -0800
|
||||
Subject: [PATCH] make: Replace cp -a with mode preserving options
|
||||
|
||||
Helps fix permissions in staging area
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
dlm_controld/Makefile | 4 ++--
|
||||
libdlm/Makefile | 8 ++++----
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
|
||||
index 6081cf8..fe71be2 100644
|
||||
--- a/dlm_controld/Makefile
|
||||
+++ b/dlm_controld/Makefile
|
||||
@@ -88,8 +88,8 @@ install: all
|
||||
$(INSTALL) -d $(DESTDIR)/$(PKGDIR)
|
||||
$(INSTALL) -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR)
|
||||
$(INSTALL) -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR)
|
||||
- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR)
|
||||
- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
|
||||
+ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR)
|
||||
+ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
|
||||
$(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR)
|
||||
$(INSTALL) -m 644 libdlmcontrol.h $(DESTDIR)/$(HDRDIR)
|
||||
$(INSTALL) -m 644 dlm_controld.8 $(DESTDIR)/$(MANDIR)/man8/
|
||||
diff --git a/libdlm/Makefile b/libdlm/Makefile
|
||||
index ab32761..8820bf8 100644
|
||||
--- a/libdlm/Makefile
|
||||
+++ b/libdlm/Makefile
|
||||
@@ -125,10 +125,10 @@ install: all
|
||||
$(INSTALL) -d $(DESTDIR)/$(UDEVDIR)
|
||||
$(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR)
|
||||
$(INSTALL) -c -m 755 $(LLT_TARGET) $(DESTDIR)/$(LIBDIR)
|
||||
- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR)
|
||||
- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
|
||||
- cp -a $(LLT_SO) $(DESTDIR)/$(LIBDIR)
|
||||
- cp -a $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR)
|
||||
+ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR)
|
||||
+ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
|
||||
+ cp -R --no-dereference --preserve=mode,links $(LLT_SO) $(DESTDIR)/$(LIBDIR)
|
||||
+ cp -R --no-dereference --preserve=mode,links $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR)
|
||||
$(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR)
|
||||
$(INSTALL) -m 644 $(LLT_PC) $(DESTDIR)/$(PKGDIR)
|
||||
$(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
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>
|
||||
@@ -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<pver>\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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user