[meta-virtualization][m-c-s][PATCH 1/2] salt: correct LICENSE md5sum

[meta-virtualization][m-c-s][PATCH 1/2] salt: correct LICENSE md5sum

[Alex Stewart]

The md5sum "ac9a49d8..." has never been a salt LICENSE file hashsum.
Salt_3001 verification therefore fails after fetch.

Set the LICENSE file hashsum to the correct value as of salt upstream
commit a1d07e9cc5d84895468bf360390754c4d68308d9 - which services salt
3001.

Signed-off-by: Alex Stewart <alex.stewart@ni.com>
---
 meta-openstack/recipes-support/salt/salt_3001.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-support/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
index 9b485d699b5e01ed287256b96e33249e98b02ae0..c789ab94c44bb6fd8713f15174b4ffa91a173e47 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.1.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
@@ -1,7 +1,7 @@
 HOMEPAGE = "http://saltstack.com/"
 SECTION = "admin"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ac9a49d86925151327b277d6a3999a07"
 DEPENDS = "\
            python3-msgpack \
            python3-pyyaml \
-- 
2.32.0

[meta-virtualization][m-c-s][PATCH 2/2] salt: use $BPN in SRC_URI

[Alex Stewart]

Recent OE branches will throw a warning when recipe SRC_URIs use the $PN
variable, instead of the $BPN variable. BPN and PN are both `salt` for
the salt recipe, so it makes no difference which is used.

Use $BPN in the SRC_URI, to satisfy the warning.

Signed-off-by: Alex Stewart <alex.stewart@ni.com>
---
 meta-openstack/recipes-support/salt/salt_3001.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-support/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
index c789ab94c44bb6fd8713f15174b4ffa91a173e47..f585e628690a17b02f4f1275f5c39933cf090eb2 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.1.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
@@ -18,7 +18,7 @@ PACKAGECONFIG ??= "zeromq"
 PACKAGECONFIG[zeromq] = ",,python3-pyzmq python3-pycrypto,"
 PACKAGECONFIG[tcp] = ",,python3-pycrypto"
 
-SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \
+SRC_URI = "https://files.pythonhosted.org/packages/source/s/${BPN}/${BPN}-${PV}.tar.gz \
 "
 
 SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9"
-- 
2.32.0

Re: [meta-virtualization][m-c-s][PATCH 1/2] salt: correct LICENSE md5sum

[Bruce Ashfield]

Thanks for the fixes, these are now merged.

Bruce

In message: [meta-virtualization][m-c-s][PATCH 1/2] salt: correct LICENSE md5sum
on 23/08/2021 Alex Stewart wrote:

> The md5sum "ac9a49d8..." has never been a salt LICENSE file hashsum.
> Salt_3001 verification therefore fails after fetch.
> 
> Set the LICENSE file hashsum to the correct value as of salt upstream
> commit a1d07e9cc5d84895468bf360390754c4d68308d9 - which services salt
> 3001.
> 
> Signed-off-by: Alex Stewart <alex.stewart@ni.com>
> ---
>  meta-openstack/recipes-support/salt/salt_3001.1.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-openstack/recipes-support/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
> index 9b485d699b5e01ed287256b96e33249e98b02ae0..c789ab94c44bb6fd8713f15174b4ffa91a173e47 100644
> --- a/meta-openstack/recipes-support/salt/salt_3001.1.bb
> +++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
> @@ -1,7 +1,7 @@
>  HOMEPAGE = "http://saltstack.com/"
>  SECTION = "admin"
>  LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=ac9a49d86925151327b277d6a3999a07"
>  DEPENDS = "\
>             python3-msgpack \
>             python3-pyyaml \
> -- 
> 2.32.0
> 

> 
> 
>