Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,30 +0,0 @@
|
||||
From 835571774dc519dd2cff7ab1020cf298cc953a8f Mon Sep 17 00:00:00 2001
|
||||
From: Thordur Bjornsson <thorduri@secnorth.net>
|
||||
Date: Tue, 7 Jul 2015 12:34:08 +0200
|
||||
Subject: [PATCH] omfile: unconditionally include fcntl.h.
|
||||
|
||||
required for open() flags
|
||||
|
||||
Signed-off-by: Thordur Bjornsson <thorduri@secnorth.net>
|
||||
[Bernd: downloaded from upstream commit:
|
||||
https://github.com/rsyslog/rsyslog/commit/835571774dc519dd2cff7ab1020cf298cc953a8f
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
tools/omfile.c | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tools/omfile.c b/tools/omfile.c
|
||||
index 482e723..4444b97 100644
|
||||
--- a/tools/omfile.c
|
||||
+++ b/tools/omfile.c
|
||||
@@ -48,9 +48,7 @@
|
||||
#include <libgen.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/file.h>
|
||||
-#ifdef OS_SOLARIS
|
||||
-# include <fcntl.h>
|
||||
-#endif
|
||||
+#include <fcntl.h>
|
||||
#ifdef HAVE_ATOMIC_BUILTINS
|
||||
# include <pthread.h>
|
||||
#endif
|
||||
@@ -3,11 +3,14 @@ config BR2_PACKAGE_RSYSLOG
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_LIBESTR
|
||||
select BR2_PACKAGE_LIBLOGGING
|
||||
select BR2_PACKAGE_JSON_C
|
||||
select BR2_PACKAGE_LIBFASTJSON
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS # modules
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
|
||||
# Propagate the exact same dependency from libfastjson,
|
||||
# even though rsyslog already depends on threads for itself:
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
help
|
||||
Rsyslog is a powerful and flexible syslog implementation
|
||||
|
||||
@@ -17,3 +20,4 @@ comment "rsyslog needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://www.rsyslog.com/downloads/download-v8-stable/
|
||||
sha256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc rsyslog-8.9.0.tar.gz
|
||||
sha256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e rsyslog-8.19.0.tar.gz
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RSYSLOG_VERSION = 8.9.0
|
||||
RSYSLOG_VERSION = 8.19.0
|
||||
RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
|
||||
RSYSLOG_LICENSE = GPLv3, LGPLv3, Apache-2.0
|
||||
RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
|
||||
RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf
|
||||
RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf
|
||||
RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
|
||||
RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
|
||||
mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \
|
||||
@@ -22,6 +22,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
RSYSLOG_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
RSYSLOG_DEPENDENCIES += gnutls
|
||||
RSYSLOG_CONF_OPTS += --enable-gnutls
|
||||
else
|
||||
RSYSLOG_CONF_OPTS += --disable-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEE),y)
|
||||
RSYSLOG_DEPENDENCIES += libee
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user