diff options
| author | Ola x Nilsson <ola.x.nilsson@axis.com> | 2018-03-06 14:44:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-08 10:31:58 -0800 |
| commit | 02416e0d007c6c0f8c01a1e1fe0485b21087ec00 (patch) | |
| tree | e042d112b7b1c0389087010300def65bf1026ae9 | |
| parent | 5569e6ef3ef646fa498f59b8dae1d5d34d0bb9c3 (diff) | |
| download | openembedded-core-02416e0d007c6c0f8c01a1e1fe0485b21087ec00.tar.gz openembedded-core-02416e0d007c6c0f8c01a1e1fe0485b21087ec00.tar.bz2 openembedded-core-02416e0d007c6c0f8c01a1e1fe0485b21087ec00.zip | |
libcgroup: Various fixes
* Use PACKAGECONFIG for pam instead of two bb.utils.contains
* Add leading whitespace to EXTRA_OEMAKE_append_libc_musl
* Usr lnr in do_install_append rather than a sed generated
../-sequence.
Signed-off-by: Ola x Nilsson <olani@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-core/libcgroup/libcgroup_0.41.bb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb index e4b1782ad4..7ddc81e9b7 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb @@ -9,7 +9,7 @@ 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_append_libc-musl = " file://musl-decls-compat.patch" @@ -20,9 +20,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*" @@ -33,8 +34,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 |