From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH] python3: fix PYTHON3_SYMLINK option
Date: Thu, 15 Jun 2017 11:33:03 +0200 [thread overview]
Message-ID: <20170615093303.23370-1-p.zabel@pengutronix.de> (raw)
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.zabel@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
reply other threads:[~2017-06-15 9:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170615093303.23370-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox