Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From 75e92438bcdb78a90912366b07bf503646806686 Mon Sep 17 00:00:00 2001
|
||||
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
|
||||
Date: Sun, 21 Feb 2016 17:02:06 +0100
|
||||
Subject: [PATCH] configure.ac: check for localtime_r
|
||||
|
||||
HAVE_LOCALTIME_R is used in owftp.c, so it should be checked for.
|
||||
|
||||
Without this, static build fails because localtime_r is defined twice.
|
||||
|
||||
Upstream-Status: Submitted
|
||||
https://sourceforge.net/p/owfs/mailman/message/34873667/
|
||||
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c22dde9..12fdd18 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1529,7 +1529,7 @@ AC_FUNC_SELECT_ARGTYPES
|
||||
AC_FUNC_STRFTIME
|
||||
AC_FUNC_STRTOD
|
||||
AC_TYPE_SIGNAL
|
||||
-AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gettimeofday inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline])
|
||||
+AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gettimeofday inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline localtime_r])
|
||||
|
||||
if test "${ENABLE_ZERO}" = "true" ; then
|
||||
AC_SEARCH_LIBS(dlopen, dl, AC_DEFINE(HAVE_DLOPEN, 1, [Define if you have dlopen]))
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From d24e63eea4f4d234f313145e40668a5e2f64e49c Mon Sep 17 00:00:00 2001
|
||||
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
|
||||
Date: Wed, 9 Mar 2016 23:20:11 +0100
|
||||
Subject: [PATCH] compat.h: only include compat_netdb.h if needed
|
||||
|
||||
compat_netdb.h is added for only one reason: to provide the definitions
|
||||
for getaddrinfo, in case it is not provided by the system.
|
||||
compat_netdb.h is just a copy from an old glibc version, but that makes
|
||||
it incompatible with other standard C libraries. For example, uClibc
|
||||
without RPC support doesn't have the rpc/netdb.h header. This leads to
|
||||
build errors.
|
||||
|
||||
To work around this, only include compat_netdb.h when needed, i.e.
|
||||
when getaddrinfo isn't provided natively.
|
||||
|
||||
Note that this getaddrinfo compat was introduced in commit bc54c431 to
|
||||
support Solaris 7. Starting from Solaris 8, however, getaddrinfo is
|
||||
available natively, and it's available on MacOS, Windows and any other
|
||||
POSIX-2001 compliant system as well. So it may be worhtwhile to remove
|
||||
it altogether.
|
||||
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
module/owlib/src/include/compat.h | 2 ++
|
||||
module/ownet/c/src/include/compat.h | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/module/owlib/src/include/compat.h b/module/owlib/src/include/compat.h
|
||||
index c55bc96..e95e16f 100644
|
||||
--- a/module/owlib/src/include/compat.h
|
||||
+++ b/module/owlib/src/include/compat.h
|
||||
@@ -57,7 +57,9 @@
|
||||
#include <features.h>
|
||||
#endif
|
||||
|
||||
+#ifndef HAVE_GETADDRINFO
|
||||
#include "compat_netdb.h"
|
||||
+#endif
|
||||
#include "compat_getopt.h"
|
||||
|
||||
#ifndef HAVE_STRSEP
|
||||
diff --git a/module/ownet/c/src/include/compat.h b/module/ownet/c/src/include/compat.h
|
||||
index c45d852..f8ae759 100644
|
||||
--- a/module/ownet/c/src/include/compat.h
|
||||
+++ b/module/ownet/c/src/include/compat.h
|
||||
@@ -58,7 +58,9 @@ $Id$
|
||||
#include <features.h>
|
||||
#endif
|
||||
|
||||
+#ifndef HAVE_GETADDRINFO
|
||||
#include "compat_netdb.h"
|
||||
+#endif
|
||||
#include "compat_getopt.h"
|
||||
|
||||
#ifndef HAVE_STRSEP
|
||||
--
|
||||
2.7.0
|
||||
|
||||
16
bsp/buildroot/package/owfs/Config.in
Normal file
16
bsp/buildroot/package/owfs/Config.in
Normal file
@@ -0,0 +1,16 @@
|
||||
config BR2_PACKAGE_OWFS
|
||||
bool "owfs"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
OWFS is an easy way to use the powerful 1-wire system of
|
||||
Dallas/Maxim.
|
||||
|
||||
OWFS is a simple and flexible program to monitor and control
|
||||
the physical environment. You can write scripts to read
|
||||
temperature, flash lights, write to an LCD, log and graph,
|
||||
etc.
|
||||
|
||||
http://owfs.org/
|
||||
|
||||
comment "owfs needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
31
bsp/buildroot/package/owfs/S25owserver
Executable file
31
bsp/buildroot/package/owfs/S25owserver
Executable file
@@ -0,0 +1,31 @@
|
||||
NAME="owserver"
|
||||
DAEMON="/usr/bin/${NAME}"
|
||||
PID_F="/run/${NAME}.pid"
|
||||
|
||||
OWSERVER_ARGS=
|
||||
[ -r /etc/default/${NAME} ] && . /etc/default/${NAME}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
printf "Starting ${NAME}: "
|
||||
if [ -z "${OWSERVER_ARGS}" ]; then
|
||||
echo "OWSERVER_ARGS must be set in defaults file" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
start-stop-daemon -S -x ${DAEMON} -- \
|
||||
--pid_file ${PID_F} ${OWSERVER_ARGS}
|
||||
[ $? -eq 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
stop)
|
||||
printf "Stopping ${NAME}: "
|
||||
start-stop-daemon -K -p ${PID_F}
|
||||
[ $? -eq 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
restart|reload)
|
||||
$0 stop
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload}"
|
||||
exit 1
|
||||
esac
|
||||
33
bsp/buildroot/package/owfs/S30owfs
Executable file
33
bsp/buildroot/package/owfs/S30owfs
Executable file
@@ -0,0 +1,33 @@
|
||||
NAME="owfs"
|
||||
DAEMON="/usr/bin/${NAME}"
|
||||
PID_F="/run/${NAME}.pid"
|
||||
OWFS_MOUNTPOINT="/dev/1wire"
|
||||
OWFS_DEVICES="-s localhost:4304"
|
||||
OWFS_ARGS=""
|
||||
|
||||
[ -r /etc/default/${NAME} ] && . /etc/default/${NAME}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
printf "Starting ${NAME}: "
|
||||
# Fuse may be in a module, so try to load it
|
||||
modprobe -q fuse && printf "[fuse] "
|
||||
mkdir -p ${OWFS_MOUNTPOINT}
|
||||
start-stop-daemon -S -x ${DAEMON} -- \
|
||||
--pid_file ${PID_F} -m ${OWFS_MOUNTPOINT} ${OWFS_DEVICES} \
|
||||
${OWFS_ARGS}
|
||||
[ $? -eq 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
stop)
|
||||
printf "Stopping ${NAME}: "
|
||||
start-stop-daemon -K -p ${PID_F}
|
||||
[ $? -eq 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
restart|reload)
|
||||
$0 stop
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload}"
|
||||
exit 1
|
||||
esac
|
||||
4
bsp/buildroot/package/owfs/owfs.hash
Normal file
4
bsp/buildroot/package/owfs/owfs.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# From https://sourceforge.net/projects/owfs/files/owfs/3.1p1/
|
||||
sha1 80892ca3e72fef2979b8f0a04db15fd24a2cbda6 owfs-3.1p1.tar.gz
|
||||
# Locally calculated
|
||||
sha256 e69421ae534565c1f8530a2447f583401f4d0d4b1cf3cb8cf399a57133ed7f81 owfs-3.1p1.tar.gz
|
||||
84
bsp/buildroot/package/owfs/owfs.mk
Normal file
84
bsp/buildroot/package/owfs/owfs.mk
Normal file
@@ -0,0 +1,84 @@
|
||||
################################################################################
|
||||
#
|
||||
# owfs
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OWFS_VERSION = 3.1p1
|
||||
OWFS_SITE = http://downloads.sourceforge.net/project/owfs/owfs/$(OWFS_VERSION)
|
||||
OWFS_DEPENDENCIES = host-pkgconf
|
||||
OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl
|
||||
|
||||
# 0001-configure.ac-check-for-localtime_r.patch touches configure.ac
|
||||
OWFS_AUTORECONF = YES
|
||||
|
||||
# owtcl license is declared in module/ownet/c/src/include/ow_functions.h
|
||||
OWFS_LICENSE = GPLv2+, LGPLv2 (owtcl)
|
||||
OWFS_LICENSE_FILES = COPYING COPYING.LIB
|
||||
OWFS_INSTALL_STAGING = YES
|
||||
|
||||
# owfs PHP support is not PHP 7 compliant
|
||||
# https://sourceforge.net/p/owfs/support-requests/32/
|
||||
OWFS_CONF_OPTS += --disable-owphp --without-php
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBFUSE),y)
|
||||
OWFS_DEPENDENCIES += libfuse
|
||||
OWFS_CONF_OPTS += \
|
||||
--enable-owfs \
|
||||
--with-fuseinclude=$(STAGING_DIR)/usr/include \
|
||||
--with-fuselib=$(STAGING_DIR)/usr/lib
|
||||
define OWFS_INSTALL_FUSE_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S30owfs \
|
||||
$(TARGET_DIR)/etc/init.d/S30owfs
|
||||
endef
|
||||
define OWFS_CREATE_MOUNTPOINT
|
||||
mkdir -p $(TARGET_DIR)/dev/1wire
|
||||
endef
|
||||
OWFS_POST_INSTALL_TARGET_HOOKS += OWFS_CREATE_MOUNTPOINT
|
||||
else
|
||||
OWFS_CONF_OPTS += --disable-owfs
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
||||
OWFS_CONF_OPTS += --enable-usb
|
||||
OWFS_DEPENDENCIES += libusb
|
||||
else
|
||||
OWFS_CONF_OPTS += --disable-usb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AVAHI),y)
|
||||
OWFS_CONF_OPTS += --enable-avahi
|
||||
OWFS_DEPENDENCIES += avahi
|
||||
else
|
||||
OWFS_CONF_OPTS += --disable-avahi
|
||||
endif
|
||||
|
||||
# setup.py isn't python3 compliant
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
OWFS_CONF_OPTS += \
|
||||
--enable-owpython \
|
||||
--with-python \
|
||||
--with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config
|
||||
OWFS_MAKE_ENV += \
|
||||
CC="$(TARGET_CC)" \
|
||||
PYTHONPATH="$(PYTHON_PATH)" \
|
||||
_python_sysroot=$(STAGING_DIR) \
|
||||
_python_prefix=/usr \
|
||||
_python_exec_prefix=/usr
|
||||
OWFS_DEPENDENCIES += python host-swig
|
||||
else
|
||||
OWFS_CONF_OPTS += --disable-owpython --without-python
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
# zeroconf support uses dlopen()
|
||||
OWFS_CONF_OPTS += --disable-zero
|
||||
endif
|
||||
|
||||
define OWFS_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S25owserver \
|
||||
$(TARGET_DIR)/etc/init.d/S25owserver
|
||||
$(OWFS_INSTALL_FUSE_INIT_SYSV)
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user