[ptxdist] [PATCH 1/5] Update host-cmake to 3.1.1

[ptxdist] [PATCH 1/5] Update host-cmake to 3.1.1

[Bernhard Walle]

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/host-cmake.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/host-cmake.make b/rules/host-cmake.make
index 4925264..b13dccf 100644
--- a/rules/host-cmake.make
+++ b/rules/host-cmake.make
@@ -17,11 +17,11 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake
 #
 # Paths and names
 #
-HOST_CMAKE_VERSION	:= 2.8.11
-HOST_CMAKE_MD5		:= be6008f2299613d23fe82ab53ef7472e
+HOST_CMAKE_VERSION	:= 3.1.1
+HOST_CMAKE_MD5		:= 0ae4f25dbec66697c0c3cec1b9e885ae
 HOST_CMAKE		:= cmake-$(HOST_CMAKE_VERSION)
 HOST_CMAKE_SUFFIX	:= tar.gz
-HOST_CMAKE_URL		:= http://www.cmake.org/files/v2.8/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
+HOST_CMAKE_URL		:= http://www.cmake.org/files/v3.1/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
 HOST_CMAKE_SOURCE	:= $(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
 HOST_CMAKE_DIR		:= $(HOST_BUILDDIR)/$(HOST_CMAKE)
 
-- 
2.2.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/5] sqlite: version bump 3.8.7.1 -> 3.8.8.1

[Bernhard Walle]

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/sqlite.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/sqlite.make b/rules/sqlite.make
index 2170cf7..bd2ada0 100644
--- a/rules/sqlite.make
+++ b/rules/sqlite.make
@@ -20,11 +20,11 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite
 #
 # Paths and names
 #
-SQLITE_VERSION	:= 3080701
-SQLITE_MD5	:= 8ee4541ebb3e5739e7ef5e9046e30063
+SQLITE_VERSION	:= 3080801
+SQLITE_MD5	:= a6381941ffe8817ba19669ec0c0ede6f
 SQLITE		:= sqlite-autoconf-$(SQLITE_VERSION)
 SQLITE_SUFFIX	:= tar.gz
-SQLITE_URL	:= http://www.sqlite.org/2014/$(SQLITE).$(SQLITE_SUFFIX)
+SQLITE_URL	:= http://www.sqlite.org/2015/$(SQLITE).$(SQLITE_SUFFIX)
 SQLITE_SOURCE	:= $(SRCDIR)/$(SQLITE).$(SQLITE_SUFFIX)
 SQLITE_DIR	:= $(BUILDDIR)/$(SQLITE)
 SQLITE_LICENSE	:= public_domain
-- 
2.2.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/5] pyserial: Version bump 2.6 -> 2.7

[Bernhard Walle]

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/pyserial.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/pyserial.make b/rules/pyserial.make
index 6d203f5..110e3d2 100644
--- a/rules/pyserial.make
+++ b/rules/pyserial.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PYSERIAL) += pyserial
 #
 # Paths and names
 #
-PYSERIAL_VERSION	:= 2.6
-PYSERIAL_MD5		:= cde799970b7c1ce1f7d6e9ceebe64c98
+PYSERIAL_VERSION	:= 2.7
+PYSERIAL_MD5		:= 794506184df83ef2290de0d18803dd11
 PYSERIAL		:= pyserial-$(PYSERIAL_VERSION)
 PYSERIAL_SUFFIX		:= tar.gz
 PYSERIAL_URL		:= http://pypi.python.org/packages/source/p/pyserial/$(PYSERIAL).$(PYSERIAL_SUFFIX)
-- 
2.2.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/5] python3: Add menu for python3 3rd-party modules

[Bernhard Walle]

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/python3.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/python3.in b/rules/python3.in
index bcb2ca5..b8bde82 100644
--- a/rules/python3.in
+++ b/rules/python3.in
@@ -60,3 +60,7 @@ config PYTHON3_DISTUTILS
 	prompt "Include distutils packages"
 
 endif
+
+menu "python3 Extra Modules         "
+source "generated/python3.in"
+endmenu
-- 
2.2.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 5/5] pyserial3: Provide pyserial package for Python 3

[Bernhard Walle]

This upstream package can be used for both Python 2.7 and Python 3.

I'm providing the python 3 variant as 'pyserial3'. The package is designed so
that it can be built and installed in parallel to pyserial (Python 2
installation). So I renamed the miniterm.py to miniterm3.py.

The other example are not installed as renaming all of them wasn't worth the
effort in my opinion.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/pyserial3.in   |  26 +++++++++++++
 rules/pyserial3.make | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 rules/pyserial3.in
 create mode 100644 rules/pyserial3.make

diff --git a/rules/pyserial3.in b/rules/pyserial3.in
new file mode 100644
index 0000000..3cb83e5
--- /dev/null
+++ b/rules/pyserial3.in
@@ -0,0 +1,26 @@
+## SECTION=python3
+
+menuconfig PYSERIAL3
+	tristate
+	select PYTHON3
+	prompt "pyserial                      "
+	help
+	  This module encapsulates the access for the serial port. It provides
+	  backends for Python running on Windows, Linux, BSD (possibly any
+	  POSIX compliant system), Jython and IronPython (.NET and Mono). The
+	  module named "serial" automatically selects the appropriate backend.
+
+	  - Project Homepage: http://pyserial.sourceforge.net
+	  - Project page on SourceForge: http://sourceforge.net/projects/pyserial/
+	  - SVN repository: http://sourceforge.net/svn/?group_id=46487
+	  - Download Page: http://sourceforge.net/project/showfiles.php?group_id=46487
+
+if PYSERIAL3
+
+config PYSERIAL3_MINITERM
+	bool
+	prompt "Install 'miniterm'"
+	help
+	  Install the miniterm script coming with this package.
+
+endif
diff --git a/rules/pyserial3.make b/rules/pyserial3.make
new file mode 100644
index 0000000..534ced6
--- /dev/null
+++ b/rules/pyserial3.make
@@ -0,0 +1,105 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2011 by Juergen Beisert <jbe@pengutronix.de>
+# Copyright (C) 2015 by Bernhard Walle <bernhard@bwalle.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYSERIAL3) += pyserial3
+
+#
+# Paths and names
+#
+PYSERIAL3_VERSION	:= 2.7
+PYSERIAL3_MD5		:= 794506184df83ef2290de0d18803dd11
+PYSERIAL3		:= pyserial3-$(PYSERIAL3_VERSION)
+PYSERIAL3_SUFFIX	:= tar.gz
+PYSERIAL3_URL		:= http://pypi.python.org/packages/source/p/pyserial/pyserial-$(PYSERIAL3_VERSION).$(PYSERIAL3_SUFFIX)
+PYSERIAL3_SOURCE	:= $(SRCDIR)/$(PYSERIAL3).$(PYSERIAL3_SUFFIX)
+PYSERIAL3_DIR		:= $(BUILDDIR)/$(PYSERIAL3)
+PYSERIAL3_LICENSE	:= BSD
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pyserial3.extract:
+	@$(call targetinfo)
+	@$(call clean, $(PYSERIAL3_DIR))
+	@$(call extract, PYSERIAL3)
+	@$(call patchin, PYSERIAL3)
+	@(cd $(PYSERIAL3_DIR) ; \
+		find . -name '*.py' -exec sed -i \
+		's@#! \?/usr/bin/env python@#!/usr/bin/env python3@g' {} \;)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYSERIAL3_PATH		:= PATH=$(CROSS_PATH)
+PYSERIAL3_CONF_TOOL	:= NO
+PYSERIAL3_MAKE_ENV	:= $(CROSS_ENV)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pyserial3.compile:
+	@$(call targetinfo)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pyserial3.install:
+	@$(call targetinfo)
+	@cd $(PYSERIAL3_DIR) && \
+		$(PYSERIAL3_PATH) $(PYSERIAL3_MAKE_ENV) \
+		python3 setup.py install --root=$(PYSERIAL3_PKGDIR) --prefix=/usr
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pyserial3.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, pyserial3)
+	@$(call install_fixup, pyserial3,PRIORITY,optional)
+	@$(call install_fixup, pyserial3,SECTION,base)
+	@$(call install_fixup, pyserial3,AUTHOR,"Bernhard Walle <bernhard@bwalle.de>")
+	@$(call install_fixup, pyserial3,DESCRIPTION, "Serial Communication for Python")
+
+	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES))
+	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES)/serial)
+	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES)/serial/tools)
+	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES)/serial/urlhandler)
+
+	@for file in $(shell cd $(PYSERIAL3_PKGDIR) && find . -name "*.pyc"); \
+	do \
+		$(call install_copy, pyserial3, 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_PYSERIAL3_MINITERM
+	$(call install_copy, pyserial3, 0, 0, 0755, \
+		$(PYSERIAL3_DIR)/build/lib/serial/tools/miniterm.py, /usr/bin/miniterm3.py)
+endif
+
+	@$(call install_finish, pyserial3)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.2.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 5/5] pyserial3: Provide pyserial package for Python 3

[Michael Olbrich]

On Sun, Jan 25, 2015 at 07:11:56PM +0100, Bernhard Walle wrote:
> This upstream package can be used for both Python 2.7 and Python 3.
> 
> I'm providing the python 3 variant as 'pyserial3'. The package is designed so
> that it can be built and installed in parallel to pyserial (Python 2
> installation). So I renamed the miniterm.py to miniterm3.py.
> 
> The other example are not installed as renaming all of them wasn't worth the
> effort in my opinion.
> 

Thanks, all patches applied.
I was about to comment the miniterm installation, but the I noticed, that
you just copied it from the Python 2.x package... This needs to be fixed in
the distutils...

Michael

> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  rules/pyserial3.in   |  26 +++++++++++++
>  rules/pyserial3.make | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 131 insertions(+)
>  create mode 100644 rules/pyserial3.in
>  create mode 100644 rules/pyserial3.make
> 
> diff --git a/rules/pyserial3.in b/rules/pyserial3.in
> new file mode 100644
> index 0000000..3cb83e5
> --- /dev/null
> +++ b/rules/pyserial3.in
> @@ -0,0 +1,26 @@
> +## SECTION=python3
> +
> +menuconfig PYSERIAL3
> +	tristate
> +	select PYTHON3
> +	prompt "pyserial                      "
> +	help
> +	  This module encapsulates the access for the serial port. It provides
> +	  backends for Python running on Windows, Linux, BSD (possibly any
> +	  POSIX compliant system), Jython and IronPython (.NET and Mono). The
> +	  module named "serial" automatically selects the appropriate backend.
> +
> +	  - Project Homepage: http://pyserial.sourceforge.net
> +	  - Project page on SourceForge: http://sourceforge.net/projects/pyserial/
> +	  - SVN repository: http://sourceforge.net/svn/?group_id=46487
> +	  - Download Page: http://sourceforge.net/project/showfiles.php?group_id=46487
> +
> +if PYSERIAL3
> +
> +config PYSERIAL3_MINITERM
> +	bool
> +	prompt "Install 'miniterm'"
> +	help
> +	  Install the miniterm script coming with this package.
> +
> +endif
> diff --git a/rules/pyserial3.make b/rules/pyserial3.make
> new file mode 100644
> index 0000000..534ced6
> --- /dev/null
> +++ b/rules/pyserial3.make
> @@ -0,0 +1,105 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2011 by Juergen Beisert <jbe@pengutronix.de>
> +# Copyright (C) 2015 by Bernhard Walle <bernhard@bwalle.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYSERIAL3) += pyserial3
> +
> +#
> +# Paths and names
> +#
> +PYSERIAL3_VERSION	:= 2.7
> +PYSERIAL3_MD5		:= 794506184df83ef2290de0d18803dd11
> +PYSERIAL3		:= pyserial3-$(PYSERIAL3_VERSION)
> +PYSERIAL3_SUFFIX	:= tar.gz
> +PYSERIAL3_URL		:= http://pypi.python.org/packages/source/p/pyserial/pyserial-$(PYSERIAL3_VERSION).$(PYSERIAL3_SUFFIX)
> +PYSERIAL3_SOURCE	:= $(SRCDIR)/$(PYSERIAL3).$(PYSERIAL3_SUFFIX)
> +PYSERIAL3_DIR		:= $(BUILDDIR)/$(PYSERIAL3)
> +PYSERIAL3_LICENSE	:= BSD
> +
> +# ----------------------------------------------------------------------------
> +# Extract
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/pyserial3.extract:
> +	@$(call targetinfo)
> +	@$(call clean, $(PYSERIAL3_DIR))
> +	@$(call extract, PYSERIAL3)
> +	@$(call patchin, PYSERIAL3)
> +	@(cd $(PYSERIAL3_DIR) ; \
> +		find . -name '*.py' -exec sed -i \
> +		's@#! \?/usr/bin/env python@#!/usr/bin/env python3@g' {} \;)
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYSERIAL3_PATH		:= PATH=$(CROSS_PATH)
> +PYSERIAL3_CONF_TOOL	:= NO
> +PYSERIAL3_MAKE_ENV	:= $(CROSS_ENV)
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/pyserial3.compile:
> +	@$(call targetinfo)
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/pyserial3.install:
> +	@$(call targetinfo)
> +	@cd $(PYSERIAL3_DIR) && \
> +		$(PYSERIAL3_PATH) $(PYSERIAL3_MAKE_ENV) \
> +		python3 setup.py install --root=$(PYSERIAL3_PKGDIR) --prefix=/usr
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/pyserial3.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, pyserial3)
> +	@$(call install_fixup, pyserial3,PRIORITY,optional)
> +	@$(call install_fixup, pyserial3,SECTION,base)
> +	@$(call install_fixup, pyserial3,AUTHOR,"Bernhard Walle <bernhard@bwalle.de>")
> +	@$(call install_fixup, pyserial3,DESCRIPTION, "Serial Communication for Python")
> +
> +	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES))
> +	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES)/serial)
> +	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES)/serial/tools)
> +	@$(call install_copy, pyserial3, 0, 0, 0755, $(PYTHON3_SITEPACKAGES)/serial/urlhandler)
> +
> +	@for file in $(shell cd $(PYSERIAL3_PKGDIR) && find . -name "*.pyc"); \
> +	do \
> +		$(call install_copy, pyserial3, 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_PYSERIAL3_MINITERM
> +	$(call install_copy, pyserial3, 0, 0, 0755, \
> +		$(PYSERIAL3_DIR)/build/lib/serial/tools/miniterm.py, /usr/bin/miniterm3.py)
> +endif
> +
> +	@$(call install_finish, pyserial3)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.2.2
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de