From 8402b7ac0f2e3b0afd9d56e16e7935e1887c7698 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 12 Oct 2012 10:13:12 +0200 Subject: 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 --- meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | 2 +- meta-oe/recipes-extended/lcdproc/lcdproc5.inc | 2 +- meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 2 +- meta-oe/recipes-multimedia/libav/libav.inc | 2 +- meta-oe/recipes-support/freerdp/freerdp.inc | 2 +- meta-oe/recipes-support/openldap/openldap_2.4.23.bb | 2 +- meta-oe/recipes-support/pidgin/pidgin.inc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb index 00030d3b29..c2f1cc82e6 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() { PACKAGES =+ "${PN}-gtk" -PACKAGES_DYNAMIC = "libcanberra-*" +PACKAGES_DYNAMIC += "^libcanberra-.*" FILES_${PN}-gtk = "\ ${sysconfdir}/gconf \ diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc index 50b6b0efb4..76669be2ea 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() { do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) } -PACKAGES_DYNAMIC = "lcdd-driver-*" +PACKAGES_DYNAMIC += "^lcdd-driver-.*" 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 0d03889884..8e842c48fe 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" PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome" -PACKAGES_DYNAMIC += "${PN}-theme-*" +PACKAGES_DYNAMIC += "^${PN}-theme-.*" python populate_packages_prepend() { 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 4a1716f3a5..0e80430eb2 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() { allow_links=True) } -PACKAGES_DYNAMIC = "lib(av(codec|device|filter|format|util)|postproc)*" +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 46aecf6130..673b37240a 100644 --- a/meta-oe/recipes-support/freerdp/freerdp.inc +++ b/meta-oe/recipes-support/freerdp/freerdp.inc @@ -23,7 +23,7 @@ PACKAGES =+ "libfreerdp" LEAD_SONAME = "libfreerdp.so" FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" -PACKAGES_DYNAMIC = "libfreerdp-plugin-*" +PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" python populate_packages_prepend () { 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 3ef12d3a1f..8d9bd6c6b6 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 () { update-rc.d $D openldap remove } -PACKAGES_DYNAMIC = "openldap-backends openldap-backend-*" +PACKAGES_DYNAMIC += "^openldap-backends.* ^openldap-backend-.*" python populate_packages_prepend () { 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 90e2fd4b66..cb2a59799a 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 FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" FILES_${PN}-dev += "${libdir}/${PN}/*.la" -PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" +PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" python populate_packages_prepend () { pidgroot = bb.data.expand('${libdir}/pidgin', d) -- cgit 1.2.3-korg