From 67c15579bb3d12d0a5c59dc65d4c8ff17d54353e Mon Sep 17 00:00:00 2001 From: Sam Zeter Date: Wed, 19 Aug 2020 16:07:59 +1000 Subject: 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 Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-support/salt/salt_3000.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openstack/recipes-support') 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" RSUGGESTS_${PN}-common = "python3-mako python3-git" RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}" -FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python3.7/ ${CONFFILES_${PN}-common}" +FILES_${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}" SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ -- cgit v1.2.3-54-g00ecf