Skip to contentSkip to conversation

salt: Remove hardcoded Python 3.7 path

PATCH In review [email protected] 2 participants 2 messages Aug 19, 2020 – Aug 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta-openstack/recipes-support/salt/salt_3000.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-openstack/recipes-support/salt/salt_3000.bb +1 -1
index c2bc8da0..f80ceb65 100644
@@ -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 \
Signature · 1 line
2.25.4
#1 lore raw

I tweaked the patch to apply to master as well (the salt version changed).

We should always ensure that we have these on master, and then a version for a released branch.

Bruce

Quoted 35 lines · Sam Zeter

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.

---
 meta-openstack/recipes-support/salt/salt_3000.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-openstack/recipes-support/salt/salt_3000.bb +0 -1
index c2bc8da0..f80ceb65 100644
@@ -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 \
--
2.25.4

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II