diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-22 17:45:03 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-22 17:45:03 +0000 |
commit | ce38cb391c9108168ab574463b7ef745b739bcc9 (patch) | |
tree | a763ff9f68a0ae513183fa4e9c42c6ac3612c3e8 /meta-openstack/recipes-support/salt | |
parent | 9d632de8d0e109e342fe580cf4b2423a51c890c3 (diff) | |
download | meta-cloud-services-ce38cb391c9108168ab574463b7ef745b739bcc9.tar.gz |
openstack: packages: update for python3
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'meta-openstack/recipes-support/salt')
-rw-r--r-- | meta-openstack/recipes-support/salt/salt_2018.3.0.bb | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/meta-openstack/recipes-support/salt/salt_2018.3.0.bb b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb index a4022be..fb75872 100644 --- a/meta-openstack/recipes-support/salt/salt_2018.3.0.bb +++ b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb | |||
@@ -3,15 +3,15 @@ SECTION = "admin" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fb92f464675f6b5df90f540d60237915" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fb92f464675f6b5df90f540d60237915" |
5 | DEPENDS = "\ | 5 | DEPENDS = "\ |
6 | python-msgpack \ | 6 | python3-msgpack \ |
7 | python-pyyaml \ | 7 | python3-pyyaml \ |
8 | python-jinja2 \ | 8 | python3-jinja2 \ |
9 | python-markupsafe \ | 9 | python3-markupsafe \ |
10 | " | 10 | " |
11 | 11 | ||
12 | PACKAGECONFIG ??= "zeromq" | 12 | PACKAGECONFIG ??= "zeromq" |
13 | PACKAGECONFIG[zeromq] = ",,python-pyzmq python-pycrypto," | 13 | PACKAGECONFIG[zeromq] = ",,python3-pyzmq python3-pycrypto," |
14 | PACKAGECONFIG[tcp] = ",,python-pycrypto" | 14 | PACKAGECONFIG[tcp] = ",,python3-pycrypto" |
15 | 15 | ||
16 | SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \ | 16 | SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \ |
17 | file://set_python_location_hashbang.patch \ | 17 | file://set_python_location_hashbang.patch \ |
@@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55 | |||
32 | 32 | ||
33 | S = "${WORKDIR}/${PN}-${PV}" | 33 | S = "${WORKDIR}/${PN}-${PV}" |
34 | 34 | ||
35 | inherit setuptools update-rc.d | 35 | inherit setuptools3 update-rc.d |
36 | 36 | ||
37 | # Avoid a QA Warning triggered by the test package including a file | 37 | # Avoid a QA Warning triggered by the test package including a file |
38 | # with a .a extension | 38 | # with a .a extension |
@@ -88,11 +88,11 @@ Between the remote execution system, and state management Salt addresses the bac | |||
88 | 88 | ||
89 | SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system" | 89 | SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system" |
90 | DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." | 90 | DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." |
91 | RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python-msgpack" | 91 | RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" |
92 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}" | 92 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" |
93 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}" | 93 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" |
94 | RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" | 94 | RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" |
95 | RSUGGESTS_${PN}-minion = "python-augeas" | 95 | RSUGGESTS_${PN}-minion = "python3-augeas" |
96 | CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion ${sysconfdir}/init.d/${PN}-minion" | 96 | CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion ${sysconfdir}/init.d/${PN}-minion" |
97 | FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy" | 97 | FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy" |
98 | INITSCRIPT_NAME_${PN}-minion = "${PN}-minion" | 98 | INITSCRIPT_NAME_${PN}-minion = "${PN}-minion" |
@@ -101,18 +101,18 @@ INITSCRIPT_PARAMS_${PN}-minion = "defaults" | |||
101 | SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" | 101 | SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" |
102 | DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ | 102 | DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ |
103 | salt-master, salt-minion, and salt-syndic require to function." | 103 | salt-master, salt-minion, and salt-syndic require to function." |
104 | RDEPENDS_${PN}-common = "python-dateutil python-jinja2 python-pyyaml python-requests (>= 1.0.0) python-tornado (>= 4.2.1)" | 104 | RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-tornado (>= 4.2.1)" |
105 | RRECOMMENDS_${PN}-common = "lsb python-futures" | 105 | RRECOMMENDS_${PN}-common = "lsb python3-futures" |
106 | RSUGGESTS_${PN}-common = "python-mako python-git" | 106 | RSUGGESTS_${PN}-common = "python3-mako python3-git" |
107 | RCONFLICTS_${PN}-common = "python-mako (< 0.7.0)" | 107 | RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" |
108 | CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}-common" | 108 | CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}-common" |
109 | FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python2.7/ ${CONFFILES_${PN}-common}" | 109 | FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python${PYTHON_BASEVERSION}/ ${CONFFILES_${PN}-common}" |
110 | 110 | ||
111 | SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" | 111 | SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" |
112 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ | 112 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ |
113 | is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ | 113 | is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ |
114 | to be installed on the remote host." | 114 | to be installed on the remote host." |
115 | RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python-msgpack" | 115 | RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" |
116 | CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" | 116 | CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" |
117 | FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" | 117 | FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" |
118 | 118 | ||
@@ -123,7 +123,7 @@ even a Websocket API. The Salt API system is used to expose the fundamental aspe | |||
123 | sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\ | 123 | sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\ |
124 | on Read the Docs: http://salt-api.readthedocs.org/" | 124 | on Read the Docs: http://salt-api.readthedocs.org/" |
125 | RDEPENDS_${PN}-api = "${PN}-master" | 125 | RDEPENDS_${PN}-api = "${PN}-master" |
126 | RSUGGESTS_${PN}-api = "python-cherrypy" | 126 | RSUGGESTS_${PN}-api = "python3-cherrypy" |
127 | CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" | 127 | CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" |
128 | FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" | 128 | FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" |
129 | INITSCRIPT_NAME_${PN}-api = "${PN}-api" | 129 | INITSCRIPT_NAME_${PN}-api = "${PN}-api" |
@@ -131,11 +131,11 @@ INITSCRIPT_PARAMS_${PN}-api = "defaults" | |||
131 | 131 | ||
132 | SUMMARY_${PN}-master = "remote manager to administer servers via salt" | 132 | SUMMARY_${PN}-master = "remote manager to administer servers via salt" |
133 | DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." | 133 | DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." |
134 | RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python-msgpack" | 134 | RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" |
135 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}" | 135 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" |
136 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}" | 136 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" |
137 | CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" | 137 | CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" |
138 | RSUGGESTS_${PN}-master = "python-git" | 138 | RSUGGESTS_${PN}-master = "python3-git" |
139 | FILES_${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master}" | 139 | FILES_${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master}" |
140 | INITSCRIPT_NAME_${PN}-master = "${PN}-master" | 140 | INITSCRIPT_NAME_${PN}-master = "${PN}-master" |
141 | INITSCRIPT_PARAMS_${PN}-master = "defaults" | 141 | INITSCRIPT_PARAMS_${PN}-master = "defaults" |
@@ -152,13 +152,13 @@ INITSCRIPT_PARAMS_${PN}-syndic = "defaults" | |||
152 | SUMMARY_${PN}-cloud = "public cloud VM management system" | 152 | SUMMARY_${PN}-cloud = "public cloud VM management system" |
153 | DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." | 153 | DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." |
154 | RDEPENDS_${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})" | 154 | RDEPENDS_${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})" |
155 | RSUGGESTS_${PN}-cloud = "python-netaddr python-botocore" | 155 | RSUGGESTS_${PN}-cloud = "python3-netaddr python3-botocore" |
156 | CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud" | 156 | CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud" |
157 | FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" | 157 | FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" |
158 | 158 | ||
159 | SUMMARY_${PN}-tests = "salt stack test suite" | 159 | SUMMARY_${PN}-tests = "salt stack test suite" |
160 | DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite." | 160 | DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite." |
161 | RDEPENDS_${PN}-tests = "${PN}-common python-pytest-salt python-tests python-image bash" | 161 | RDEPENDS_${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash" |
162 | FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" | 162 | FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" |
163 | 163 | ||
164 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common" | 164 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common" |