Patchwork [RFC] openssh/dropbear: No need for each to PROVIDE ssh/sshd

login
register
mail settings
Submitter Richard Purdie
Date July 5, 2011, 1:33 p.m.
Message ID <1309872782.20015.710.camel@rex>
Download mbox | patch
Permalink /patch/6981/
State New, archived
Headers show

Comments

Richard Purdie - July 5, 2011, 1:33 p.m.
Nothing in the system actually uses the PROVIDES field for these 
recipes, its usually the runtime packages that are used. We can 
therefore remove the PROVIDES and hence quieten the associated 
warnings from bitbake.

If these recipes do really need the PROVIDES, they would be better
as virtuals and adding that to MULTI_PROVIDER_WHITELIST.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Koen Kooi - July 5, 2011, 1:36 p.m.
looks good to me

Op 5 jul. 2011 om 14:33 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> Nothing in the system actually uses the PROVIDES field for these 
> recipes, its usually the runtime packages that are used. We can 
> therefore remove the PROVIDES and hence quieten the associated 
> warnings from bitbake.
> 
> If these recipes do really need the PROVIDES, they would be better
> as virtuals and adding that to MULTI_PROVIDER_WHITELIST.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> 
> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> index ec33b29..e23069c 100644
> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> @@ -12,7 +12,6 @@ PR = "r0"
> DEPENDS = "zlib openssl"
> DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
> 
> -PROVIDES = "ssh sshd"
> RPROVIDES = "ssh sshd"
> 
> CONFLICTS_${PN} = "dropbear"
> diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
> index c9c41d2..1b51e1a 100644
> --- a/meta/recipes-core/dropbear/dropbear.inc
> +++ b/meta/recipes-core/dropbear/dropbear.inc
> @@ -8,7 +8,6 @@ LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c"
> 
> DEPENDS = "zlib"
> -PROVIDES = "ssh sshd"
> RPROVIDES = "ssh sshd"
> 
> SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Khem Raj - July 5, 2011, 8:47 p.m.
On Tue, Jul 5, 2011 at 6:33 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Nothing in the system actually uses the PROVIDES field for these
> recipes, its usually the runtime packages that are used. We can
> therefore remove the PROVIDES and hence quieten the associated
> warnings from bitbake.
>
> If these recipes do really need the PROVIDES, they would be better
> as virtuals and adding that to MULTI_PROVIDER_WHITELIST.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> index ec33b29..e23069c 100644
> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> @@ -12,7 +12,6 @@ PR = "r0"
>  DEPENDS = "zlib openssl"
>  DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
>
> -PROVIDES = "ssh sshd"
>  RPROVIDES = "ssh sshd"
>
>  CONFLICTS_${PN} = "dropbear"
> diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
> index c9c41d2..1b51e1a 100644
> --- a/meta/recipes-core/dropbear/dropbear.inc
> +++ b/meta/recipes-core/dropbear/dropbear.inc
> @@ -8,7 +8,6 @@ LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c"
>
>  DEPENDS = "zlib"
> -PROVIDES = "ssh sshd"
>  RPROVIDES = "ssh sshd"
>
>  SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
>

Infact I have tested same patch last week so

Acked-by: Khem Raj <raj.khem@gmail.com>

>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
index ec33b29..e23069c 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
@@ -12,7 +12,6 @@  PR = "r0"
 DEPENDS = "zlib openssl"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-PROVIDES = "ssh sshd"
 RPROVIDES = "ssh sshd"
 
 CONFLICTS_${PN} = "dropbear"
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index c9c41d2..1b51e1a 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -8,7 +8,6 @@  LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c"
 
 DEPENDS = "zlib"
-PROVIDES = "ssh sshd"
 RPROVIDES = "ssh sshd"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \