yoctoproject/poky-contrib
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky-contrib synced 2025-05-08 23:52:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

libcgroup_3.1.0: fix build on non-systemd systems

Browse Source 
backport upstream commit 592dcdcf243576bd2517d3da9bc18990de08e37e
to fix packaging when building with --enable-systemd=no

(From OE-Core rev: bc91a95ad96faa644241833a883cc63608dd59c2)

Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adriaan Schmidt 2024-05-06 13:48:15 +02:00 committed by Richard Purdie
parent df8aaff67e
commit d0f677d1e3
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch Normal file
View File

@ -0,0 +1,37 @@
From 592dcdcf243576bd2517d3da9bc18990de08e37e Mon Sep 17 00:00:00 2001
From: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Date: Mon, 27 Nov 2023 20:07:33 +0530
Subject: [PATCH 1/1] include/Makefile: install systemd.h by default
Install systemd.h header file by default, as we have stub and defined
versions of the systemd functions for both non-systemd and systemd
enabled configurations. This will help packagers to ship package
without systemd support (--enable-systemd=no).
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Upstream-Status: Backport [https://github.com/libcgroup/libcgroup/commit/592dcdcf243576bd2517d3da9bc18990de08e37e]
Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
---
include/Makefile.am | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/include/Makefile.am b/include/Makefile.am
index 23cebaac..4cb05529 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,8 +2,4 @@
nobase_include_HEADERS = libcgroup.h libcgroup/error.h libcgroup/init.h \
libcgroup/groups.h libcgroup/tasks.h \
libcgroup/iterators.h libcgroup/config.h \
- libcgroup/log.h libcgroup/tools.h
-
-if WITH_SYSTEMD
-nobase_include_HEADERS += libcgroup/systemd.h
-endif
+ libcgroup/log.h libcgroup/tools.h libcgroup/systemd.h
--
2.39.2

1
meta/recipes-core/libcgroup/libcgroup_3.1.0.bb
View File

@ -13,6 +13,7 @@ DEPENDS = "bison-native flex-native"
DEPENDS:append:libc-musl = " fts"
SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
file://0001-include-Makefile-install-systemd.h-by-default.patch \
"
UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags"