* [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob
@ 2012-10-12 10:46 Martin Jansa
2012-10-12 10:46 ` [PATCH 2/2] PACKAGES_DYNAMIC: use += instead of = in most cases Martin Jansa
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-12 10:46 UTC (permalink / raw)
To: openembedded-core
* 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)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/kernel.bbclass | 6 +++---
meta/conf/bitbake.conf | 2 +-
meta/recipes-connectivity/connman/connman.inc | 2 +-
meta/recipes-core/eglibc/eglibc-locale.inc | 6 +++---
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +-
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
meta/recipes-graphics/directfb/directfb.inc | 2 +-
meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
meta/recipes-graphics/pango/pango.inc | 2 +-
meta/recipes-kernel/linux/linux-dummy.bb | 4 ++--
meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 2 +-
20 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 36bc3c7..b17b0f5 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -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}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d375895..b3ebfd5 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -267,7 +267,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} \
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 5b94a1e..1460ba9 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -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")
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 105cf2e..16ace66 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -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"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index b00bf07..25eaf73 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -89,4 +89,4 @@ RRECOMMENDS_packagegroup-core-sdk = "\
# d.setVar('PACKAGES', ' '.join(pkgs))
#}
#
-#PACKAGES_DYNAMIC = "packagegroup-core-sdk-*"
+#PACKAGES_DYNAMIC = "^packagegroup-core-sdk-.*"
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index d9206d8..18a453a 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -304,8 +304,8 @@ python populate_packages_prepend () {
do_split_packages(d, libdir, '(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|auto\/)[^\/]).*)\.(pm|pl|e2x)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
}
-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"
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb
index 85ea708..47f7538 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"
CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
-PACKAGES_DYNAMIC = "lighttpd-module-*"
+PACKAGES_DYNAMIC = "^lighttpd-module-.*"
python populate_packages_prepend () {
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 c32cb14..fae0467 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
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"
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index 8d18b87..a77eee1 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -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 () {
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index 2d08dc2..5481f82 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -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"
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 259517e..d09c2b6 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -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"
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 6655217..41921dc 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -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')
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 2d5aa44..bae06dd 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -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/*"
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index c9e92f0..318403d 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -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"
diff --git a/meta/recipes-kernel/linux/linux-dummy.bb b/meta/recipes-kernel/linux/linux-dummy.bb
index 518c74b..a98a0f1 100644
--- a/meta/recipes-kernel/linux/linux-dummy.bb
+++ b/meta/recipes-kernel/linux/linux-dummy.bb
@@ -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"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index ccb81b3..b8db0f0 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -17,5 +17,5 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
require gst-plugins-package.inc
-PACKAGES_DYNAMIC = "${PN}-*"
+PACKAGES_DYNAMIC = "^${PN}-.*"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 3003eaa..a890c25 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -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"
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
index 9522d88..15273f7 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
@@ -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 () {
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 905e277..4a146f7 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -53,7 +53,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"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 35748f8..5bc7956 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -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} = ""
--
1.7.12
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] PACKAGES_DYNAMIC: use += instead of = in most cases
2012-10-12 10:46 [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Martin Jansa
@ 2012-10-12 10:46 ` Martin Jansa
2012-10-12 17:40 ` [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Saul Wold
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-12 10:46 UTC (permalink / raw)
To: openembedded-core
* to keep ${PN}-locale from
bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-connectivity/connman/connman.inc | 2 +-
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
meta/recipes-graphics/directfb/directfb.inc | 2 +-
meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
meta/recipes-graphics/pango/pango.inc | 2 +-
meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
meta/recipes-qt/qt4/qt4.inc | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 1460ba9..33c0be6 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -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")
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 25eaf73..dfe9a8a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -89,4 +89,4 @@ RRECOMMENDS_packagegroup-core-sdk = "\
# d.setVar('PACKAGES', ' '.join(pkgs))
#}
#
-#PACKAGES_DYNAMIC = "^packagegroup-core-sdk-.*"
+#PACKAGES_DYNAMIC += "^packagegroup-core-sdk-.*"
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 18a453a..0e2c329 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -304,8 +304,8 @@ python populate_packages_prepend () {
do_split_packages(d, libdir, '(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|auto\/)[^\/]).*)\.(pm|pl|e2x)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
}
-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"
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb
index 47f7538..6856f53 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"
CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
-PACKAGES_DYNAMIC = "^lighttpd-module-.*"
+PACKAGES_DYNAMIC += "^lighttpd-module-.*"
python populate_packages_prepend () {
lighttpd_libdir = d.expand('${libdir}')
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index d09c2b6..32d7be4 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -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"
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 41921dc..bc0071f 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -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')
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index bae06dd..07544ab 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -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/*"
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 318403d..b361978 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -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"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index b8db0f0..8799a91 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -17,5 +17,5 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
require gst-plugins-package.inc
-PACKAGES_DYNAMIC = "^${PN}-.*"
+PACKAGES_DYNAMIC += "^${PN}-.*"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index a890c25..4a3813e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -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"
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
index 15273f7..9068025 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
@@ -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 () {
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 5bc7956..c1a8387 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -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} = ""
--
1.7.12
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob
2012-10-12 10:46 [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Martin Jansa
2012-10-12 10:46 ` [PATCH 2/2] PACKAGES_DYNAMIC: use += instead of = in most cases Martin Jansa
@ 2012-10-12 17:40 ` Saul Wold
2012-10-12 17:56 ` Martin Jansa
2012-10-19 21:05 ` [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Saul Wold
2012-10-22 12:26 ` Richard Purdie
3 siblings, 1 reply; 9+ messages in thread
From: Saul Wold @ 2012-10-12 17:40 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 10/12/2012 03:46 AM, Martin Jansa wrote:
> * 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)
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/classes/kernel.bbclass | 6 +++---
> meta/conf/bitbake.conf | 2 +-
> meta/recipes-connectivity/connman/connman.inc | 2 +-
> meta/recipes-core/eglibc/eglibc-locale.inc | 6 +++---
> meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
> meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
> meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
> meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +-
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
> meta/recipes-graphics/directfb/directfb.inc | 2 +-
> meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
> meta/recipes-graphics/pango/pango.inc | 2 +-
> meta/recipes-kernel/linux/linux-dummy.bb | 4 ++--
> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
> meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 2 +-
> 20 files changed, 26 insertions(+), 26 deletions(-)
>
Martin,
Did you do any verification with the buildhistory tools to ensure
nothing changed in the packaging?
Thanks
Sau!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob
2012-10-12 17:40 ` [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Saul Wold
@ 2012-10-12 17:56 ` Martin Jansa
2012-10-16 19:39 ` Saul Wold
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2012-10-12 17:56 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2457 bytes --]
On Fri, Oct 12, 2012 at 10:40:56AM -0700, Saul Wold wrote:
> On 10/12/2012 03:46 AM, Martin Jansa wrote:
> > * 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)
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/classes/kernel.bbclass | 6 +++---
> > meta/conf/bitbake.conf | 2 +-
> > meta/recipes-connectivity/connman/connman.inc | 2 +-
> > meta/recipes-core/eglibc/eglibc-locale.inc | 6 +++---
> > meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
> > meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
> > meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
> > meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +-
> > meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 2 +-
> > meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> > meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
> > meta/recipes-graphics/directfb/directfb.inc | 2 +-
> > meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
> > meta/recipes-graphics/pango/pango.inc | 2 +-
> > meta/recipes-kernel/linux/linux-dummy.bb | 4 ++--
> > meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
> > meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
> > meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
> > meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> > meta/recipes-qt/qt4/qt4.inc | 2 +-
> > 20 files changed, 26 insertions(+), 26 deletions(-)
> >
> Martin,
>
> Did you do any verification with the buildhistory tools to ensure
> nothing changed in the packaging?
Yes, last 12 commits in
https://github.com/shr-distribution/buildhistory/commits/jama
e.g. for om-gta02
https://github.com/shr-distribution/buildhistory/commit/55d9cb4fa438e64c9fcc4ef0966164779c5dc974
https://github.com/shr-distribution/buildhistory/commit/c0b3897e04fd9669c557620ca48fde05f01e7aca
but it's together with last change to perl, eglibc, pkgconfig.
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob
2012-10-12 17:56 ` Martin Jansa
@ 2012-10-16 19:39 ` Saul Wold
2012-10-16 22:32 ` Martin Jansa
0 siblings, 1 reply; 9+ messages in thread
From: Saul Wold @ 2012-10-16 19:39 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 10/12/2012 10:56 AM, Martin Jansa wrote:
> On Fri, Oct 12, 2012 at 10:40:56AM -0700, Saul Wold wrote:
>> On 10/12/2012 03:46 AM, Martin Jansa wrote:
>>> * 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)
>>>
>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>> ---
>>> meta/classes/kernel.bbclass | 6 +++---
>>> meta/conf/bitbake.conf | 2 +-
>>> meta/recipes-connectivity/connman/connman.inc | 2 +-
>>> meta/recipes-core/eglibc/eglibc-locale.inc | 6 +++---
>>> meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
>>> meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
>>> meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
>>> meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +-
>>> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 2 +-
>>> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
>>> meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
>>> meta/recipes-graphics/directfb/directfb.inc | 2 +-
>>> meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
>>> meta/recipes-graphics/pango/pango.inc | 2 +-
>>> meta/recipes-kernel/linux/linux-dummy.bb | 4 ++--
>>> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
>>> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
>>> meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
>>> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
>>> meta/recipes-qt/qt4/qt4.inc | 2 +-
>>> 20 files changed, 26 insertions(+), 26 deletions(-)
>>>
>> Martin,
>>
>> Did you do any verification with the buildhistory tools to ensure
>> nothing changed in the packaging?
>
> Yes, last 12 commits in
> https://github.com/shr-distribution/buildhistory/commits/jama
>
> e.g. for om-gta02
> https://github.com/shr-distribution/buildhistory/commit/55d9cb4fa438e64c9fcc4ef0966164779c5dc974
> https://github.com/shr-distribution/buildhistory/commit/c0b3897e04fd9669c557620ca48fde05f01e7aca
>
> but it's together with last change to perl, eglibc, pkgconfig.
>
I did track down this failure to your change, possibly something missed
in kernel.bbclass:
> ERROR: Nothing RPROVIDES 'kernel-modules' (but /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-mips/build/meta/recipes-core/packagegroups/packagegroup-base.bb RDEPENDS on or otherwise requires it)
> NOTE: Runtime target 'kernel-modules' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['kernel-modules']
> NOTE: Runtime target 'packagegroup-base-extended' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['packagegroup-base-extended', 'kernel-modules']
I was attempting to build core-image-sato and core-image-sato-sdk on
qemumips or routerstation, I was able to see this failure on other
MACHINES also.
Thanks
Sau!
> Cheers,
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob
2012-10-16 19:39 ` Saul Wold
@ 2012-10-16 22:32 ` Martin Jansa
2012-10-16 22:34 ` [PATCH] kernel.bbclass: add kernel-modules to PACKAGES Martin Jansa
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2012-10-16 22:32 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3907 bytes --]
On Tue, Oct 16, 2012 at 12:39:34PM -0700, Saul Wold wrote:
> On 10/12/2012 10:56 AM, Martin Jansa wrote:
> > On Fri, Oct 12, 2012 at 10:40:56AM -0700, Saul Wold wrote:
> >> On 10/12/2012 03:46 AM, Martin Jansa wrote:
> >>> * 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)
> >>>
> >>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >>> ---
> >>> meta/classes/kernel.bbclass | 6 +++---
> >>> meta/conf/bitbake.conf | 2 +-
> >>> meta/recipes-connectivity/connman/connman.inc | 2 +-
> >>> meta/recipes-core/eglibc/eglibc-locale.inc | 6 +++---
> >>> meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
> >>> meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
> >>> meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
> >>> meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +-
> >>> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 2 +-
> >>> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> >>> meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
> >>> meta/recipes-graphics/directfb/directfb.inc | 2 +-
> >>> meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
> >>> meta/recipes-graphics/pango/pango.inc | 2 +-
> >>> meta/recipes-kernel/linux/linux-dummy.bb | 4 ++--
> >>> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
> >>> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
> >>> meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
> >>> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> >>> meta/recipes-qt/qt4/qt4.inc | 2 +-
> >>> 20 files changed, 26 insertions(+), 26 deletions(-)
> >>>
> >> Martin,
> >>
> >> Did you do any verification with the buildhistory tools to ensure
> >> nothing changed in the packaging?
> >
> > Yes, last 12 commits in
> > https://github.com/shr-distribution/buildhistory/commits/jama
> >
> > e.g. for om-gta02
> > https://github.com/shr-distribution/buildhistory/commit/55d9cb4fa438e64c9fcc4ef0966164779c5dc974
> > https://github.com/shr-distribution/buildhistory/commit/c0b3897e04fd9669c557620ca48fde05f01e7aca
> >
> > but it's together with last change to perl, eglibc, pkgconfig.
> >
> I did track down this failure to your change, possibly something missed
> in kernel.bbclass:
>
> > ERROR: Nothing RPROVIDES 'kernel-modules' (but /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-mips/build/meta/recipes-core/packagegroups/packagegroup-base.bb RDEPENDS on or otherwise requires it)
> > NOTE: Runtime target 'kernel-modules' is unbuildable, removing...
> > Missing or unbuildable dependency chain was: ['kernel-modules']
> > NOTE: Runtime target 'packagegroup-base-extended' is unbuildable, removing...
> > Missing or unbuildable dependency chain was: ['packagegroup-base-extended', 'kernel-modules']
True, kernel-module-* was also matching kernel-modules which is added to
PACKAGES later in python.
I'm sending 2 alternative patches to resolve this
1) adding ^kernel-modules$ to PACKAGES_DYNAMIC
2) adding kernel-modules as normal package to PACKAGES and simplify
populate_packages_prepend
I prefer 2nd solution, but maybe someone will find some reason why 1st is
better.
> I was attempting to build core-image-sato and core-image-sato-sdk on
> qemumips or routerstation, I was able to see this failure on other
> MACHINES also.
>
> Thanks
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] kernel.bbclass: add kernel-modules to PACKAGES
2012-10-16 22:32 ` Martin Jansa
@ 2012-10-16 22:34 ` Martin Jansa
0 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-16 22:34 UTC (permalink / raw)
To: openembedded-core
* kernel-modules is always added to PACKAGES later in python code and
needed to be defined as PACKAGES_DYNAMIC
* add it to PACKAGES directly and set
ALLOW_EMPTY_kernel-modules
FILES_kernel-modules
DESCRIPTION_kernel-modules
outside populate_packages_prepend like for other packages and set only
RDEPENDS_kernel-modules from python code
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/kernel.bbclass | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 7b03e29..f54b024 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -259,11 +259,12 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
# kernel-base becomes kernel-${KERNEL_VERSION}
# kernel-image becomes kernel-image-${KERNEL_VERISON}
-PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev"
+PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
FILES = ""
FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}"
FILES_kernel-vmlinux = "/boot/vmlinux*"
+FILES_kernel-modules = ""
RDEPENDS_kernel = "kernel-base"
# Allow machines to override this dependency if kernel image files are
# not wanted in images as standard
@@ -274,6 +275,8 @@ RPROVIDES_kernel-base += "kernel-${KERNEL_VERSION}"
ALLOW_EMPTY_kernel = "1"
ALLOW_EMPTY_kernel-base = "1"
ALLOW_EMPTY_kernel-image = "1"
+ALLOW_EMPTY_kernel-modules = "1"
+DESCRIPTION_kernel-modules = "Kernel modules meta package"
pkg_postinst_kernel-image () {
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
@@ -457,8 +460,6 @@ python populate_packages_prepend () {
import re
metapkg = "kernel-modules"
- d.setVar('ALLOW_EMPTY_' + metapkg, "1")
- d.setVar('FILES_' + metapkg, "")
blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
for l in module_deps.values():
for i in l:
@@ -470,9 +471,6 @@ python populate_packages_prepend () {
if not pkg in blacklist and not pkg in metapkg_rdepends:
metapkg_rdepends.append(pkg)
d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
- d.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package')
- packages.append(metapkg)
- d.setVar('PACKAGES', ' '.join(packages))
}
# Support checking the kernel size since some kernels need to reside in partitions
--
1.7.12.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob
2012-10-12 10:46 [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Martin Jansa
2012-10-12 10:46 ` [PATCH 2/2] PACKAGES_DYNAMIC: use += instead of = in most cases Martin Jansa
2012-10-12 17:40 ` [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Saul Wold
@ 2012-10-19 21:05 ` Saul Wold
2012-10-22 12:26 ` Richard Purdie
3 siblings, 0 replies; 9+ messages in thread
From: Saul Wold @ 2012-10-19 21:05 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 10/12/2012 03:46 AM, Martin Jansa wrote:
> * 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)
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/classes/kernel.bbclass | 6 +++---
> meta/conf/bitbake.conf | 2 +-
> meta/recipes-connectivity/connman/connman.inc | 2 +-
> meta/recipes-core/eglibc/eglibc-locale.inc | 6 +++---
> meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
> meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
> meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
> meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +-
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
> meta/recipes-graphics/directfb/directfb.inc | 2 +-
> meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
> meta/recipes-graphics/pango/pango.inc | 2 +-
> meta/recipes-kernel/linux/linux-dummy.bb | 4 ++--
> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
> meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 2 +-
> 20 files changed, 26 insertions(+), 26 deletions(-)
>
Merged these 2 patches, but I think RP did not merged the kernel.bbclass
change, not sure why, we both pinged him.
Thanks
Sau!
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 36bc3c7..b17b0f5 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -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}"
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index d375895..b3ebfd5 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -267,7 +267,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} \
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index 5b94a1e..1460ba9 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -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")
> diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
> index 105cf2e..16ace66 100644
> --- a/meta/recipes-core/eglibc/eglibc-locale.inc
> +++ b/meta/recipes-core/eglibc/eglibc-locale.inc
> @@ -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"
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
> index b00bf07..25eaf73 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
> @@ -89,4 +89,4 @@ RRECOMMENDS_packagegroup-core-sdk = "\
> # d.setVar('PACKAGES', ' '.join(pkgs))
> #}
> #
> -#PACKAGES_DYNAMIC = "packagegroup-core-sdk-*"
> +#PACKAGES_DYNAMIC = "^packagegroup-core-sdk-.*"
> diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
> index d9206d8..18a453a 100644
> --- a/meta/recipes-devtools/perl/perl_5.14.2.bb
> +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
> @@ -304,8 +304,8 @@ python populate_packages_prepend () {
> do_split_packages(d, libdir, '(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|auto\/)[^\/]).*)\.(pm|pl|e2x)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
> }
>
> -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"
>
> diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb
> index 85ea708..47f7538 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"
>
> CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
>
> -PACKAGES_DYNAMIC = "lighttpd-module-*"
> +PACKAGES_DYNAMIC = "^lighttpd-module-.*"
>
> python populate_packages_prepend () {
> 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 c32cb14..fae0467 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
> 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"
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> index 8d18b87..a77eee1 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> @@ -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 () {
> diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
> index 2d08dc2..5481f82 100644
> --- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
> +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
> @@ -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"
> diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
> index 259517e..d09c2b6 100644
> --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
> +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
> @@ -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"
> diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
> index 6655217..41921dc 100644
> --- a/meta/recipes-graphics/directfb/directfb.inc
> +++ b/meta/recipes-graphics/directfb/directfb.inc
> @@ -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')
> diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> index 2d5aa44..bae06dd 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> @@ -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/*"
>
> diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
> index c9e92f0..318403d 100644
> --- a/meta/recipes-graphics/pango/pango.inc
> +++ b/meta/recipes-graphics/pango/pango.inc
> @@ -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"
>
> diff --git a/meta/recipes-kernel/linux/linux-dummy.bb b/meta/recipes-kernel/linux/linux-dummy.bb
> index 518c74b..a98a0f1 100644
> --- a/meta/recipes-kernel/linux/linux-dummy.bb
> +++ b/meta/recipes-kernel/linux/linux-dummy.bb
> @@ -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"
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> index ccb81b3..b8db0f0 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> @@ -17,5 +17,5 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
>
> require gst-plugins-package.inc
>
> -PACKAGES_DYNAMIC = "${PN}-*"
> +PACKAGES_DYNAMIC = "^${PN}-.*"
>
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 3003eaa..a890c25 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -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"
> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
> index 9522d88..15273f7 100644
> --- a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
> +++ b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
> @@ -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 () {
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index 905e277..4a146f7 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -53,7 +53,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"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 35748f8..5bc7956 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -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} = ""
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob
2012-10-12 10:46 [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Martin Jansa
` (2 preceding siblings ...)
2012-10-19 21:05 ` [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Saul Wold
@ 2012-10-22 12:26 ` Richard Purdie
3 siblings, 0 replies; 9+ messages in thread
From: Richard Purdie @ 2012-10-22 12:26 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On Fri, 2012-10-12 at 12:46 +0200, Martin Jansa wrote:
> * 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)
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/classes/kernel.bbclass | 6 +++---
> meta/conf/bitbake.conf | 2 +-
> meta/recipes-connectivity/connman/connman.inc | 2 +-
> meta/recipes-core/eglibc/eglibc-locale.inc | 6 +++---
> meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 +-
> meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++--
> meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 +-
> meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +-
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 +-
> meta/recipes-graphics/directfb/directfb.inc | 2 +-
> meta/recipes-graphics/mesa/mesa-dri.inc | 2 +-
> meta/recipes-graphics/pango/pango.inc | 2 +-
> meta/recipes-kernel/linux/linux-dummy.bb | 4 ++--
> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 +-
> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
> meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 +-
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 2 +-
> 20 files changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 36bc3c7..b17b0f5 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -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-.*"
FWIW, these changes broke multilib. I've proposed a patch which at least
makes the mulitlib builds work again.
Cheers,
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-10-22 12:39 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-12 10:46 [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Martin Jansa
2012-10-12 10:46 ` [PATCH 2/2] PACKAGES_DYNAMIC: use += instead of = in most cases Martin Jansa
2012-10-12 17:40 ` [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Saul Wold
2012-10-12 17:56 ` Martin Jansa
2012-10-16 19:39 ` Saul Wold
2012-10-16 22:32 ` Martin Jansa
2012-10-16 22:34 ` [PATCH] kernel.bbclass: add kernel-modules to PACKAGES Martin Jansa
2012-10-19 21:05 ` [PATCH 1/2] PACKAGES_DYNAMIC: use regexp not glob Saul Wold
2012-10-22 12:26 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox