diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-10-12 12:46:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-19 18:02:26 +0100 |
commit | 33b31640bf485bcfefee015e9df81aa9989b322c (patch) | |
tree | 8289b56e8d7055252d26d5eb496f74217986acec /meta/recipes-extended | |
parent | e9938516240e7ef3b5aeb47690828dd574ba2d8e (diff) | |
download | poky-33b31640bf485bcfefee015e9df81aa9989b322c.tar.gz |
PACKAGES_DYNAMIC: use regexp not glob
* bitbake uses PACKAGES_DYNAMIC as regexp
^ could make matching faster (and it will be more clear that we're expecting regexp not glob)
* made all those last '-' optional, use .* (or nothing)
(From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb index 85ea7083d0..47f7538046 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | |||
@@ -56,7 +56,7 @@ FILES_${PN} += "${sysconfdir} /www" | |||
56 | 56 | ||
57 | CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" | 57 | CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" |
58 | 58 | ||
59 | PACKAGES_DYNAMIC = "lighttpd-module-*" | 59 | PACKAGES_DYNAMIC = "^lighttpd-module-.*" |
60 | 60 | ||
61 | python populate_packages_prepend () { | 61 | python populate_packages_prepend () { |
62 | lighttpd_libdir = d.expand('${libdir}') | 62 | lighttpd_libdir = d.expand('${libdir}') |
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index c32cb146cd..fae0467e01 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb | |||
@@ -46,7 +46,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libd | |||
46 | FILES_${PN}-runtime = "${sysconfdir}" | 46 | FILES_${PN}-runtime = "${sysconfdir}" |
47 | FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" | 47 | FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" |
48 | 48 | ||
49 | PACKAGES_DYNAMIC += " pam-plugin-*" | 49 | PACKAGES_DYNAMIC += "^pam-plugin-.*" |
50 | 50 | ||
51 | RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" | 51 | RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" |
52 | RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory pam-plugin-succeed-if pam-plugin-time coreutils" | 52 | RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory pam-plugin-succeed-if pam-plugin-time coreutils" |