Skip to contentSkip to conversation

package/ola: bump version to 0.10.0

PATCH New Bernd Kuhls 2 participants 4 messages Jan 30, 2016 – Feb 2, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/ola: bump version to 0.10.0

---
 package/ola/ola.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/ola/ola.mk +1 -1
index 9598de9..fa897fe 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OLA_VERSION = 0.9.6
+OLA_VERSION = 0.10.0
 OLA_SITE = $(call github,OpenLightingProject,ola,$(OLA_VERSION))
 
 OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests)
Signature · 1 line
2.7.0.rc3
#1 lore raw

PATCH 2/2 package/ola: fix musl build

Fixes
http://autobuild.buildroot.net/results/17f/17fe88868acdbba074561da14c4417e31d506823/
http://autobuild.buildroot.net/results/d99/d99ca60cc4bf86c338fd61f9fd2de0bb9598d670/

---
 ...0002-Fix-build-errors-with-musl-C-library.patch | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 package/ola/0002-Fix-build-errors-with-musl-C-library.patch
package/ola/0002-Fix-build-errors-with-musl-C-library.patch new file +41 -0
new file mode 100644
index 0000000..7a0f21e
@@ -0,0 +1,41 @@
+From 3bd2646e4d6834ec25c193293841acc5da9060e7 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 30 Jan 2016 10:41:30 +0100
+Subject: [PATCH 1/1] Fix build errors with musl C library.
+
+Patch sent upstream:
+https://github.com/OpenLightingProject/ola/pull/1024
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ common/network/NetworkUtils.cpp | 1 +
+ plugins/spi/SPIWriter.cpp       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/common/network/NetworkUtils.cpp b/common/network/NetworkUtils.cpp
+index dc1d166..38f1993 100644
+--- a/common/network/NetworkUtils.cpp
++++ b/common/network/NetworkUtils.cpp
+@@ -55,6 +55,7 @@ typedef uint32_t in_addr_t;
+ // Do something else if we don't have Netlink/on Windows
+ #endif
+ 
++#include <endian.h>
+ #include <errno.h>
+ #include <limits.h>
+ #include <stdlib.h>
+diff --git a/plugins/spi/SPIWriter.cpp b/plugins/spi/SPIWriter.cpp
+index 36b66c5..b50e5dc 100644
+--- a/plugins/spi/SPIWriter.cpp
++++ b/plugins/spi/SPIWriter.cpp
+@@ -18,6 +18,7 @@
+  * Copyright (C) 2013 Simon Newton
+  */
+ 
++#include <linux/ioctl.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <linux/spi/spidev.h>
+-- 
+2.7.0.rc3
+
Signature · 1 line
2.7.0.rc3
#2 lore raw

PATCH 2/2 package/ola: fix musl build

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/17f/17fe88868acdbba074561da14c4417e31d506823/
http://autobuild.buildroot.net/results/d99/d99ca60cc4bf86c338fd61f9fd2de0bb9598d670/

---
 ...0002-Fix-build-errors-with-musl-C-library.patch | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 package/ola/0002-Fix-build-errors-with-musl-C-library.patch

Since your patch has been merged upstream (good!), I've changed this commit to use OLA_PATCH pointing to the github commit, and applied.

Thanks!

Thomas

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

PATCH 1/2 package/ola: bump version to 0.10.0

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls
---
 package/ola/ola.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks. I committed a follow-up patch adding a hash file.

Thomas

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