Skip to contentSkip to conversation

package/openzwave: bump to 62444b0f979c337d2091d77d89cf63c2ae9775cf

PATCH New Fabrice Fontaine 2 participants 2 messages Mar 28, 2020 – Mar 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/openzwave: bump to 62444b0f979c337d2091d77d89cf63c2ae9775cf

- Remove patches (already in version)
- Current license files have been moved to licenses since
https://github.com/OpenZWave/open-zwave/commit/e5f22ed4aee753d7cbf20dc12859ec2c5bb2e974
- Add new LICENSE file, available since
https://github.com/OpenZWave/open-zwave/commit/6e03f5fda0726cc449a902320dedf5838ea557d2
- Update indentation of hash file (two spaces)
- This bump is necessary to fix build with latest domoticz. Indeed, even if this is a wrong practice, domoticz has a local copy of openzwave headers which are now desynchronized from the openzwave source files

Fixes:
- http://autobuild.buildroot.org/results/193b8dd97c927805679d874dce6e27c685ce1f28

---
 ...ilers-Get-it-Some-need-a-little-help.patch |  26 -
 .../openzwave/0002-update-spec-files.patch    | 445 ------------------
 package/openzwave/openzwave.hash              |  11 +-
 package/openzwave/openzwave.mk                |   8 +-
 4 files changed, 10 insertions(+), 480 deletions(-)
 delete mode 100644 package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch
 delete mode 100644 package/openzwave/0002-update-spec-files.patch
package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch deleted +0 -26
deleted file mode 100644
index 51a06a20f1..0000000000
@@ -1,26 +0,0 @@
-From 3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f Mon Sep 17 00:00:00 2001
-From: Justin Hammond <[email protected]>
-Date: Sat, 4 May 2019 02:58:15 +0800
-Subject: [PATCH] Fix issue #1783 - Most Compilers Get it, Some need a little
- help
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Retrieved from
-https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f]
----
- cpp/src/CompatOptionManager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cpp/src/CompatOptionManager.cpp b/cpp/src/CompatOptionManager.cpp
-index 90c87b54d..2d9ac435e 100644
---- a/cpp/src/CompatOptionManager.cpp
-+++ b/cpp/src/CompatOptionManager.cpp
-@@ -237,7 +237,7 @@ void CompatOptionManager::WriteXML
- 	{
- 		TiXmlElement* valElement = new TiXmlElement( it->first.c_str() );
- 		char str[32];
--		TiXmlText * text;
-+		TiXmlText * text = NULL;
- //		std::cout << "Name " << it->first << " Type: " << m_CompatVals[it->second].type << std::endl;
- 		switch (m_CompatVals[it->second].type) {
- 			case COMPAT_FLAG_TYPE_BOOL:
package/openzwave/0002-update-spec-files.patch deleted +0 -445

445 lines not on this page · raw message

package/openzwave/openzwave.hash +6 -5
index 897973c8d0..e32908df1d 100644
@@ -1,6 +1,7 @@
 # Locally computed:
-sha256	3b11dffa7608359c8c848451863e0287e17f5f101aeee7c2e89b7dc16f87050b	openzwave-1.6.tar.gz
-sha256	c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b	license/license.txt
-sha256	4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284	license/lgpl.txt
-sha256	33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83	license/gpl.txt
-sha256	6f50ebf9af9b6658c7936ffcc6fedd99254df984c0fec2e6ffb9f3aa1c4ef3e1	license/Apache-License-2.0.txt
+sha256  3c0b7e63319832c0eea5a251facd8c4d43f8815356ea61361f8bb9652b2ad8be  openzwave-62444b0f979c337d2091d77d89cf63c2ae9775cf.tar.gz
+sha256  e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118  LICENSE
+sha256  c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b  licenses/license.txt
+sha256  4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284  licenses/lgpl.txt
+sha256  33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83  licenses/gpl.txt
+sha256  6f50ebf9af9b6658c7936ffcc6fedd99254df984c0fec2e6ffb9f3aa1c4ef3e1  licenses/Apache-License-2.0.txt
package/openzwave/openzwave.mk +4 -4
index d343f9aadf..357d19f32e 100644
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-OPENZWAVE_VERSION = 1.6
-OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,v$(OPENZWAVE_VERSION))
+OPENZWAVE_VERSION = 62444b0f979c337d2091d77d89cf63c2ae9775cf
+OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION))
 OPENZWAVE_LICENSE = LGPL-3.0+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
-OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \
-	license/gpl.txt license/Apache-License-2.0.txt
+OPENZWAVE_LICENSE_FILES = LICENSE licenses/license.txt licenses/lgpl.txt \
+	licenses/gpl.txt licenses/Apache-License-2.0.txt
 OPENZWAVE_DEPENDENCIES = tinyxml
 
 OPENZWAVE_INSTALL_STAGING = YES
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/openzwave: bump to 62444b0f979c337d2091d77d89cf63c2ae9775cf

Quoted 9 lines · On Sat, 28 Mar 2020 18:44:04 +0100 Fabrice Fontaine…

- Remove patches (already in version)
- Current license files have been moved to licenses since
https://github.com/OpenZWave/open-zwave/commit/e5f22ed4aee753d7cbf20dc12859ec2c5bb2e974
- Add new LICENSE file, available since
https://github.com/OpenZWave/open-zwave/commit/6e03f5fda0726cc449a902320dedf5838ea557d2
- Update indentation of hash file (two spaces)
- This bump is necessary to fix build with latest domoticz. Indeed, even if this is a wrong practice, domoticz has a local copy of openzwave headers which are now desynchronized from the openzwave source files

Arggh, this is horrible. Could you talk with the domoticz upstream developers to tell them not to do that? It is really weird to link against an external openzwave library, but use domoticz's copy of openzwave headers.

But I see that's really what they are doing:

IF(OpenZWave)
message(STATUS ${OpenZWave}) target_link_libraries(domoticz ${OpenZWave}) include_directories(${CMAKE_SOURCE_DIR}/hardware/openzwave) add_definitions(-DWITH_OPENZWAVE)
ELSE()

Also, another thing that is bad in domoticz:

IF(EXISTS /sys/class/gpio)
message(STATUS "GPIO is available")
add_definitions(-DWITH_GPIO)
ELSE()
message(STATUS "GPIO is not available")
ENDIF()

So they check on the build machine if /sys/class/gpio exists to decide whether to enable GPIO support...

Anyway, I've applied your openzwave patch.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com