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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/openssl/ocf-linux.inc b/meta/recipes-connectivity/openssl/ocf-linux.inc
index dba1f029acab43080a13c9bc57f3e3b9c3a6d5ab..4efdc2f6f95e9888cb49eee1468e7a5a5ec74348 100644 (file)
--- a/meta/recipes-connectivity/openssl/ocf-linux.inc
+++ b/meta/recipes-connectivity/openssl/ocf-linux.inc
@@ -20,5 +20,5 @@ do_install() {
     install -m 0644 ${S}/ocf/*.h ${D}${includedir}/crypto/
 }
 
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb
index 99ac1a8645ff14ee02e90218896cdb8ffba1430e..76bf331fc75d9841708051c2ff534bc3c996faea 100644 (file)
--- 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"
 LICENSE = "MIT"
 
 INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY = "1"
 PACKAGES = ""
 
 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 227e86686133417b8252f0415c4d50106c5d069e..0cc3b3356b2799d2722f1d26500939cddd7dbb77 100644 (file)
--- 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
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
 
-ALLOW_EMPTY = "1"
-
 PACKAGES = ""
 
 PR = "r11"

diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 76af99e8a8205aac130ba41758847369293b45d1..68e06561f9f2339507f8a7841aa645376bbfc434 100644 (file)
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -15,7 +15,7 @@ S = "${WORKDIR}/psmisc-${PV}"
 
 inherit autotools gettext
 
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
 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 37c70c21905c8eca2bf828365ade1e15474e355b..210da3745e724579158511c74f70952031c7b7d0 100644 (file)
--- 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 = "\
     gst-meta-debug \
     gst-meta-video"
 
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_gst-meta-base = "1"
+ALLOW_EMPTY_gst-meta-x11-base = "1"
+ALLOW_EMPTY_gst-meta-audio = "1"
+ALLOW_EMPTY_gst-meta-debug = "1"
+ALLOW_EMPTY_gst-meta-video = "1"
 
 RDEPENDS_gst-meta-base = "\
     ${@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 f26aca5c85bacc2621ec7c8e458c5de9e3ffe74d..3e9ef92fdd9a9ff3d4464060ec9986f71c82f92d 100644 (file)
--- 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 () {
     d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
 }
 
-ALLOW_EMPTY = "1"
-
 PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
 FILES_${PN}-apps = "${bindir}"