Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master' into rpi

  • Loading branch information...
commit 78ffd8fb89896189ca4ceb6bac6c8c17bb1a5013 2 parents 8701f9a + 766d3b9
Guillermo A. Amaral authored
1  package/Config.in
View
@@ -678,6 +678,7 @@ source "package/iptables/Config.in"
source "package/iw/Config.in"
source "package/kismet/Config.in"
source "package/lighttpd/Config.in"
+source "package/linknx/Config.in"
source "package/links/Config.in"
source "package/linphone/Config.in"
source "package/lrzsz/Config.in"
4 package/busybox/S01logging
View
@@ -6,13 +6,13 @@
case "$1" in
start)
echo -n "Starting logging: "
- start-stop-daemon -S -q -p /var/run/syslog.pid --exec /sbin/syslogd -- -m 0
+ start-stop-daemon -S -q -p /var/run/syslogd.pid --exec /sbin/syslogd -- -m 0
start-stop-daemon -S -q -p /var/run/klogd.pid --exec /sbin/klogd
echo "OK"
;;
stop)
echo -n "Stopping logging: "
- start-stop-daemon -K -q -p /var/run/syslog.pid
+ start-stop-daemon -K -q -p /var/run/syslogd.pid
start-stop-daemon -K -q -p /var/run/klogd.pid
echo "OK"
;;
1  package/fbset/fbset.mk
View
@@ -7,6 +7,7 @@
FBSET_VERSION = 2.1
FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
+FBSET_DEPENDENCIES = host-bison host-flex
FBSET_LICENSE = GPLv2
# Make sure full fbset wins over busybox fbset
2  package/hiawatha/hiawatha.mk
View
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.8
+HIAWATHA_VERSION = 9.0
HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
HIAWATHA_LICENSE = GPLv2
HIAWATHA_LICENSE_FILES = LICENSE
12 package/linknx/Config.in
View
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LINKNX
+ bool "linknx"
+ select BR2_PACKAGE_LIBPTHSEM
+ depends on BR2_INSTALL_LIBSTDCPP
+ help
+ Linknx is an automation platform providing high level functionalities
+ to EIB/KNX installation.
+
+ http://linknx.sourceforge.net/
+
+comment "linknx requires a toolchain with C++ support"
+ depends on !BR2_INSTALL_LIBSTDCPP
22 package/linknx/linknx-missing-unistd.patch
View
@@ -0,0 +1,22 @@
+[PATCH]: ioport.cpp: close(2) needs unistd.h
+
+Fixed in upstream CVS:
+http://linknx.cvs.sourceforge.net/viewvc/linknx/linknx/linknx/src/ioport.cpp?revision=1.20&view=markup
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/ioport.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: linknx-0.0.1.30/src/ioport.cpp
+===================================================================
+--- linknx-0.0.1.30.orig/src/ioport.cpp
++++ linknx-0.0.1.30/src/ioport.cpp
+@@ -21,6 +21,7 @@
+ #include <iomanip>
+ #include "ioport.h"
+ #include <fcntl.h>
++#include <unistd.h>
+
+ Logger& IOPort::logger_m(Logger::getInstance("IOPort"));
+ Logger& RxThread::logger_m(Logger::getInstance("RxThread"));
30 package/linknx/linknx.mk
View
@@ -0,0 +1,30 @@
+#############################################################
+#
+# linknx
+#
+#############################################################
+
+LINKNX_VERSION = 0.0.1.30
+LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
+LINKNX_LICENSE = GPLv2+
+LINKNX_INSTALL_STAGING = YES
+LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \
+ --with-pth=$(STAGING_DIR)/usr
+
+LINKNX_DEPENDENCIES = libpthsem
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
+LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
+LINKNX_DEPENDENCIES = mysql_client
+else
+LINKNX_CONF_OPT += --without-mysql
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+LINKNX_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
+LINKNX_DEPENDENCIES += libcurl
+else
+LINKNX_CONF_OPT += --without-libcurl
+endif
+
+$(eval $(autotools-package))
4 package/polarssl/polarssl-shared-and-static-library.patch
View
@@ -9,7 +9,7 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
defaults to OFF). Both options can be manipulated independently.
-[Gustavo: update for polarssl 1.2.5]
+[Gustavo: update for polarssl 1.2.6]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa
+if(USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.5 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.6 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
+
+endif(USE_SHARED_POLARSSL_LIBRARY)
2  package/polarssl/polarssl.mk
View
@@ -1,5 +1,5 @@
POLARSSL_SITE = https://polarssl.org/download
-POLARSSL_VERSION = 1.2.5
+POLARSSL_VERSION = 1.2.6
POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
POLARSSL_CONF_OPT = \
-DUSE_SHARED_POLARSSL_LIBRARY=ON \
Please sign in to comment.
Something went wrong with that request. Please try again.