diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-04 13:09:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 12:32:10 +0000 |
| commit | 9c93526756e7cbbff027c88eb972f877bcb1f057 (patch) | |
| tree | 327939f0ff75f9b439ed8d851af1e552db64acad /meta/recipes-extended | |
| parent | 9a272ee6d72fc727a2dfe660ceded560a9f1ae88 (diff) | |
| download | openembedded-core-9c93526756e7cbbff027c88eb972f877bcb1f057.tar.gz openembedded-core-9c93526756e7cbbff027c88eb972f877bcb1f057.tar.bz2 openembedded-core-9c93526756e7cbbff027c88eb972f877bcb1f057.zip | |
classes/recipes: More optimal DISTRO_FEATURES references
Using the contains function results in more optimal sstate checksums
resulting in better cache reuse as we as more consistent code.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/at/at_3.1.14.bb | 9 | ||||
| -rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/screen/screen_4.0.3.bb | 9 | ||||
| -rw-r--r-- | meta/recipes-extended/sudo/sudo_1.8.8.bb | 9 |
4 files changed, 10 insertions, 19 deletions
diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.14.bb index f80b620e68..166a2a5804 100644 --- a/meta/recipes-extended/at/at_3.1.14.bb +++ b/meta/recipes-extended/at/at_3.1.14.bb @@ -54,10 +54,7 @@ do_install () { install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at - for feature in ${DISTRO_FEATURES}; do - if [ "$feature" = "pam" ]; then - install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd - break - fi - done + if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then + install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd + fi } diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index c9bdcb0908..8d0a5685b6 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb @@ -110,7 +110,7 @@ do_install() { } python do_pam_sanity () { - if "pam" not in d.getVar("DISTRO_FEATURES", True).split(): + if not base_contains('DISTRO_FEATURES', 'pam', True, False, d): bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") } addtask pam_sanity before do_configure diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb index be42fb9eec..b79b573e6c 100644 --- a/meta/recipes-extended/screen/screen_4.0.3.bb +++ b/meta/recipes-extended/screen/screen_4.0.3.bb @@ -36,12 +36,9 @@ EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" do_install_append () { - for feature in ${DISTRO_FEATURES}; do - if [ "$feature" = "pam" ]; then - install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen - break - fi - done + if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then + install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen + fi } pkg_postinst_${PN} () { diff --git a/meta/recipes-extended/sudo/sudo_1.8.8.bb b/meta/recipes-extended/sudo/sudo_1.8.8.bb index ba7c4ab454..6ab072f4db 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.8.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.8.bb @@ -14,12 +14,9 @@ RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limit EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" do_install_append () { - for feature in ${DISTRO_FEATURES}; do - if [ "$feature" = "pam" ]; then - install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo - break - fi - done + if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then + install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo + fi chmod 4111 ${D}${bindir}/sudo chmod 0440 ${D}${sysconfdir}/sudoers |