summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Zeter <samuelzeter@gmail.com>2020-08-19 16:07:59 +1000
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-08-20 15:29:55 -0400
commitf4ce17e35e0bd988927f901ea6ae7d746e209a2e (patch)
tree7afa9de4f0f03b622f3a219131e60ed450321b4a
parent8d2689c2eb446776745bd1cb2ef7ce1424d0f840 (diff)
downloadmeta-cloud-services-f4ce17e35e0bd988927f901ea6ae7d746e209a2e.tar.gz
salt: Remove hardcoded Python 3.7 path
The salt bitbake file hardcodes the Python 3.7 path as ${libdir}/python3.7 In order to ensure compatibility with Dunfell, which uses Python 3.8, and other future versions of Python, the variable PYTHON_SITEPACKAGES_DIR should be used. Signed-off-by: Sam Zeter <samuelzeter@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--meta-openstack/recipes-support/salt/salt_3001.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-openstack/recipes-support/salt/salt_3001.bb b/meta-openstack/recipes-support/salt/salt_3001.bb
index 5140470..4beef5b 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.bb
@@ -103,7 +103,7 @@ RRECOMMENDS_${PN}-common = "lsb-release"
103RSUGGESTS_${PN}-common = "python3-mako python3-git" 103RSUGGESTS_${PN}-common = "python3-mako python3-git"
104RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" 104RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)"
105CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}" 105CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}"
106FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python3.7/ ${CONFFILES_${PN}-common}" 106FILES_${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}"
107 107
108SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" 108SUMMARY_${PN}-ssh = "remote manager to administer servers via salt"
109DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ 109DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \