Skip to contentSkip to conversation

python-vcversioner: new package

PATCH Superseded Fabrice Fontaine 2 participants 5 messages Dec 18, 2016

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 python-vcversioner: new package

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Add python-vcversioner in host-package version as host-python-jsonschema depends on it
- Add python-jsonschema in host-package version
- Retrieve first soletta patch from upstream
- Add a soletta patch to remove multiple targets in the same rule as this is not supported by old versions of make

 package/Config.in                                  |  1 +
 package/python-vcversioner/Config.in               |  6 ++++++
 package/python-vcversioner/python-vcversioner.hash |  3 +++
 package/python-vcversioner/python-vcversioner.mk   | 13 +++++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 package/python-vcversioner/Config.in
 create mode 100644 package/python-vcversioner/python-vcversioner.hash
 create mode 100644 package/python-vcversioner/python-vcversioner.mk
package/Config.in +1 -0
index be0d150..7e2f913 100644
@@ -805,6 +805,7 @@ menu "External python modules"
 	source "package/python-ujson/Config.in"
 	source "package/python-urllib3/Config.in"
 	source "package/python-urwid/Config.in"
+	source "package/python-vcversioner/Config.in"
 	source "package/python-versiontools/Config.in"
 	source "package/python-watchdog/Config.in"
 	source "package/python-wcwidth/Config.in"
package/python-vcversioner/Config.in new file +6 -0
new file mode 100644
index 0000000..9383ef4
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_VCVERSIONER
+	bool "python-vcversioner"
+	help
+	  Use version control tags to discover version numbers.
+
+	  https://github.com/habnabit/vcversioner
package/python-vcversioner/python-vcversioner.hash new file +3 -0
new file mode 100644
index 0000000..58573a1
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/vcversioner/json, sha256 locally computed
+md5	aab6ef5e0cf8614a1b1140ed5b7f107d  vcversioner-2.16.0.0.tar.gz
+sha256	dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b  vcversioner-2.16.0.0.tar.gz
package/python-vcversioner/python-vcversioner.mk new file +13 -0
new file mode 100644
index 0000000..8f598f3
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-vcversioner
+#
+################################################################################
+
+PYTHON_VCVERSIONER_VERSION = 2.16.0.0
+PYTHON_VCVERSIONER_SOURCE = vcversioner-$(PYTHON_VCVERSIONER_VERSION).tar.gz
+PYTHON_VCVERSIONER_SITE = https://pypi.python.org/packages/c5/cc/33162c0a7b28a4d8c83da07bc2b12cee58c120b4a9e8bba31c41c8d35a16
+PYTHON_VCVERSIONER_SETUP_TYPE = setuptools
+PYTHON_VCVERSIONER_LICENSE = ISC License (ISCL)
+
+$(eval $(host-python-package))
Signature · 1 line
2.5.0
#1 lore raw

PATCH v2 2/3 python-jsonschema: new package

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Add python-vcversioner in host-package version as host-python-jsonschema depends on it
- Add python-jsonschema in host-package version
- Retrieve first soletta patch from upstream
- Add a soletta patch to remove multiple targets in the same rule as this is not supported by old versions of make

 package/Config.in                                |  1 +
 package/python-jsonschema/Config.in              |  6 ++++++
 package/python-jsonschema/python-jsonschema.hash |  3 +++
 package/python-jsonschema/python-jsonschema.mk   | 17 +++++++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 package/python-jsonschema/Config.in
 create mode 100644 package/python-jsonschema/python-jsonschema.hash
 create mode 100644 package/python-jsonschema/python-jsonschema.mk
package/Config.in +1 -0
index 7e2f913..aaa60da 100644
@@ -702,6 +702,7 @@ menu "External python modules"
 	source "package/python-ipython/Config.in"
 	source "package/python-itsdangerous/Config.in"
 	source "package/python-jinja2/Config.in"
+	source "package/python-jsonschema/Config.in"
 	source "package/python-json-schema-validator/Config.in"
 	source "package/python-keyring/Config.in"
 	source "package/python-libconfig/Config.in"
package/python-jsonschema/Config.in new file +6 -0
new file mode 100644
index 0000000..7002653
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_JSONSCHEMA
+	bool "python-jsonschema"
+	help
+	  An implementation of JSON Schema validation for Python.
+
+	  http://github.com/Julian/jsonschema
package/python-jsonschema/python-jsonschema.hash new file +3 -0
new file mode 100644
index 0000000..fc13630
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/jsonschema/json, sha256 locally computed
+md5	374e848fdb69a3ce8b7e778b47c30640  jsonschema-2.5.1.tar.gz
+sha256	36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41  jsonschema-2.5.1.tar.gz
package/python-jsonschema/python-jsonschema.mk new file +17 -0
new file mode 100644
index 0000000..02e70c4
@@ -0,0 +1,17 @@
+################################################################################
+#
+# python-jsonschema
+#
+################################################################################
+
+PYTHON_JSONSCHEMA_VERSION = 2.5.1
+PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz
+PYTHON_JSONSCHEMA_SITE = \
+	https://pypi.python.org/packages/58/0d/c816f5ea5adaf1293a1d81d32e4cdfdaf8496973aa5049786d7fdb14e7e7
+PYTHON_JSONSCHEMA_SETUP_TYPE = setuptools
+PYTHON_JSONSCHEMA_LICENSE = MIT
+PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING
+HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = host-python-vcversioner
+
+$(eval $(python-package))
+$(eval $(host-python-package))
Signature · 1 line
2.5.0
#2 lore raw

PATCH v2 2/3 python-jsonschema: new package

Hello,

Quoted 1 line · Fabrice Fontaine

As was discussed in the previous review of this patch series, please drop the target variant of this package, as it is not used by soletta.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#3 lore raw

PATCH v2 3/3 soletta: new package

In reply to Fabrice Fontaine

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Add python-vcversioner in host-package version as host-python-jsonschema depends on it
- Add python-jsonschema in host-package version
- Retrieve first soletta patch from upstream
- Add a soletta patch to remove multiple targets in the same rule as this is not supported by old versions of make

 package/Config.in                                  |   1 +
 ...Check-availability-of-nonstandard-locales.patch |  64 ++++++++++
 .../0002-Use-tinydtls-from-buildsystem.patch       | 102 +++++++++++++++
 .../0003-Use-tinycbor-from-buildsystem.patch       | 139 +++++++++++++++++++++
 package/soletta/0004-Fix-tinycbor-API-calls.patch  | 130 +++++++++++++++++++
 .../0005-Remove-warning-when-building-OIC.patch    |  32 +++++
 .../0006-Remove-multiple-targets-in-a-rule.patch   |  36 ++++++
 package/soletta/Config.in                          |  30 +++++
 package/soletta/soletta.hash                       |   4 +
 package/soletta/soletta.mk                         | 120 ++++++++++++++++++
 10 files changed, 658 insertions(+)
 create mode 100644 package/soletta/0001-Check-availability-of-nonstandard-locales.patch
 create mode 100644 package/soletta/0002-Use-tinydtls-from-buildsystem.patch
 create mode 100644 package/soletta/0003-Use-tinycbor-from-buildsystem.patch
 create mode 100644 package/soletta/0004-Fix-tinycbor-API-calls.patch
 create mode 100644 package/soletta/0005-Remove-warning-when-building-OIC.patch
 create mode 100644 package/soletta/0006-Remove-multiple-targets-in-a-rule.patch
 create mode 100644 package/soletta/Config.in
 create mode 100644 package/soletta/soletta.hash
 create mode 100644 package/soletta/soletta.mk
package/Config.in +1 -0
index aaa60da..c3d0fa1 100644
@@ -1368,6 +1368,7 @@ endif
 	source "package/qhull/Config.in"
 	source "package/qlibc/Config.in"
 	source "package/shapelib/Config.in"
+	source "package/soletta/Config.in"
 	source "package/sphinxbase/Config.in"
 	source "package/startup-notification/Config.in"
 	source "package/tinycbor/Config.in"
package/soletta/0001-Check-availability-of-nonstandard-locales.patch new file +64 -0

64 lines not on this page · raw message

package/soletta/0002-Use-tinydtls-from-buildsystem.patch new file +102 -0

102 lines not on this page · raw message

package/soletta/0003-Use-tinycbor-from-buildsystem.patch new file +139 -0

139 lines not on this page · raw message

package/soletta/0004-Fix-tinycbor-API-calls.patch new file +130 -0

130 lines not on this page · raw message

package/soletta/0005-Remove-warning-when-building-OIC.patch new file +32 -0
new file mode 100644
index 0000000..ca7ae76
@@ -0,0 +1,32 @@
+From a0df0c1486811e30d90a624503e99c09964b00dc Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Tue, 25 Oct 2016 12:51:24 +0200
+Subject: [PATCH] Remove warning when building OIC
+
+If tinydtls and tinycbor are retrieved from buildsystem, a warning is raised
+as we continue to include build/stage/include which is not created anymore so
+remove this inclusion
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ tools/build/Makefile.vars | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tools/build/Makefile.vars b/tools/build/Makefile.vars
+index 7a963f9..bafd222 100644
+--- a/tools/build/Makefile.vars
++++ b/tools/build/Makefile.vars
+@@ -198,10 +198,6 @@ HEADERDIRS += $(addprefix $(top_srcdir),$(KCONFIG_INCLUDE)generated/)
+ HEADERDIRS += $(addprefix $(build_stagedir),lib/common lib/flow)
+ HEADERDIRS += $(build_includedir)
+ 
+-ifeq (y,$(OIC))
+-HEADERDIRS += $(addprefix $(build_stagedir),include/)
+-endif
+-
+ LIB_OUTPUTDIR := $(build_libdir)
+ 
+ SOL_LIB_AR := $(LIB_OUTPUTDIR)libsoletta.a
+-- 
+2.5.0
+
package/soletta/0006-Remove-multiple-targets-in-a-rule.patch new file +36 -0
new file mode 100644
index 0000000..067bf24
@@ -0,0 +1,36 @@
+From be54c738c8c7a7f95308ca2be49a17566e2ea539 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 18 Dec 2016 12:15:45 +0100
+Subject: [PATCH] Remove multiple targets in a rule
+
+Multiple targets in a single makefile rule is not supported by old
+versions of make so split them in multiple targets
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ Makefile.smallos | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.smallos b/Makefile.smallos
+index 379af73..3093041 100644
+--- a/Makefile.smallos
++++ b/Makefile.smallos
+@@ -50,9 +50,12 @@ soletta_config := $(thisdir)/.config
+ 
+ # Target local variables, so we are able to re-define them for Soletta without
+ # touching the OS build system
+-$(soletta_target) $(soletta_config): private override MAKEFLAGS=""
+-$(soletta_target) $(soletta_config): private export PYTHON=python3
+-$(soletta_target) $(soletta_config): private export BOARD_NAME:=$(BOARD_NAME)
++$(soletta_target): private override MAKEFLAGS=""
++$(soletta_config): private override MAKEFLAGS=""
++$(soletta_target): private export PYTHON=python3
++$(soletta_config): private export PYTHON=python3
++$(soletta_target): private export BOARD_NAME:=$(BOARD_NAME)
++$(soletta_config): private export BOARD_NAME:=$(BOARD_NAME)
+ 
+ $(soletta_target): $(soletta_config)
+ 	@echo "Building Soletta..."
+-- 
+2.5.0
+
package/soletta/Config.in new file +30 -0
new file mode 100644
index 0000000..a9891c0
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_SOLETTA
+	bool "soletta"
+	depends on BR2_USE_MMU # fork
+	# python3 is not really needed except for 4 development scripts, however
+	# if we don't enable it, host-python-jsonschema will be installed for
+	# the default python interpreter which is host-python2. As a result
+	# host-python3 will not find the module in its site-packages directory.
+	depends on !BR2_PACKAGE_PYTHON # python3
+	depends on BR2_USE_WCHAR # python3
+	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
+	depends on !BR2_STATIC_LIBS # python3
+	select BR2_PACKAGE_PYTHON3
+	help
+	  Soletta Project is a framework for making IoT devices. With Soletta
+	  Project's libraries developers can easily write software for devices
+	  that control actuators/sensors and communicate using standard
+	  technologies. It enables adding smartness even on the smallest edge
+	  devices.
+
+	  http://solettaproject.org
+
+comment "soletta needs a toolchain w/ wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_PACKAGE_PYTHON
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		BR2_STATIC_LIBS
+
+comment "soletta is not compatible with python"
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_PYTHON
package/soletta/soletta.hash new file +4 -0
new file mode 100644
index 0000000..53552b3
@@ -0,0 +1,4 @@
+# Locally computed:
+sha256	4080d12fde3006216316e954b5e4a001d783f93c5b4d554da5f58c98182270fd	soletta-v1.tar.gz
+sha256	c4d3018933980634333fca5c997736abb207dce76ad1f4cc16a4fdb3e7acb5a6	9af119285a521423646195f04fa4f6f51d0ab644.patch
+sha256	5c9866933428b2c8f7f294d7edec6b41c516b4bbac98e41ce49f13608f87ace1	10a1cadff4bfa82edb7561245786b841310e63b1.patch
package/soletta/soletta.mk new file +120 -0

120 lines not on this page · raw message

Signature · 1 line
2.5.0
#4 lore raw

PATCH v2 1/3 python-vcversioner: new package

In reply to Fabrice Fontaine

Hello,

package/python-vcversioner/Config.in line 6

Quoted 12 lines · Fabrice Fontaine
package/python-vcversioner/Config.in new file +6 -0
new file mode 100644
index 0000000..9383ef4
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_VCVERSIONER
+	bool "python-vcversioner"
+	help
+	  Use version control tags to discover version numbers.
+
+	  https://github.com/habnabit/vcversioner

A Config.in option to enable the target variant of a package...

Quoted 1 line

+$(eval $(host-python-package))

... that has no target variant is not correct.

Please add only the .mk file and .hash file. The Config.in file should not exist at all.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com