diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-03 15:54:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-05 13:14:52 +0000 |
commit | bd73fa69f532ca3d81ec2452a79e7a333b3543c2 (patch) | |
tree | f2f560a066aeb717bcbcbba29bb6bb04b40ac3ce | |
parent | db1d22ab3853089e0012b51b8c1946a2a0a94375 (diff) | |
download | poky-bd73fa69f532ca3d81ec2452a79e7a333b3543c2.tar.gz |
recipes: Fix ALLOW_EMPTY with no package specified
There are various usages of ALLOW_EMPTY with no packages specified. This
is not recommended syntax, nor is it likely to be supported in the future.
This patch improves the references in OE-Core, either removing them if they're
pointless (e.g. when PACKAGES="") or specifying which package it applies to.
(From OE-Core rev: fe81bd4f600877e63433184cfc2e22c33bb77db6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/openssl/ocf-linux.inc b/meta/recipes-connectivity/openssl/ocf-linux.inc index dba1f029ac..4efdc2f6f9 100644 --- a/meta/recipes-connectivity/openssl/ocf-linux.inc +++ b/meta/recipes-connectivity/openssl/ocf-linux.inc | |||
@@ -20,5 +20,5 @@ do_install() { | |||
20 | install -m 0644 ${S}/ocf/*.h ${D}${includedir}/crypto/ | 20 | install -m 0644 ${S}/ocf/*.h ${D}${includedir}/crypto/ |
21 | } | 21 | } |
22 | 22 | ||
23 | ALLOW_EMPTY = "1" | 23 | ALLOW_EMPTY_${PN} = "1" |
24 | BBCLASSEXTEND = "native nativesdk" | 24 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index 99ac1a8645..76bf331fc7 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb | |||
@@ -2,7 +2,6 @@ DESCRIPTION = "Rebuild the package index" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | 3 | ||
4 | INHIBIT_DEFAULT_DEPS = "1" | 4 | INHIBIT_DEFAULT_DEPS = "1" |
5 | ALLOW_EMPTY = "1" | ||
6 | PACKAGES = "" | 5 | PACKAGES = "" |
7 | 6 | ||
8 | do_fetch[noexec] = "1" | 7 | do_fetch[noexec] = "1" |
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb index 227e866861..0cc3b3356b 100644 --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb | |||
@@ -26,8 +26,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
26 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 26 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
27 | LICENSE = "MIT" | 27 | LICENSE = "MIT" |
28 | 28 | ||
29 | ALLOW_EMPTY = "1" | ||
30 | |||
31 | PACKAGES = "" | 29 | PACKAGES = "" |
32 | 30 | ||
33 | PR = "r11" | 31 | PR = "r11" |
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index 76af99e8a8..68e06561f9 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc | |||
@@ -15,7 +15,7 @@ S = "${WORKDIR}/psmisc-${PV}" | |||
15 | 15 | ||
16 | inherit autotools gettext | 16 | inherit autotools gettext |
17 | 17 | ||
18 | ALLOW_EMPTY = "1" | 18 | ALLOW_EMPTY_${PN} = "1" |
19 | 19 | ||
20 | PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" | 20 | PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" |
21 | PACKAGES += "psmisc-extras" | 21 | PACKAGES += "psmisc-extras" |
diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb index 37c70c2190..210da3745e 100644 --- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb +++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb | |||
@@ -14,7 +14,11 @@ PACKAGES = "\ | |||
14 | gst-meta-debug \ | 14 | gst-meta-debug \ |
15 | gst-meta-video" | 15 | gst-meta-video" |
16 | 16 | ||
17 | ALLOW_EMPTY = "1" | 17 | ALLOW_EMPTY_gst-meta-base = "1" |
18 | ALLOW_EMPTY_gst-meta-x11-base = "1" | ||
19 | ALLOW_EMPTY_gst-meta-audio = "1" | ||
20 | ALLOW_EMPTY_gst-meta-debug = "1" | ||
21 | ALLOW_EMPTY_gst-meta-video = "1" | ||
18 | 22 | ||
19 | RDEPENDS_gst-meta-base = "\ | 23 | RDEPENDS_gst-meta-base = "\ |
20 | ${@base_contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \ | 24 | ${@base_contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \ |
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index f26aca5c85..3e9ef92fdd 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | |||
@@ -24,8 +24,6 @@ python populate_packages_prepend () { | |||
24 | d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') | 24 | d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') |
25 | } | 25 | } |
26 | 26 | ||
27 | ALLOW_EMPTY = "1" | ||
28 | |||
29 | PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" | 27 | PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" |
30 | FILES_${PN}-apps = "${bindir}" | 28 | FILES_${PN}-apps = "${bindir}" |
31 | 29 | ||