summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-06-04 22:05:56 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-06-09 11:20:37 +0200
commit808eb6412bbcb267e25b97022b660b70e52e0e44 (patch)
tree3cf26039ca2f472b90da241ee7a6b65e9ce45fc3
parent8a2f39da7502ca872677b24c738072e56be65afe (diff)
downloadptxdist-808eb6412bbcb267e25b97022b660b70e52e0e44.tar.gz
ptxdist-808eb6412bbcb267e25b97022b660b70e52e0e44.tar.xz
pyserial: build with new python helper
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/pyserial.make29
1 files changed, 3 insertions, 26 deletions
diff --git a/rules/pyserial.make b/rules/pyserial.make
index 110e3d2b7..6709166f8 100644
--- a/rules/pyserial.make
+++ b/rules/pyserial.make
@@ -29,28 +29,9 @@ PYSERIAL_LICENSE := BSD
# Prepare
# ----------------------------------------------------------------------------
-PYSERIAL_PATH := PATH=$(CROSS_PATH)
-PYSERIAL_CONF_TOOL := NO
-PYSERIAL_MAKE_ENV := $(CROSS_ENV)
+PYSERIAL_CONF_TOOL := python
+PYSERIAL_MAKE_OPT = build -e "/usr/bin/python$(PYTHON_MAJORMINOR)"
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/pyserial.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/pyserial.install:
- @$(call targetinfo)
- @cd $(PYSERIAL_DIR) && \
- $(PYSERIAL_PATH) $(PYSERIAL_MAKE_ENV) \
- python setup.py install --root=$(PYSERIAL_PKGDIR) --prefix=/usr
- @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
@@ -75,12 +56,8 @@ $(STATEDIR)/pyserial.targetinstall:
$(call install_copy, pyserial, 0, 0, 0644, -, /$$file); \
done
-# note: the setup.py also installs the miniterm.py script, but with a really
-# broken path to the python interpreter. As a workaround we use the plain script
-# from the build directory instead
ifdef PTXCONF_PYSERIAL_MINITERM
- $(call install_copy, pyserial, 0, 0, 0755, \
- $(PYSERIAL_DIR)/serial/tools/miniterm.py, /usr/bin/miniterm.py)
+ $(call install_copy, pyserial, 0, 0, 0755, -, /usr/bin/miniterm.py)
endif
# there are some examples that could be useful to check and understand this package