summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOla x Nilsson <ola.x.nilsson@axis.com>2018-03-06 14:44:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-08 10:39:32 -0800
commit551cb1f373417606c4fa6890eda469dec690d105 (patch)
tree7fc47918d6422c33ad0a4ef4ca52d43fe2ae9064
parentf1318b0421a4b8da0c08044cdce826de5f5a8cb7 (diff)
downloadpoky-551cb1f373417606c4fa6890eda469dec690d105.tar.gz
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. (From OE-Core rev: 02416e0d007c6c0f8c01a1e1fe0485b21087ec00) Signed-off-by: Ola x Nilsson <olani@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/libcgroup/libcgroup_0.41.bb11
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"
9 9
10inherit autotools pkgconfig 10inherit autotools pkgconfig
11 11
12DEPENDS = "bison-native flex-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 12DEPENDS = "bison-native flex-native"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2" 14SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2"
15SRC_URI_append_libc-musl = " file://musl-decls-compat.patch" 15SRC_URI_append_libc-musl = " file://musl-decls-compat.patch"
@@ -20,9 +20,10 @@ SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706
20UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/" 20UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/"
21 21
22DEPENDS_append_libc-musl = " fts " 22DEPENDS_append_libc-musl = " fts "
23EXTRA_OEMAKE_append_libc-musl = "LIBS=-lfts" 23EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts"
24 24
25EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}" 25PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
26PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam"
26 27
27PACKAGES =+ "cgroups-pam-plugin" 28PACKAGES =+ "cgroups-pam-plugin"
28FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" 29FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*"
@@ -33,8 +34,8 @@ do_install_append() {
33 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then 34 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
34 mkdir -p ${D}/${base_libdir}/ 35 mkdir -p ${D}/${base_libdir}/
35 mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/ 36 mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/
36 rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` 37 rm -f ${D}${libdir}/libcgroup.so
37 ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so 38 lnr ${D}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so
38 fi 39 fi
39 # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks. 40 # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks.
40 if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then 41 if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then