diff mbox series

[21/56] libcgroup: upgrade 3.1.0 -> 3.2.0

Message ID 1747040619-7566-21-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/56] appstream: upgrade 1.0.4 -> 1.0.5 | expand

Commit Message

Mingyu Wang (Fujitsu) May 12, 2025, 9:03 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-include-Makefile-install-systemd.h-by-default.patch
removed since it's included in 3.2.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...akefile-install-systemd.h-by-default.patch | 37 -------------------
 ...{libcgroup_3.1.0.bb => libcgroup_3.2.0.bb} |  6 +--
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch
 rename meta/recipes-core/libcgroup/{libcgroup_3.1.0.bb => libcgroup_3.2.0.bb} (84%)
diff mbox series

Patch

diff --git a/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch b/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch
deleted file mode 100644
index 4b743f9b33..0000000000
--- a/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-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
-
diff --git a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb b/meta/recipes-core/libcgroup/libcgroup_3.2.0.bb
similarity index 84%
rename from meta/recipes-core/libcgroup/libcgroup_3.1.0.bb
rename to meta/recipes-core/libcgroup/libcgroup_3.2.0.bb
index a1d27c7e7f..28562a5b37 100644
--- a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_3.2.0.bb
@@ -12,12 +12,10 @@  inherit autotools pkgconfig github-releases
 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 \
-"
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz"
 UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags"
 
-SRC_URI[sha256sum] = "976ec4b1e03c0498308cfd28f1b256b40858f636abc8d1f9db24f0a7ea9e1258"
+SRC_URI[sha256sum] = "9a0fc2d6c377215c3e0d849f9189ecd91fd075f1da0a24b73f56c8892e86bdfe"
 
 PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
 PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam"