* [meta-virtualization][m-c-s][PATCH] salt: Move to version 3001.1 and fix RDEPENDS
@ 2020-09-23 0:36 dburns
2020-09-28 2:45 ` Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: dburns @ 2020-09-23 0:36 UTC (permalink / raw)
To: meta-virtualization; +Cc: David Burns
Move to a new minor version of salt, 3001.1 that includes a number of
bug fixes.
Salt also needs the python3-distro runtime dependency for all of the
packages in the recipe, not just the salt-master package so it has been
included in the common package.
A runtime dependency on python-pycryptodomex has been added to the
salt-master and salt-minion packages as both have required it since the
3001 salt version.
Signed-off-by: David Burns <dburns@digi.com>
---
.../salt/{salt_3001.bb => salt_3001.1.bb} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta-openstack/recipes-support/salt/{salt_3001.bb => salt_3001.1.bb} (96%)
diff --git a/meta-openstack/recipes-support/salt/salt_3001.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
similarity index 96%
rename from meta-openstack/recipes-support/salt/salt_3001.bb
rename to meta-openstack/recipes-support/salt/salt_3001.1.bb
index 04ef1c7c..9b485d69 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
@@ -21,8 +21,8 @@ PACKAGECONFIG[tcp] = ",,python3-pycrypto"
SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \
"
-SRC_URI[md5sum] = "ae06cef7557e237a954491a069e79a25"
-SRC_URI[sha256sum] = "5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154"
+SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9"
+SRC_URI[sha256sum] = "e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc"
SYSTEMD_AUTO_ENABLE_${PN}-master = "disable"
@@ -87,7 +87,7 @@ Between the remote execution system, and state management Salt addresses the bac
SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system"
DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt."
-RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
+RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode"
@@ -98,7 +98,7 @@ FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CON
SUMMARY_${PN}-common = "shared libraries that salt requires for all packages"
DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \
salt-master, salt-minion, and salt-syndic require to function."
-RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0)"
+RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-distro"
RRECOMMENDS_${PN}-common = "lsb-release"
RSUGGESTS_${PN}-common = "python3-mako python3-git"
RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)"
@@ -127,7 +127,7 @@ FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_u
SUMMARY_${PN}-master = "remote manager to administer servers via salt"
DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller."
-RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-distro"
+RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master"
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-virtualization][m-c-s][PATCH] salt: Move to version 3001.1 and fix RDEPENDS
2020-09-23 0:36 [meta-virtualization][m-c-s][PATCH] salt: Move to version 3001.1 and fix RDEPENDS dburns
@ 2020-09-28 2:45 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2020-09-28 2:45 UTC (permalink / raw)
To: David Burns; +Cc: meta-virtualization
In message: [meta-virtualization][m-c-s][PATCH] salt: Move to version 3001.1 and fix RDEPENDS
on 23/09/2020 David Burns wrote:
> Move to a new minor version of salt, 3001.1 that includes a number of
> bug fixes.
>
> Salt also needs the python3-distro runtime dependency for all of the
> packages in the recipe, not just the salt-master package so it has been
> included in the common package.
>
> A runtime dependency on python-pycryptodomex has been added to the
> salt-master and salt-minion packages as both have required it since the
> 3001 salt version.
Thanks for the update, this is now merged.
Bruce
>
> Signed-off-by: David Burns <dburns@digi.com>
> ---
> .../salt/{salt_3001.bb => salt_3001.1.bb} | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> rename meta-openstack/recipes-support/salt/{salt_3001.bb => salt_3001.1.bb} (96%)
>
> diff --git a/meta-openstack/recipes-support/salt/salt_3001.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
> similarity index 96%
> rename from meta-openstack/recipes-support/salt/salt_3001.bb
> rename to meta-openstack/recipes-support/salt/salt_3001.1.bb
> index 04ef1c7c..9b485d69 100644
> --- a/meta-openstack/recipes-support/salt/salt_3001.bb
> +++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
> @@ -21,8 +21,8 @@ PACKAGECONFIG[tcp] = ",,python3-pycrypto"
> SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \
> "
>
> -SRC_URI[md5sum] = "ae06cef7557e237a954491a069e79a25"
> -SRC_URI[sha256sum] = "5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154"
> +SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9"
> +SRC_URI[sha256sum] = "e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc"
>
>
> SYSTEMD_AUTO_ENABLE_${PN}-master = "disable"
> @@ -87,7 +87,7 @@ Between the remote execution system, and state management Salt addresses the bac
>
> SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system"
> DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt."
> -RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
> +RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
> RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
> RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
> RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode"
> @@ -98,7 +98,7 @@ FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CON
> SUMMARY_${PN}-common = "shared libraries that salt requires for all packages"
> DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \
> salt-master, salt-minion, and salt-syndic require to function."
> -RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0)"
> +RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-distro"
> RRECOMMENDS_${PN}-common = "lsb-release"
> RSUGGESTS_${PN}-common = "python3-mako python3-git"
> RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)"
> @@ -127,7 +127,7 @@ FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_u
>
> SUMMARY_${PN}-master = "remote manager to administer servers via salt"
> DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller."
> -RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-distro"
> +RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
> RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
> RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
> CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master"
> --
> 2.28.0
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-28 2:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-23 0:36 [meta-virtualization][m-c-s][PATCH] salt: Move to version 3001.1 and fix RDEPENDS dburns
2020-09-28 2:45 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.