* [Buildroot] [PATCH 1/5] In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive
2013-02-12 12:24 [Buildroot] [PATCH] Python 3, simple, external package support Patrick Gerber
@ 2013-02-12 12:24 ` Patrick Gerber
2013-02-12 12:49 ` Thomas Petazzoni
2013-02-12 12:24 ` [Buildroot] [PATCH 2/5] When using python3 a symlink "python" is added in staging and point to python3. This is needed to call python setup for external package. A second simlink is added to alias the config-3.3m directory to config Patrick Gerber
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Patrick Gerber @ 2013-02-12 12:24 UTC (permalink / raw)
To: buildroot
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
---
package/Config.in | 19 +------------
package/python-generic/Config.in | 56 ++++++++++++++++++++++++++++++++++++++
package/python/Config.in | 14 ----------
package/python3/Config.in | 14 ----------
4 files changed, 57 insertions(+), 46 deletions(-)
create mode 100644 package/python-generic/Config.in
diff --git a/package/Config.in b/package/Config.in
index 2fad94d..b7da22f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -315,24 +315,7 @@ endmenu
endif
source "package/microperl/Config.in"
source "package/php/Config.in"
-source "package/python/Config.in"
-source "package/python3/Config.in"
-if BR2_PACKAGE_PYTHON
-menu "external python modules"
-source "package/python-bottle/Config.in"
-source "package/python-dpkt/Config.in"
-source "package/python-id3/Config.in"
-source "package/python-mad/Config.in"
-source "package/python-meld3/Config.in"
-source "package/python-netifaces/Config.in"
-source "package/python-nfc/Config.in"
-source "package/python-protobuf/Config.in"
-source "package/python-pygame/Config.in"
-source "package/python-pyparsing/Config.in"
-source "package/python-serial/Config.in"
-source "package/python-setuptools/Config.in"
-endmenu
-endif
+source "package/python-generic/Config.in"
source "package/ruby/Config.in"
source "package/tcl/Config.in"
if BR2_PACKAGE_TCL
diff --git a/package/python-generic/Config.in b/package/python-generic/Config.in
new file mode 100644
index 0000000..4acd79b
--- /dev/null
+++ b/package/python-generic/Config.in
@@ -0,0 +1,56 @@
+config BR2_PACKAGE_PYTHON_GENERIC
+ bool "Python"
+ depends on BR2_USE_WCHAR
+ # uses fork()
+ depends on BR2_USE_MMU
+ help
+ The python language interpreter.
+
+ http://www.python.org/
+
+comment "python3 requires a toolchain with WCHAR support"
+ depends on !BR2_USE_WCHAR
+
+choice
+ depends on BR2_PACKAGE_PYTHON_GENERIC
+ prompt "Python interpreter"
+ help
+ Select which version of Python you would like to use.
+
+config BR2_PACKAGE_PYTHON
+ bool "python2"
+ select BR2_PACKAGE_LIBFFI
+ help
+ Use Python 2.x
+
+
+config BR2_PACKAGE_PYTHON3
+ bool "python3"
+ # uses fork()
+ depends on BR2_USE_MMU
+ select BR2_PACKAGE_LIBFFI
+ help
+ Use Python 3.x
+
+endchoice
+
+source "package/python/Config.in"
+source "package/python3/Config.in"
+
+if (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
+menu "external python modules"
+source "package/python-bottle/Config.in"
+source "package/python-dpkt/Config.in"
+source "package/python-id3/Config.in"
+source "package/python-mad/Config.in"
+source "package/python-meld3/Config.in"
+source "package/python-netifaces/Config.in"
+source "package/python-nfc/Config.in"
+source "package/python-protobuf/Config.in"
+source "package/python-pygame/Config.in"
+source "package/python-pyparsing/Config.in"
+source "package/python-serial/Config.in"
+source "package/python-setuptools/Config.in"
+endmenu
+endif
+
diff --git a/package/python/Config.in b/package/python/Config.in
index 4089cce..b4fd6c2 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -1,17 +1,3 @@
-config BR2_PACKAGE_PYTHON
- bool "python"
- depends on BR2_USE_WCHAR
- # uses fork()
- depends on BR2_USE_MMU
- select BR2_PACKAGE_LIBFFI
- help
- The python language interpreter.
-
- http://www.python.org/
-
-comment "python requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
-
if BR2_PACKAGE_PYTHON
choice
diff --git a/package/python3/Config.in b/package/python3/Config.in
index 5959d31..279f31b 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -1,17 +1,3 @@
-config BR2_PACKAGE_PYTHON3
- bool "python3"
- depends on BR2_USE_WCHAR
- # uses fork()
- depends on BR2_USE_MMU
- select BR2_PACKAGE_LIBFFI
- help
- The python language interpreter.
-
- http://www.python.org/
-
-comment "python3 requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
-
if BR2_PACKAGE_PYTHON3
choice
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 1/5] In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive
2013-02-12 12:24 ` [Buildroot] [PATCH 1/5] In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive Patrick Gerber
@ 2013-02-12 12:49 ` Thomas Petazzoni
2013-02-12 14:02 ` Patrick
0 siblings, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2013-02-12 12:49 UTC (permalink / raw)
To: buildroot
Dear Patrick Gerber,
On Tue, 12 Feb 2013 13:24:05 +0100, Patrick Gerber wrote:
>
> Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
> ---
> package/Config.in | 19 +------------
> package/python-generic/Config.in | 56 ++++++++++++++++++++++++++++++++++++++
> package/python/Config.in | 14 ----------
> package/python3/Config.in | 14 ----------
> 4 files changed, 57 insertions(+), 46 deletions(-)
> create mode 100644 package/python-generic/Config.in
This seems really complicated. Can't we just have a depends
on !BR2_PACKAGE_PYTHON in the python3 package, and a depends
on !BR2_PACKAGE_PYTHON3 in the python package?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/5] In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive
2013-02-12 12:49 ` Thomas Petazzoni
@ 2013-02-12 14:02 ` Patrick
0 siblings, 0 replies; 11+ messages in thread
From: Patrick @ 2013-02-12 14:02 UTC (permalink / raw)
To: buildroot
On 02/12/2013 01:49 PM, Thomas Petazzoni wrote:
> Dear Patrick Gerber,
>
> On Tue, 12 Feb 2013 13:24:05 +0100, Patrick Gerber wrote:
>>
>> Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
>> ---
>> package/Config.in | 19 +------------
>> package/python-generic/Config.in | 56 ++++++++++++++++++++++++++++++++++++++
>> package/python/Config.in | 14 ----------
>> package/python3/Config.in | 14 ----------
>> 4 files changed, 57 insertions(+), 46 deletions(-)
>> create mode 100644 package/python-generic/Config.in
>
> This seems really complicated. Can't we just have a depends
> on !BR2_PACKAGE_PYTHON in the python3 package, and a depends
> on !BR2_PACKAGE_PYTHON3 in the python package?
>
> Thomas
>
Hi Thomas,
This is not so complicated, I have only moved some lines from
package/Config.in, package/python/Config.in and
package/python3/Config.in to package/python-generic/Config.in and added
few lines to handle the "choice" menu.
I have tried as you suggest but it have some strange behaviour...
If you care about the python-generic directory we need it also to add
some "common" stuff to handle properly the support of both python's
version by the external packages.
Patrick
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/5] When using python3 a symlink "python" is added in staging and point to python3. This is needed to call python setup for external package. A second simlink is added to alias the config-3.3m directory to config
2013-02-12 12:24 [Buildroot] [PATCH] Python 3, simple, external package support Patrick Gerber
2013-02-12 12:24 ` [Buildroot] [PATCH 1/5] In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive Patrick Gerber
@ 2013-02-12 12:24 ` Patrick Gerber
2013-02-12 12:53 ` Thomas Petazzoni
2013-02-12 12:24 ` [Buildroot] [PATCH 3/5] Define a new variable called PYTHON_GENERIC_DEPENDENCIES either to "python" or "python3" depending of the selected Python version. This is needed to easily set dependencies for packages that could be used either with Python 2 or Python 3 Patrick Gerber
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Patrick Gerber @ 2013-02-12 12:24 UTC (permalink / raw)
To: buildroot
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
---
package/python3/python3.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 7551a7b..5974824 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -160,6 +160,14 @@ ifneq ($(BR2_PACKAGE_PYTHON),y)
PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK
endif
+define HOST_PYTHON3_INSTALL_SYMLINK
+ ln -fs python3 $(HOST_DIR)/usr/bin/python
+ ln -fs config-3.3m $(HOST_DIR)/usr/lib/python3.3/config
+endef
+
+HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK
+
+
ifeq ($(BR2_PACKAGE_PYTHON3_PY_ONLY),y)
define PYTHON3_REMOVE_MODULES_FILES
for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 2/5] When using python3 a symlink "python" is added in staging and point to python3. This is needed to call python setup for external package. A second simlink is added to alias the config-3.3m directory to config
2013-02-12 12:24 ` [Buildroot] [PATCH 2/5] When using python3 a symlink "python" is added in staging and point to python3. This is needed to call python setup for external package. A second simlink is added to alias the config-3.3m directory to config Patrick Gerber
@ 2013-02-12 12:53 ` Thomas Petazzoni
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-02-12 12:53 UTC (permalink / raw)
To: buildroot
Dear Patrick Gerber,
Please fix your git commit log. The first line of a git commit log
becomes the title of the e-mails, so it should have a length no longer
than 80-100 characters. After this first line, leave an empty new line,
and add more details for your commit log.
On Tue, 12 Feb 2013 13:24:06 +0100, Patrick Gerber wrote:
>
> Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
> ---
> package/python3/python3.mk | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/package/python3/python3.mk b/package/python3/python3.mk
> index 7551a7b..5974824 100644
> --- a/package/python3/python3.mk
> +++ b/package/python3/python3.mk
> @@ -160,6 +160,14 @@ ifneq ($(BR2_PACKAGE_PYTHON),y)
> PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK
> endif
>
> +define HOST_PYTHON3_INSTALL_SYMLINK
> + ln -fs python3 $(HOST_DIR)/usr/bin/python
> + ln -fs config-3.3m $(HOST_DIR)/usr/lib/python3.3/config
> +endef
> +
> +HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK
As Samuel pointed it out, this unfortunately may break a number of
things in Buildroot. They are packages that depend on host-python, and
would only be capable of using an Python 2.x host-python.
Or at least, I would like to have the confirmation that all packages
that depend on host-python continue to build normally when host-python
is Python 3.
That said, some packages are not really clear about this. For example,
Scons uses the Python provided with the distribution, and not the
host-python built by Buildroot.
As you can see, this is not a trivial topic.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/5] Define a new variable called PYTHON_GENERIC_DEPENDENCIES either to "python" or "python3" depending of the selected Python version. This is needed to easily set dependencies for packages that could be used either with Python 2 or Python 3.
2013-02-12 12:24 [Buildroot] [PATCH] Python 3, simple, external package support Patrick Gerber
2013-02-12 12:24 ` [Buildroot] [PATCH 1/5] In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive Patrick Gerber
2013-02-12 12:24 ` [Buildroot] [PATCH 2/5] When using python3 a symlink "python" is added in staging and point to python3. This is needed to call python setup for external package. A second simlink is added to alias the config-3.3m directory to config Patrick Gerber
@ 2013-02-12 12:24 ` Patrick Gerber
2013-02-12 12:24 ` [Buildroot] [PATCH 4/5] python-bottle: Convert package to be used with python2 or python3 Patrick Gerber
2013-02-12 12:24 ` [Buildroot] [PATCH 5/5] python-serial: " Patrick Gerber
4 siblings, 0 replies; 11+ messages in thread
From: Patrick Gerber @ 2013-02-12 12:24 UTC (permalink / raw)
To: buildroot
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
---
package/python-generic/python-generic.mk | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 package/python-generic/python-generic.mk
diff --git a/package/python-generic/python-generic.mk b/package/python-generic/python-generic.mk
new file mode 100644
index 0000000..0cf0e9d
--- /dev/null
+++ b/package/python-generic/python-generic.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# python-generic
+#
+#############################################################
+# PYTHON_GENERIC_DEPENDENCIES is defined to the selected python
+# version.
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+ PYTHON_GENERIC_DEPENDENCIES = python
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ PYTHON_GENERIC_DEPENDENCIES = python3
+endif
+
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/5] python-bottle: Convert package to be used with python2 or python3
2013-02-12 12:24 [Buildroot] [PATCH] Python 3, simple, external package support Patrick Gerber
` (2 preceding siblings ...)
2013-02-12 12:24 ` [Buildroot] [PATCH 3/5] Define a new variable called PYTHON_GENERIC_DEPENDENCIES either to "python" or "python3" depending of the selected Python version. This is needed to easily set dependencies for packages that could be used either with Python 2 or Python 3 Patrick Gerber
@ 2013-02-12 12:24 ` Patrick Gerber
2013-02-12 12:24 ` [Buildroot] [PATCH 5/5] python-serial: " Patrick Gerber
4 siblings, 0 replies; 11+ messages in thread
From: Patrick Gerber @ 2013-02-12 12:24 UTC (permalink / raw)
To: buildroot
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
---
package/python-bottle/Config.in | 1 +
package/python-bottle/python-bottle.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/python-bottle/Config.in b/package/python-bottle/Config.in
index f9b60ca..e6f2f3b 100644
--- a/package/python-bottle/Config.in
+++ b/package/python-bottle/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_BOTTLE
bool "python-bottle"
+ depends on (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
help
Bottle is a fast, simple and lightweight WSGI micro web-framework
for Python. It is distributed as a single file module and has no
diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk
index 370b31b..d24e0ec 100644
--- a/package/python-bottle/python-bottle.mk
+++ b/package/python-bottle/python-bottle.mk
@@ -7,7 +7,7 @@
PYTHON_BOTTLE_VERSION = 0.11.4
PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz
PYTHON_BOTTLE_SITE = http://pypi.python.org/packages/source/b/bottle
-PYTHON_BOTTLE_DEPENDENCIES = python
+PYTHON_BOTTLE_DEPENDENCIES = $(PYTHON_GENERIC_DEPENDENCIES)
PYTHON_BOTTLE_LICENSE = MIT
# README.rst refers to the file "LICENSE" but it's not included
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 5/5] python-serial: Convert package to be used with python2 or python3
2013-02-12 12:24 [Buildroot] [PATCH] Python 3, simple, external package support Patrick Gerber
` (3 preceding siblings ...)
2013-02-12 12:24 ` [Buildroot] [PATCH 4/5] python-bottle: Convert package to be used with python2 or python3 Patrick Gerber
@ 2013-02-12 12:24 ` Patrick Gerber
4 siblings, 0 replies; 11+ messages in thread
From: Patrick Gerber @ 2013-02-12 12:24 UTC (permalink / raw)
To: buildroot
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
---
package/python-serial/Config.in | 2 +-
package/python-serial/python-serial.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/python-serial/Config.in b/package/python-serial/Config.in
index ea090bd..db6a4b1 100644
--- a/package/python-serial/Config.in
+++ b/package/python-serial/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_PYTHON_SERIAL
bool "python-serial"
- depends on BR2_PACKAGE_PYTHON
+ depends on (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
help
python-serial is a Python library to access serial ports.
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index fb6b31c..6f2bb85 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -8,7 +8,7 @@ PYTHON_SERIAL_VERSION = 2.6
PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
PYTHON_SERIAL_SITE = http://pypi.python.org/packages/source/p/pyserial/
-PYTHON_SERIAL_DEPENDENCIES = python
+PYTHON_SERIAL_DEPENDENCIES = $(PYTHON_GENERIC_DEPENDENCIES)
define PYTHON_SERIAL_BUILD_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread