diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-10-12 12:46:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-19 18:02:26 +0100 |
commit | fadb4079014514beb7d2d3e6c66f63397d4ebce2 (patch) | |
tree | a1f6db9ac465274a2cb99bf4fe9b7e677dc7453b | |
parent | 33b31640bf485bcfefee015e9df81aa9989b322c (diff) | |
download | poky-fadb4079014514beb7d2d3e6c66f63397d4ebce2.tar.gz |
PACKAGES_DYNAMIC: use += instead of = in most cases
* to keep ${PN}-locale from
bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"
(From OE-Core rev: 73252b16b501c0986b0ca0895e4534895a9ba3db)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.14.2.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/directfb/directfb.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 | ||||
-rw-r--r-- | 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 1460ba99aa..33c0be6880 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -93,7 +93,7 @@ RDEPENDS_${PN} = "\ | |||
93 | ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ | 93 | ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ |
94 | " | 94 | " |
95 | 95 | ||
96 | PACKAGES_DYNAMIC = "^${PN}-plugin-.*" | 96 | PACKAGES_DYNAMIC += "^${PN}-plugin-.*" |
97 | 97 | ||
98 | python populate_packages_prepend() { | 98 | python populate_packages_prepend() { |
99 | depmap = dict(pppd="ppp") | 99 | 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 0b14e8039a..172398929c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | |||
@@ -74,4 +74,4 @@ RRECOMMENDS_packagegroup-core-sdk = "\ | |||
74 | # d.setVar('PACKAGES', ' '.join(pkgs)) | 74 | # d.setVar('PACKAGES', ' '.join(pkgs)) |
75 | #} | 75 | #} |
76 | # | 76 | # |
77 | #PACKAGES_DYNAMIC = "^packagegroup-core-sdk-.*" | 77 | #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 356ddb1dd6..799b86f900 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb | |||
@@ -310,8 +310,8 @@ python populate_packages_prepend () { | |||
310 | 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 ', '')) | 310 | 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 ', '')) |
311 | } | 311 | } |
312 | 312 | ||
313 | PACKAGES_DYNAMIC = "^perl-module-.*" | 313 | PACKAGES_DYNAMIC += "^perl-module-.*" |
314 | PACKAGES_DYNAMIC_virtclass-nativesdk = "^nativesdk-perl-module-.*" | 314 | PACKAGES_DYNAMIC_virtclass-nativesdk += "^nativesdk-perl-module-.*" |
315 | 315 | ||
316 | RPROVIDES_perl-lib = "perl-lib" | 316 | RPROVIDES_perl-lib = "perl-lib" |
317 | 317 | ||
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.31.bb index 47f7538046..6856f538b5 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" | |||
56 | 56 | ||
57 | CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" | 57 | CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" |
58 | 58 | ||
59 | PACKAGES_DYNAMIC = "^lighttpd-module-.*" | 59 | PACKAGES_DYNAMIC += "^lighttpd-module-.*" |
60 | 60 | ||
61 | python populate_packages_prepend () { | 61 | python populate_packages_prepend () { |
62 | lighttpd_libdir = d.expand('${libdir}') | 62 | 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 d09c2b63cc..32d7be45a5 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+" | |||
10 | 10 | ||
11 | PR = "r3" | 11 | PR = "r3" |
12 | 12 | ||
13 | PACKAGES_DYNAMIC = "^gtk-engine-.* ^gtk-theme-.*" | 13 | PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*" |
14 | 14 | ||
15 | RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" | 15 | RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" |
16 | RDEPENDS_gtk-theme-metal = "gtk-engine-metal" | 16 | RDEPENDS_gtk-theme-metal = "gtk-engine-metal" |
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 41921dc9aa..bc0071f128 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc | |||
@@ -32,7 +32,7 @@ EXTRA_OECONF = "\ | |||
32 | --disable-x11 \ | 32 | --disable-x11 \ |
33 | " | 33 | " |
34 | 34 | ||
35 | #PACKAGES_DYNAMIC = "^directfb-inputdrivers-.*" | 35 | #PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" |
36 | # | 36 | # |
37 | #python populate_packages_prepend () { | 37 | #python populate_packages_prepend () { |
38 | # inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') | 38 | # 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 bae06dd010..07544abd45 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() { | |||
21 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') | 21 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') |
22 | } | 22 | } |
23 | 23 | ||
24 | PACKAGES_DYNAMIC = "^mesa-dri-driver-.*" | 24 | PACKAGES_DYNAMIC += "^mesa-dri-driver-.*" |
25 | 25 | ||
26 | FILES_${PN}-dbg += "${libdir}/dri/.debug/*" | 26 | FILES_${PN}-dbg += "${libdir}/dri/.debug/*" |
27 | 27 | ||
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 318403d326..b36197895c 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}" | |||
18 | BBCLASSEXTEND = "native" | 18 | BBCLASSEXTEND = "native" |
19 | DEPENDS_virtclass-native = "glib-2.0-native cairo-native" | 19 | DEPENDS_virtclass-native = "glib-2.0-native cairo-native" |
20 | 20 | ||
21 | PACKAGES_DYNAMIC = "^pango-module-.*" | 21 | PACKAGES_DYNAMIC += "^pango-module-.*" |
22 | 22 | ||
23 | RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" | 23 | RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" |
24 | 24 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc index b8db0f0042..8799a91fc4 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" | |||
17 | 17 | ||
18 | require gst-plugins-package.inc | 18 | require gst-plugins-package.inc |
19 | 19 | ||
20 | PACKAGES_DYNAMIC = "^${PN}-.*" | 20 | PACKAGES_DYNAMIC += "^${PN}-.*" |
21 | 21 | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index e1d36ed5d1..463777d363 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 | |||
70 | #upgrade path: | 70 | #upgrade path: |
71 | RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" | 71 | RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" |
72 | 72 | ||
73 | PACKAGES_DYNAMIC = "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* " | 73 | PACKAGES_DYNAMIC += "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* " |
74 | 74 | ||
75 | FILES_libpulsecore = "${libdir}/libpulsecore*.so" | 75 | FILES_libpulsecore = "${libdir}/libpulsecore*.so" |
76 | FILES_libpulsecommon = "${libdir}/libpulsecommon*.so" | 76 | 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 15273f7873..906802555a 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} \ | |||
26 | -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ | 26 | -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ |
27 | -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ | 27 | -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ |
28 | " | 28 | " |
29 | PACKAGES_DYNAMIC = "^qmmp-plugin-.* " | 29 | PACKAGES_DYNAMIC += "^qmmp-plugin-.* " |
30 | 30 | ||
31 | 31 | ||
32 | python populate_packages_prepend () { | 32 | python populate_packages_prepend () { |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 5bc7956120..c1a83871de 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -124,7 +124,7 @@ PACKAGES += " \ | |||
124 | ${STATICDEV_PACKAGES} \ | 124 | ${STATICDEV_PACKAGES} \ |
125 | ${OTHER_PACKAGES}" | 125 | ${OTHER_PACKAGES}" |
126 | 126 | ||
127 | PACKAGES_DYNAMIC = "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.* ^${QT_BASE_NAME}-phrasebook-.*" | 127 | PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.* ^${QT_BASE_NAME}-phrasebook-.*" |
128 | 128 | ||
129 | ALLOW_EMPTY_${PN} = "1" | 129 | ALLOW_EMPTY_${PN} = "1" |
130 | FILES_${PN} = "" | 130 | FILES_${PN} = "" |