summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-netkit
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-03-01 18:30:49 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-03-07 13:30:26 +0100
commit0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (patch)
tree362ae6300bfa295709e24a4879639fb4c0fb5116 /meta-networking/recipes-netkit
parentb4524eb786472e69e28212a58a329a5e44e40547 (diff)
downloadmeta-openembedded-0c31f55bcfd6630d894dd2dda6ca483bea5de4ab.tar.gz
Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-netkit')
-rw-r--r--meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
index 8f08acf30..d61636ee8 100644
--- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
+++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
@@ -36,14 +36,14 @@ CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations"
36LDFLAGS += " -L${STAGING_LIBDIR} -lutil -lcrypt" 36LDFLAGS += " -L${STAGING_LIBDIR} -lutil -lcrypt"
37 37
38PACKAGECONFIG ??= "" 38PACKAGECONFIG ??= ""
39PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam", "", d)}" 39PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
40PACKAGECONFIG[pam] = " , --without-pam, libpam, libpam" 40PACKAGECONFIG[pam] = " , --without-pam, libpam, libpam"
41 41
42do_configure () { 42do_configure () {
43 ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} 43 ./configure --prefix=${prefix} --exec-prefix=${exec_prefix}
44 echo "INSTALLROOT=${D}" > MCONFIG 44 echo "INSTALLROOT=${D}" > MCONFIG
45 45
46 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then 46 if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then
47 echo "USE_PAM=1" >> MCONFIG 47 echo "USE_PAM=1" >> MCONFIG
48 fi 48 fi
49 49
@@ -65,7 +65,7 @@ do_install () {
65 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ 65 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \
66 'MANDIR=${mandir}' install 66 'MANDIR=${mandir}' install
67 67
68 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then 68 if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then
69 install -d ${D}${sysconfdir}/pam.d 69 install -d ${D}${sysconfdir}/pam.d
70 install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} 70 install -m 0644 debian/hosts.equiv ${D}/${sysconfdir}
71 install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec 71 install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec