If the PYTHON3_SYMLINK option is enabled, symlink python3 to
/usr/bin/python, as documented. This conflicts with the PYTHON_SYMLINK
option. Always install the /usr/bin/python3 symlink.
Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
rules/python3.in | 3 ++-
rules/python3.make | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/python3.in b/rules/python3.in
index 33f5c5a7b..49f590dc2 100644
--- a/rules/python3.in
+++ b/rules/python3.in
@@ -56,9 +56,10 @@ config PYTHON3_SSL
bool "ssl bindings"
config PYTHON3_SYMLINK
+ depends on !PYTHON_SYMLINK
bool
prompt "install symbolic link /usr/bin/python"
- default y
+ default y if !PYTHON_SYMLINK
config PYTHON3_LIBTK
bool
diff --git a/rules/python3.make b/rules/python3.make
index 1b8042eb2..0f656f383 100644
--- a/rules/python3.make
+++ b/rules/python3.make
@@ -153,10 +153,11 @@ $(STATEDIR)/python3.targetinstall:
*.so *.pyc, */test */tests */__pycache__ $(PYTHON3_SKIP-y))
@$(call install_copy, python3, 0, 0, 755, -,
/usr/bin/python$(PYTHON3_MAJORMINOR))
+ @$(call install_link, python, python$(PYTHON_MAJORMINOR),
/usr/bin/python3)
@$(call install_lib, python3, 0, 0, 644,
libpython$(PYTHON3_MAJORMINOR)m)
ifdef PTXCONF_PYTHON3_SYMLINK
- @$(call install_link, python3, python$(PYTHON3_MAJORMINOR),
/usr/bin/python3)
+ @$(call install_link, python3, python$(PYTHON3_MAJORMINOR),
/usr/bin/python)
endif
@$(call install_finish, python3)
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
