diff options
Diffstat (limited to 'meta/recipes-core/libcgroup/libcgroup_0.41.bb')
| -rw-r--r-- | meta/recipes-core/libcgroup/libcgroup_0.41.bb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb index 95979630ad..92d7261b0d 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb @@ -1,4 +1,5 @@ SUMMARY = "Linux control group abstraction library" +HOMEPAGE = "http://libcg.sourceforge.net/" DESCRIPTION = "libcgroup is a library that abstracts the control group file system \ in Linux. Control groups allow you to limit, account and isolate resource usage \ (CPU, memory, disk I/O, etc.) of groups of processes." @@ -8,9 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit autotools pkgconfig -DEPENDS = "bison-native flex-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "bison-native flex-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2 \ + file://CVE-2018-14348.patch" SRC_URI_append_libc-musl = " file://musl-decls-compat.patch" SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f" @@ -19,9 +21,10 @@ SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = "LIBS=-lfts" +EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" -EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}" +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" PACKAGES =+ "cgroups-pam-plugin" FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" @@ -32,8 +35,8 @@ do_install_append() { if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then mkdir -p ${D}/${base_libdir}/ mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/ - rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` - ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so + rm -f ${D}${libdir}/libcgroup.so + lnr ${D}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so fi # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks. if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then |