diff options
| -rw-r--r-- | meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-core/libcgroup/libcgroup_3.2.0.bb (renamed from meta/recipes-core/libcgroup/libcgroup_3.1.0.bb) | 6 |
2 files changed, 2 insertions, 41 deletions
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 @@ | |||
| 1 | From 592dcdcf243576bd2517d3da9bc18990de08e37e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Kamalesh Babulal <kamalesh.babulal@oracle.com> | ||
| 3 | Date: Mon, 27 Nov 2023 20:07:33 +0530 | ||
| 4 | Subject: [PATCH 1/1] include/Makefile: install systemd.h by default | ||
| 5 | |||
| 6 | Install systemd.h header file by default, as we have stub and defined | ||
| 7 | versions of the systemd functions for both non-systemd and systemd | ||
| 8 | enabled configurations. This will help packagers to ship package | ||
| 9 | without systemd support (--enable-systemd=no). | ||
| 10 | |||
| 11 | Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> | ||
| 12 | Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> | ||
| 13 | |||
| 14 | Upstream-Status: Backport [https://github.com/libcgroup/libcgroup/commit/592dcdcf243576bd2517d3da9bc18990de08e37e] | ||
| 15 | |||
| 16 | Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com> | ||
| 17 | --- | ||
| 18 | include/Makefile.am | 6 +----- | ||
| 19 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/include/Makefile.am b/include/Makefile.am | ||
| 22 | index 23cebaac..4cb05529 100644 | ||
| 23 | --- a/include/Makefile.am | ||
| 24 | +++ b/include/Makefile.am | ||
| 25 | @@ -2,8 +2,4 @@ | ||
| 26 | nobase_include_HEADERS = libcgroup.h libcgroup/error.h libcgroup/init.h \ | ||
| 27 | libcgroup/groups.h libcgroup/tasks.h \ | ||
| 28 | libcgroup/iterators.h libcgroup/config.h \ | ||
| 29 | - libcgroup/log.h libcgroup/tools.h | ||
| 30 | - | ||
| 31 | -if WITH_SYSTEMD | ||
| 32 | -nobase_include_HEADERS += libcgroup/systemd.h | ||
| 33 | -endif | ||
| 34 | + libcgroup/log.h libcgroup/tools.h libcgroup/systemd.h | ||
| 35 | -- | ||
| 36 | 2.39.2 | ||
| 37 | |||
diff --git a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb b/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 | |||
| 12 | DEPENDS = "bison-native flex-native" | 12 | DEPENDS = "bison-native flex-native" |
| 13 | DEPENDS:append:libc-musl = " fts" | 13 | DEPENDS:append:libc-musl = " fts" |
| 14 | 14 | ||
| 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz" |
| 16 | file://0001-include-Makefile-install-systemd.h-by-default.patch \ | ||
| 17 | " | ||
| 18 | UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags" | 16 | UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags" |
| 19 | 17 | ||
| 20 | SRC_URI[sha256sum] = "976ec4b1e03c0498308cfd28f1b256b40858f636abc8d1f9db24f0a7ea9e1258" | 18 | SRC_URI[sha256sum] = "9a0fc2d6c377215c3e0d849f9189ecd91fd075f1da0a24b73f56c8892e86bdfe" |
| 21 | 19 | ||
| 22 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" | 20 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" |
| 23 | PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" | 21 | PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" |
