Patchwork recipes: Fix ALLOW_EMPTY with no package specified

login
register
mail settings
Submitter Richard Purdie
Date April 15, 2013, 11:07 a.m.
Message ID <1366024028-24911-2-git-send-email-richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/48205/
State New
Headers show

Comments

Richard Purdie - April 15, 2013, 11:07 a.m.
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>
---
 meta/recipes-connectivity/openssl/ocf-linux.inc           |    2 +-
 meta/recipes-core/meta/package-index.bb                   |    1 -
 meta/recipes-devtools/installer/adt-installer_1.0.bb      |    2 --
 meta/recipes-extended/psmisc/psmisc.inc                   |    2 +-
 meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb   |    6 +++++-
 meta/recipes-multimedia/gstreamer/gst-plugins-package.inc |    2 --
 6 files changed, 7 insertions(+), 8 deletions(-)
Martin Jansa - April 15, 2013, 11:43 a.m.
On Mon, Apr 15, 2013 at 12:07:02PM +0100, Richard Purdie wrote:
> 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.

Was this one sent by accident?

http://git.openembedded.org/openembedded-core/commit/?id=fe81bd4f600877e63433184cfc2e22c33bb77db6

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-connectivity/openssl/ocf-linux.inc           |    2 +-
>  meta/recipes-core/meta/package-index.bb                   |    1 -
>  meta/recipes-devtools/installer/adt-installer_1.0.bb      |    2 --
>  meta/recipes-extended/psmisc/psmisc.inc                   |    2 +-
>  meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb   |    6 +++++-
>  meta/recipes-multimedia/gstreamer/gst-plugins-package.inc |    2 --
>  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 dba1f02..4efdc2f 100644
> --- 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 99ac1a8..76bf331 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"
>  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 227e866..0cc3b33 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
>                      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 76af99e..68e0656 100644
> --- 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 37c70c2..210da37 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 = "\
>      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 f26aca5..3e9ef92 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 () {
>      d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
>  }
>  
> -ALLOW_EMPTY = "1"
> -
>  PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
>  FILES_${PN}-apps = "${bindir}"
>  
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - April 15, 2013, 12:06 p.m.
On Mon, 2013-04-15 at 13:43 +0200, Martin Jansa wrote:
> On Mon, Apr 15, 2013 at 12:07:02PM +0100, Richard Purdie wrote:
> > 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.
> 
> Was this one sent by accident?
> 
> http://git.openembedded.org/openembedded-core/commit/?id=fe81bd4f600877e63433184cfc2e22c33bb77db6

Yes, sent by accident, sorry about the noise.

Cheers,

Richard

Patch

diff --git a/meta/recipes-connectivity/openssl/ocf-linux.inc b/meta/recipes-connectivity/openssl/ocf-linux.inc
index dba1f02..4efdc2f 100644
--- 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 99ac1a8..76bf331 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"
 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 227e866..0cc3b33 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
                     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 76af99e..68e0656 100644
--- 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 37c70c2..210da37 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 = "\
     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 f26aca5..3e9ef92 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 () {
     d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
 }
 
-ALLOW_EMPTY = "1"
-
 PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
 FILES_${PN}-apps = "${bindir}"