MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

PACKAGES_DYNAMIC: use regexp not glob

Browse Source 
* 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>
This commit is contained in:
Martin Jansa 2012-10-12 12:46:38 +02:00 committed by Richard Purdie
parent e993851624
commit 33b31640bf
20 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/kernel.bbclass
View File

@ -24,9 +24,9 @@ python __anonymous () {
inherit kernel-arch deploy
PACKAGES_DYNAMIC += "kernel-module-*"
PACKAGES_DYNAMIC += "kernel-image-*"
PACKAGES_DYNAMIC += "kernel-firmware-*"
PACKAGES_DYNAMIC += "^kernel-module-.*"
PACKAGES_DYNAMIC += "^kernel-image-.*"
PACKAGES_DYNAMIC += "^kernel-firmware-.*"
export OS = "${TARGET_OS}"
export CROSS_COMPILE = "${TARGET_PREFIX}"

2
meta/conf/bitbake.conf
View File

@ -268,7 +268,7 @@ SOLIBSDEV_darwin9 = ".dylib"
PACKAGE_BEFORE_PN ?= ""
PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
PACKAGES_DYNAMIC = "${PN}-locale-*"
PACKAGES_DYNAMIC = "^${PN}-locale-.*"
FILES = ""
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \

2
meta/recipes-connectivity/connman/connman.inc
View File

@ -93,7 +93,7 @@ RDEPENDS_${PN} = "\
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
"
PACKAGES_DYNAMIC = "${PN}-plugin-*"
PACKAGES_DYNAMIC = "^${PN}-plugin-.*"
python populate_packages_prepend() {
depmap = dict(pppd="ppp")

6
meta/recipes-core/eglibc/eglibc-locale.inc
View File

@ -33,9 +33,9 @@ PROVIDES = "virtual/libc-locale"
PACKAGES = "localedef ${PN}-dbg"
PACKAGES_DYNAMIC = "locale-base-* \
eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*"
PACKAGES_DYNAMIC = "^locale-base-.* \
^eglibc-gconv-.* ^eglibc-charmap-.* ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
^glibc-gconv-.* ^glibc-charmap-.* ^glibc-localedata-.* ^glibc-binary-localedata-.*"
# Create a eglibc-binaries package
ALLOW_EMPTY_${BPN}-binaries = "1"

2
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
View File

@ -74,4 +74,4 @@ RRECOMMENDS_packagegroup-core-sdk = "\
# d.setVar('PACKAGES', ' '.join(pkgs))
#}
#
#PACKAGES_DYNAMIC = "packagegroup-core-sdk-*"
#PACKAGES_DYNAMIC = "^packagegroup-core-sdk-.*"

4
meta/recipes-devtools/perl/perl_5.14.2.bb
View File

@ -310,8 +310,8 @@ python populate_packages_prepend () {
d.setVar("RRECOMMENDS_${PN}-modules", d.getVar('PACKAGES', True).replace('${PN}-modules ', '').replace('${PN}-dbg ', '').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ', '').replace('${PN}-doc ', ''))
}
PACKAGES_DYNAMIC = "perl-module-*"
PACKAGES_DYNAMIC_virtclass-nativesdk = "nativesdk-perl-module-*"
PACKAGES_DYNAMIC = "^perl-module-.*"
PACKAGES_DYNAMIC_virtclass-nativesdk = "^nativesdk-perl-module-.*"
RPROVIDES_perl-lib = "perl-lib"

2
meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb
View File

@ -56,7 +56,7 @@ FILES_${PN} += "${sysconfdir} /www"
CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
PACKAGES_DYNAMIC = "lighttpd-module-*"
PACKAGES_DYNAMIC = "^lighttpd-module-.*"
python populate_packages_prepend () {
lighttpd_libdir = d.expand('${libdir}')

2
meta/recipes-extended/pam/libpam_1.1.6.bb
View File

@ -46,7 +46,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libd
FILES_${PN}-runtime = "${sysconfdir}"
FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests"
PACKAGES_DYNAMIC += " pam-plugin-*"
PACKAGES_DYNAMIC += "^pam-plugin-.*"
RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix"
RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory pam-plugin-succeed-if pam-plugin-time coreutils"

2
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
View File

@ -72,7 +72,7 @@ if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
fi
}
PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*"
PACKAGES_DYNAMIC_virtclass-native = ""
python populate_packages_prepend () {

2
meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
View File

@ -36,7 +36,7 @@ EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-gli
LIBV = "2.10.0"
PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*"
PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*"
BBCLASSEXTEND = "native"
RRECOMMENDS_${PN}_virtclass-native = ""
DEPENDS_virtclass-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native"

2
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
View File

@ -10,7 +10,7 @@ DEPENDS = "gtk+"
PR = "r3"
PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
PACKAGES_DYNAMIC = "^gtk-engine-.* ^gtk-theme-.*"
RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
RDEPENDS_gtk-theme-metal = "gtk-engine-metal"

2
meta/recipes-graphics/directfb/directfb.inc
View File

@ -32,7 +32,7 @@ EXTRA_OECONF = "\
--disable-x11 \
"
#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
#PACKAGES_DYNAMIC = "^directfb-inputdrivers-.*"
#
#python populate_packages_prepend () {
# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers')

2
meta/recipes-graphics/mesa/mesa-dri.inc
View File

@ -21,7 +21,7 @@ python populate_packages_prepend() {
do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
}
PACKAGES_DYNAMIC = "mesa-dri-driver-*"
PACKAGES_DYNAMIC = "^mesa-dri-driver-.*"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"

2
meta/recipes-graphics/pango/pango.inc
View File

@ -18,7 +18,7 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
BBCLASSEXTEND = "native"
DEPENDS_virtclass-native = "glib-2.0-native cairo-native"
PACKAGES_DYNAMIC = "pango-module-*"
PACKAGES_DYNAMIC = "^pango-module-.*"
RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"

4
meta/recipes-kernel/linux/linux-dummy.bb
View File

@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
PROVIDES += "virtual/kernel"
PACKAGES_DYNAMIC += "kernel-module-*"
PACKAGES_DYNAMIC += "kernel-image-*"
PACKAGES_DYNAMIC += "^kernel-module-.*"
PACKAGES_DYNAMIC += "^kernel-image-.*"
#COMPATIBLE_MACHINE = "your_machine"

2
meta/recipes-multimedia/gstreamer/gst-plugins.inc
View File

@ -17,5 +17,5 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
require gst-plugins-package.inc
PACKAGES_DYNAMIC = "${PN}-*"
PACKAGES_DYNAMIC = "^${PN}-.*"

2
meta/recipes-multimedia/pulseaudio/pulseaudio.inc
View File

@ -70,7 +70,7 @@ PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple li
#upgrade path:
RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
PACKAGES_DYNAMIC = "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* "
FILES_libpulsecore = "${libdir}/libpulsecore*.so"
FILES_libpulsecommon = "${libdir}/libpulsecommon*.so"

2
meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
View File

@ -26,7 +26,7 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
-DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
-DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
"
PACKAGES_DYNAMIC = "qmmp-plugin-* "
PACKAGES_DYNAMIC = "^qmmp-plugin-.* "
python populate_packages_prepend () {

2
meta/recipes-qt/qt4/qt4-embedded.inc
View File

@ -59,7 +59,7 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \
${QT_BASE_NAME}-fonts"
ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
PACKAGES_DYNAMIC += "${QT_BASE_NAME}-fonts-*"
PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-fonts-.*"
FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"

2
meta/recipes-qt/qt4/qt4.inc
View File

@ -124,7 +124,7 @@ PACKAGES += " \
${STATICDEV_PACKAGES} \
${OTHER_PACKAGES}"
PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-*"
PACKAGES_DYNAMIC = "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.* ^${QT_BASE_NAME}-phrasebook-.*"
ALLOW_EMPTY_${PN} = "1"
FILES_${PN} = ""