diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-10-12 10:13:12 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-19 11:42:13 +0200 |
commit | 8402b7ac0f2e3b0afd9d56e16e7935e1887c7698 (patch) | |
tree | a91a90f104a11aa51c5abc40c3dfd4972f735881 /meta-oe | |
parent | 4cd60deb11a8a6f9134d7f6ec39255a35d921426 (diff) | |
download | meta-openembedded-8402b7ac0f2e3b0afd9d56e16e7935e1887c7698.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)
* use += instead of = in most cases to keep ${PN}-locale from
bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc5.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/libav/libav.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/freerdp/freerdp.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap_2.4.23.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin.inc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb index 00030d3b2..c2f1cc82e 100644 --- a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb +++ b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | |||
@@ -35,7 +35,7 @@ python populate_packages_prepend() { | |||
35 | 35 | ||
36 | PACKAGES =+ "${PN}-gtk" | 36 | PACKAGES =+ "${PN}-gtk" |
37 | 37 | ||
38 | PACKAGES_DYNAMIC = "libcanberra-*" | 38 | PACKAGES_DYNAMIC += "^libcanberra-.*" |
39 | 39 | ||
40 | FILES_${PN}-gtk = "\ | 40 | FILES_${PN}-gtk = "\ |
41 | ${sysconfdir}/gconf \ | 41 | ${sysconfdir}/gconf \ |
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc index 50b6b0efb..76669be2e 100644 --- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc +++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc | |||
@@ -73,5 +73,5 @@ python populate_packages_prepend() { | |||
73 | do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) | 73 | do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) |
74 | } | 74 | } |
75 | 75 | ||
76 | PACKAGES_DYNAMIC = "lcdd-driver-*" | 76 | PACKAGES_DYNAMIC += "^lcdd-driver-.*" |
77 | 77 | ||
diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb index 0d0388988..8e842c48f 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | |||
@@ -20,7 +20,7 @@ EXTRA_OECONF += "--with-plugins=none" | |||
20 | 20 | ||
21 | PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome" | 21 | PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome" |
22 | 22 | ||
23 | PACKAGES_DYNAMIC += "${PN}-theme-*" | 23 | PACKAGES_DYNAMIC += "^${PN}-theme-.*" |
24 | 24 | ||
25 | python populate_packages_prepend() { | 25 | python populate_packages_prepend() { |
26 | theme_dir = bb.data.expand('${datadir}/themes/', d) | 26 | theme_dir = bb.data.expand('${datadir}/themes/', d) |
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 4a1716f3a..0e80430eb 100644 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ b/meta-oe/recipes-multimedia/libav/libav.inc | |||
@@ -119,4 +119,4 @@ python populate_packages_prepend() { | |||
119 | allow_links=True) | 119 | allow_links=True) |
120 | } | 120 | } |
121 | 121 | ||
122 | PACKAGES_DYNAMIC = "lib(av(codec|device|filter|format|util)|postproc)*" | 122 | PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc).*" |
diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc index 46aecf613..673b37240 100644 --- a/meta-oe/recipes-support/freerdp/freerdp.inc +++ b/meta-oe/recipes-support/freerdp/freerdp.inc | |||
@@ -23,7 +23,7 @@ PACKAGES =+ "libfreerdp" | |||
23 | LEAD_SONAME = "libfreerdp.so" | 23 | LEAD_SONAME = "libfreerdp.so" |
24 | FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" | 24 | FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" |
25 | 25 | ||
26 | PACKAGES_DYNAMIC = "libfreerdp-plugin-*" | 26 | PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" |
27 | 27 | ||
28 | python populate_packages_prepend () { | 28 | python populate_packages_prepend () { |
29 | freerdp_root = bb.data.expand('${libdir}/freerdp', d) | 29 | freerdp_root = bb.data.expand('${libdir}/freerdp', d) |
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb index 3ef12d3a1..8d9bd6c6b 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb | |||
@@ -249,7 +249,7 @@ pkg_prerm_${PN}-slapd () { | |||
249 | update-rc.d $D openldap remove | 249 | update-rc.d $D openldap remove |
250 | } | 250 | } |
251 | 251 | ||
252 | PACKAGES_DYNAMIC = "openldap-backends openldap-backend-*" | 252 | PACKAGES_DYNAMIC += "^openldap-backends.* ^openldap-backend-.*" |
253 | 253 | ||
254 | python populate_packages_prepend () { | 254 | python populate_packages_prepend () { |
255 | backend_dir = bb.data.expand('${libexecdir}/openldap', d) | 255 | backend_dir = bb.data.expand('${libexecdir}/openldap', d) |
diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin.inc index 90e2fd4b6..cb2a59799 100644 --- a/meta-oe/recipes-support/pidgin/pidgin.inc +++ b/meta-oe/recipes-support/pidgin/pidgin.inc | |||
@@ -56,7 +56,7 @@ RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-i | |||
56 | FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" | 56 | FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" |
57 | FILES_${PN}-dev += "${libdir}/${PN}/*.la" | 57 | FILES_${PN}-dev += "${libdir}/${PN}/*.la" |
58 | 58 | ||
59 | PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" | 59 | PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" |
60 | 60 | ||
61 | python populate_packages_prepend () { | 61 | python populate_packages_prepend () { |
62 | pidgroot = bb.data.expand('${libdir}/pidgin', d) | 62 | pidgroot = bb.data.expand('${libdir}/pidgin', d) |