mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 13:59:59 +00:00
dlm: Fix build with linux kernel 6.4+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
From 5a0799d0bacc0cf93e15febdac7d8c50b21e7234 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 15 Jul 2023 13:13:12 -0700
|
||||
Subject: [PATCH] Disable annobin plugin
|
||||
|
||||
OE gcc does not build this plugin, moreover there are non gcc compilers
|
||||
which can be used with OE as well e.g. clang which might not have it
|
||||
either
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
dlm_controld/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
|
||||
index 8802d88..0380ec9 100644
|
||||
--- a/dlm_controld/Makefile
|
||||
+++ b/dlm_controld/Makefile
|
||||
@@ -47,7 +47,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \
|
||||
|
||||
BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE
|
||||
BIN_CFLAGS += -I../include -I../libdlm
|
||||
-LIB_CFLAGS += $(CFLAGS) -fPIC -fplugin=annobin
|
||||
+LIB_CFLAGS += $(CFLAGS) -fPIC
|
||||
|
||||
BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -Wl,-z,now -pie
|
||||
BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum -luuid
|
||||
--
|
||||
2.41.0
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
From 4c40289eb9e47cfd272a8cc402fd2ddb29e2a3dc Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Aring <aahringo@redhat.com>
|
||||
Date: Wed, 24 May 2023 13:50:59 +0000
|
||||
Subject: [PATCH] dlm_controld: remove unnecessary header include
|
||||
|
||||
The timewarn netlink functionality got dropped and will be removed by
|
||||
kernel v6.4. The user space part was already dropped by commit 34ea31e7
|
||||
("controld: remove timewarn handling"). This is just a left over of this
|
||||
commit. Recent builds fails now because the UAPI header in the Linux
|
||||
kernel was removed. This means older dlm sources cannot be build with
|
||||
newer kernel-headers, however it is not recommended to use older dlm
|
||||
sources and all existing users should upgrade anyway.
|
||||
|
||||
Upstream-Status: Backport [https://pagure.io/dlm/c/ddbba6608896f81bfce8f8edf3d0f507714cfc43?branch=main]
|
||||
Reported-by: Fabio M. Di Nitto <fdinitto@redhat.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
dlm_controld/main.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
|
||||
index 7cf6348..e70e96a 100644
|
||||
--- a/dlm_controld/main.c
|
||||
+++ b/dlm_controld/main.c
|
||||
@@ -12,7 +12,6 @@
|
||||
#include <pthread.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/genetlink.h>
|
||||
-#include <linux/dlm_netlink.h>
|
||||
#include <uuid/uuid.h>
|
||||
|
||||
#ifdef USE_SD_NOTIFY
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@@ -8,6 +8,8 @@ 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 \
|
||||
file://0001-dlm_controld-remove-unnecessary-header-include.patch \
|
||||
file://0001-Disable-annobin-plugin.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "90237e18af7422ac15fc756899b3bb6932597b13342296de8e0e120e6d8729ab"
|
||||
@@ -33,6 +35,8 @@ SYSTEMD_AUTO_ENABLE = "enable"
|
||||
|
||||
export EXTRA_OEMAKE = ""
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}"
|
||||
|
||||
do_compile:prepend:toolchain-clang() {
|
||||
|
||||
Reference in New Issue
Block a user