diff options
author | Sam Zeter <samuelzeter@gmail.com> | 2020-08-19 16:07:59 +1000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-08-20 15:27:59 -0400 |
commit | 67c15579bb3d12d0a5c59dc65d4c8ff17d54353e (patch) | |
tree | 00fce45b02164249321168c2cd0bf2394b448f0f | |
parent | ba99cce99d248b383871db562d694be5b3d52c77 (diff) | |
download | meta-cloud-services-67c15579bb3d12d0a5c59dc65d4c8ff17d54353e.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_3000.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-openstack/recipes-support/salt/salt_3000.bb b/meta-openstack/recipes-support/salt/salt_3000.bb index c2bc8da..f80ceb6 100644 --- a/meta-openstack/recipes-support/salt/salt_3000.bb +++ b/meta-openstack/recipes-support/salt/salt_3000.bb | |||
@@ -104,7 +104,7 @@ RRECOMMENDS_${PN}-common = "lsb" | |||
104 | RSUGGESTS_${PN}-common = "python3-mako python3-git" | 104 | RSUGGESTS_${PN}-common = "python3-mako python3-git" |
105 | RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" | 105 | RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" |
106 | CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}" | 106 | CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}" |
107 | FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python3.7/ ${CONFFILES_${PN}-common}" | 107 | FILES_${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}" |
108 | 108 | ||
109 | SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" | 109 | SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" |
110 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ | 110 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ |