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>
2026-07-27 07:57:27 +00:00 · 2012-10-12 10:13:12 +02:00
parent 4cd60deb11
commit 8402b7ac0f
17 changed files with 17 additions and 17 deletions
@@ -30,4 +30,4 @@ python populate_packages_prepend () {
 FILES_evas-generic-loader-xcf += "${libdir}/evas/utils/*.xcf.gz"
 FILES_${PN}-dbg += "${libdir}/evas/utils/.debug"
-PACKAGES_DYNAMIC = "evas-generic-loader-*"
+PACKAGES_DYNAMIC += "^evas-generic-loader-.*"
@@ -40,7 +40,7 @@ FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/ ${libdir}/evas/cserve2/
 FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave"
 PACKAGES += "${PN}-cserve2"
-PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*"
+PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*"
 # evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon
 # http://www.intesis.hr/news/16-esvg-source
@@ -99,7 +99,7 @@ FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
 FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
 FILES_${PN}-templates      += "${datadir}/${PN}-${SHRT_VER}/templates"
-PACKAGES_DYNAMIC = "${PN}-meta ${PN}-plugin-*"
+PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*"
 python populate_packages_prepend () {
    abiword_libdir    = bb.data.expand('${libdir}/abiword-2.8/plugins', d)
@@ -40,7 +40,7 @@ FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
 FILES_${PN}-doc += " ${datadir}/gtk-doc"
-PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*"
 python populate_packages_prepend () {
    print bb.data.getVar('FILES_gnome-vfs', d, 1)
@@ -72,7 +72,7 @@ FILES_${PN}-dbg += " \
                    ${libdir}/gtk-3.0/modules/.debug"
-PACKAGES_DYNAMIC += "gtk3-immodule-* gtk3-printbackend-*"
+PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"
 python populate_packages_prepend () {
    import os.path
@@ -36,7 +36,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
            ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
            ${libdir}/bonobo/servers"
-PACKAGES_DYNAMIC = "goffice-plugin-*"
+PACKAGES_DYNAMIC += "^goffice-plugin-.*"
 python populate_packages_prepend () {
    goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins/', d)
@@ -92,7 +92,7 @@ RDEPENDS_klibc-utils-true = "${THIS_LIBKLIBC}"
 RDEPENDS_klibc-utils-umount = "${THIS_LIBKLIBC}"
 RDEPENDS_klibc-utils-uname = "${THIS_LIBKLIBC}"
-PACKAGES_DYNAMIC = "${KLIBC_UTILS_PKGNAME}-*"
+PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
 python populate_packages_prepend () {
@@ -35,7 +35,7 @@ python populate_packages_prepend() {
 PACKAGES =+ "${PN}-gtk"
-PACKAGES_DYNAMIC = "libcanberra-*"
+PACKAGES_DYNAMIC += "^libcanberra-.*"
 FILES_${PN}-gtk = "\
  ${sysconfdir}/gconf \
@@ -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-.*"
@@ -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)
@@ -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).*"
@@ -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)
@@ -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)
@@ -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)
@@ -16,4 +16,4 @@ python populate_packages_prepend () {
    do_split_packages(d, themedir, '^(.*)', 'xfwm4-old-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
 }
-PACKAGES_DYNAMIC += "xfwm4-old-theme-*"
+PACKAGES_DYNAMIC += "^xfwm4-old-theme-.*"
@@ -20,7 +20,7 @@ python populate_packages_prepend() {
                                         '${bindir}/*%s*'])
 }
-PACKAGES_DYNAMIC = "${PN}-plugin-*"
+PACKAGES_DYNAMIC += "^${PN}-plugin-.*"
 FILES_${PN} += "${libdir}/xfce4/panel/migrate \
                ${libdir}/xfce4/panel/wrapper"
@@ -14,7 +14,7 @@ python populate_packages_prepend () {
    do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
 }
-PACKAGES_DYNAMIC += "xfwm4-theme-*"
+PACKAGES_DYNAMIC += "^xfwm4-theme-.*"
 ALTERNATIVE_${PN} = "x-window-manager"
 ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4"