rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bsp/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
View File

@@ -1,7 +1,7 @@
From fe05ccf80afe5de33d4f9c5e5545390c450bcd2d Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 24 Apr 2014 23:27:32 +0200
Subject: [PATCH 1/5] auto/type/sizeof: rework autotest to be cross-compilation
Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation
friendly
Rework the sizeof test to do the checks at compile time instead of at
@@ -13,6 +13,8 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Refresh for 1.8.0.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
[martin@barkynet.com: Updated for 1.10.0]
Signed-off-by: Martin Bark <martin@barkynet.com>
---
auto/types/sizeof | 42 ++++++++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 14 deletions(-)
@@ -30,7 +32,7 @@ index a5f66bb..c6f31ec 100644
#include <sys/types.h>
#include <sys/time.h>
@@ -25,29 +25,43 @@ $NGX_INCLUDE_UNISTD_H
@@ -25,22 +25,40 @@ $NGX_INCLUDE_UNISTD_H
$NGX_INCLUDE_INTTYPES_H
$NGX_INCLUDE_AUTO_CONFIG_H
@@ -80,13 +82,6 @@ index a5f66bb..c6f31ec 100644
echo " $ngx_size bytes"
fi
-
-rm -rf $NGX_AUTOTEST*
-
-
case $ngx_size in
4)
ngx_max_value=2147483647
--
1.9.1

2
bsp/buildroot/package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
View File

@@ -1,7 +1,7 @@
From ef72be22ad6d58e230f75553d80b470b80c3303a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 4 May 2014 00:40:49 +0200
Subject: [PATCH 2/5] auto/feature: add mechanism allowing to force feature run
Subject: [PATCH] auto/feature: add mechanism allowing to force feature run
test result
Whenever a feature needs to run a test, the ngx_feature_run_force_result

2
bsp/buildroot/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
View File

@@ -1,7 +1,7 @@
From 71939b727a8fa9f722934700948a5b68960f6183 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 29 May 2014 18:52:10 +0200
Subject: [PATCH 3/5] auto/*: set ngx_feature_run_force_result for each feature
Subject: [PATCH] auto/*: set ngx_feature_run_force_result for each feature
requiring run test
Each feature requiring a run test has a matching preset variable (called

42
bsp/buildroot/package/nginx/0004-auto-lib-libxslt-conf-allow-to-override-ngx_feature_.patch
View File

@@ -1,42 +0,0 @@
From 5d281572d0afbf69d934737e1ee4c553670a46cc Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 29 May 2014 19:22:27 +0200
Subject: [PATCH 4/5] auto/lib/libxslt/conf: allow to override ngx_feature_path
and ngx_feature_libs
Because libxml2 headers are not in /usr/include by default, hardcoding the
include directory to /usr/include/libxml2 does not play well when
cross-compiling, or if libxml2 has been installed somewhere else.
This patch allows to define/override the libxslt include directory, and
the libxslt libs flags.
Being able to override the include location is especially useful when
cross-compiling to prevent gcc from complaining about unsafe include
location for cross-compilation (-Wpoision-system-directories).
So far, this warning is only triggered by libxslt.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
auto/lib/libxslt/conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
index bc19d83..386f1a0 100644
--- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf
@@ -12,8 +12,8 @@
#include <libxslt/xsltInternals.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>"
- ngx_feature_path="/usr/include/libxml2"
- ngx_feature_libs="-lxml2 -lxslt"
+ ngx_feature_path="${ngx_feature_path_libxslt:=/usr/include/libxml2}"
+ ngx_feature_libs="${ngx_feature_libs_libxslt:=-lxml2 -lxslt}"
ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
xsltStylesheetPtr sheet = NULL;
xmlDocPtr doc;
--
1.9.2

31
bsp/buildroot/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch Normal file
View File

@@ -0,0 +1,31 @@
From 211b9f19a3a62826fadef55d2f89d6f66fbf4aa6 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 29 May 2014 19:22:27 +0200
Subject: [PATCH] auto/lib/libxslt/conf: use pkg-config
Change to using pkg-config to find the path to libxslt and its
dependencies.
Signed-off-by: Martin Bark <martin@barkynet.com>
---
auto/lib/libxslt/conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
index 3a0f37b..3c2a60e 100644
--- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf
@@ -12,8 +12,8 @@
#include <libxslt/xsltInternals.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>"
- ngx_feature_path="/usr/include/libxml2"
- ngx_feature_libs="-lxml2 -lxslt"
+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|sed 's/-I//g')"
+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
xsltStylesheetPtr sheet = NULL;
xmlDocPtr doc;
--
2.8.2

2
bsp/buildroot/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
View File

@@ -1,7 +1,7 @@
From 08617a8d29ee22831175697555558fec8f52772c Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 1 Jun 2014 16:05:04 +0200
Subject: [PATCH 5/5] auto/unix: make sys_nerr guessing cross-friendly
Subject: [PATCH] auto/unix: make sys_nerr guessing cross-friendly
This patch replaces the default sys_nerr runtest with a test done at
buildtime.

31
bsp/buildroot/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch Normal file
View File

@@ -0,0 +1,31 @@
From 756556d127da291cad8a2c007a89124a692aef7f Mon Sep 17 00:00:00 2001
From: Martin Bark <martin@barkynet.com>
Date: Fri, 6 May 2016 14:48:31 +0100
Subject: [PATCH] auto/lib/openssl/conf: use pkg-config
Change to using pkg-config to find the path to openssl and its
dependencies.
Signed-off-by: Martin Bark <martin@barkynet.com>
---
auto/lib/openssl/conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 39d9602..995c6f3 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -50,8 +50,8 @@ else
ngx_feature_name="NGX_OPENSSL"
ngx_feature_run=no
ngx_feature_incs="#include <openssl/ssl.h>"
- ngx_feature_path=
- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|sed 's/-I//g')"
+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
. auto/feature
--
2.8.2

31
bsp/buildroot/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch Normal file
View File

@@ -0,0 +1,31 @@
From fd9885fe5fef5826034547ca6be7299863f99769 Mon Sep 17 00:00:00 2001
From: Martin Bark <martin@barkynet.com>
Date: Fri, 6 May 2016 14:48:49 +0100
Subject: [PATCH] auto/lib/libgd/conf: use pkg-config
Change to using pkg-config to find the path to libgd and its
dependencies.
Signed-off-by: Martin Bark <martin@barkynet.com>
---
auto/lib/libgd/conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
index 6e4e91c..1c536a2 100644
--- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf
@@ -7,8 +7,8 @@
ngx_feature_name=
ngx_feature_run=no
ngx_feature_incs="#include <gd.h>"
- ngx_feature_path=
- ngx_feature_libs="-lgd"
+ ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)"
+ ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)"
ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);"
. auto/feature
--
2.8.2

33
bsp/buildroot/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Normal file
View File

@@ -0,0 +1,33 @@
From 8dc9dffc1f99ac951865f3135dfb5061a08d1f85 Mon Sep 17 00:00:00 2001
From: Martin Bark <martin@barkynet.com>
Date: Fri, 6 May 2016 16:29:17 +0100
Subject: [PATCH] src/os/unix/ngx_linux_config.h: only include dlfcn.h if
available
Signed-off-by: Martin Bark <martin@barkynet.com>
---
src/os/unix/ngx_linux_config.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index 2f6129d..4244086 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -55,10 +55,12 @@
#include <crypt.h>
#include <sys/utsname.h> /* uname() */
-#include <dlfcn.h>
+#include <ngx_auto_config.h>
-#include <ngx_auto_config.h>
+#if (NGX_HAVE_DLOPEN)
+#include <dlfcn.h>
+#endif
#if (NGX_HAVE_POSIX_SEM)
--
2.8.2

63
bsp/buildroot/package/nginx/Config.in
View File

@@ -1,6 +1,7 @@
menuconfig BR2_PACKAGE_NGINX
bool "nginx"
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_LIBATOMIC_OPS if BR2_sparc_v8 || BR2_sparc_leon3
help
nginx is an HTTP and reverse proxy server, as well as a mail proxy
server.
@@ -18,6 +19,13 @@ config BR2_PACKAGE_NGINX_FILE_AIO
depends on !BR2_aarch64
depends on !BR2_arc
config BR2_PACKAGE_NGINX_THREADS
bool "thread pool support"
depends on BR2_TOOLCHAIN_HAS_THREADS
comment "thread pool support needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_NGINX_HTTP
bool "http server"
default y
@@ -36,8 +44,8 @@ config BR2_PACKAGE_NGINX_HTTP_SSL_MODULE
help
Enable ngx_http_ssl_module
config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE
bool "ngx_http_spdy_module"
config BR2_PACKAGE_NGINX_HTTP_V2_MODULE
bool "ngx_http_v2_module"
select BR2_PACKAGE_ZLIB
help
Enable ngx_http_spdy_module
@@ -304,6 +312,57 @@ config BR2_PACKAGE_NGINX_MAIL_SMTP_MODULE
endif #BR2_PACKAGE_NGINX_MAIL
config BR2_PACKAGE_NGINX_STREAM
bool "stream proxy modules"
if BR2_PACKAGE_NGINX_STREAM
config BR2_PACKAGE_NGINX_STREAM_SSL_MODULE
bool "ngx_stream_ssl_module"
select BR2_PACKAGE_OPENSSL
help
Enable ngx_stream_ssl_module
config BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE
bool "ngx_stream_limit_conn_module"
default y
help
Enable ngx_stream_limit_conn_module
config BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE
bool "ngx_stream_access_module"
default y
help
Enable ngx_stream_access_module
config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE
bool "ngx_stream_upstream_hash_module"
default y
help
Enable ngx_stream_upstream_hash_module
config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE
bool "ngx_stream_upstream_least_conn_module"
default y
help
Enable ngx_stream_upstream_least_conn_module
config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE
bool "ngx_stream_upstream_zone_module"
default y
help
Enable ngx_stream_upstream_zone_module
endif #BR2_PACKAGE_NGINX_STREAM
config BR2_PACKAGE_NGINX_DEBUG
bool "debug logging"
help
Enable debug logging. The debug level should be set with
the error_log directive. For example
error_log /var/log/nginx/error.log debug;
comment "misc. modules"
config BR2_PACKAGE_NGINX_SELECT_MODULE

2
bsp/buildroot/package/nginx/nginx.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7 nginx-1.8.1.tar.gz
sha256 1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 nginx-1.10.1.tar.gz

64
bsp/buildroot/package/nginx/nginx.mk
View File

@@ -4,16 +4,16 @@
#
################################################################################
NGINX_VERSION = 1.8.1
NGINX_VERSION = 1.10.1
NGINX_SITE = http://nginx.org/download
NGINX_LICENSE = BSD-2c
NGINX_LICENSE_FILES = LICENSE
NGINX_DEPENDENCIES = host-pkgconf
NGINX_CONF_OPTS = \
--crossbuild=Linux::$(BR2_ARCH) \
--with-cc="$(TARGET_CC)" \
--with-cpp="$(TARGET_CC)" \
--with-cc-opt="$(TARGET_CFLAGS)" \
--with-ld-opt="$(TARGET_LDFLAGS)" \
--with-ipv6
@@ -35,7 +35,6 @@ NGINX_CONF_ENV += \
ngx_force_c99_have_variadic_macros=yes \
ngx_force_gcc_have_variadic_macros=yes \
ngx_force_gcc_have_atomic=yes \
ngx_force_have_libatomic=no \
ngx_force_have_epoll=yes \
ngx_force_have_sendfile=yes \
ngx_force_have_sendfile64=yes \
@@ -64,7 +63,19 @@ NGINX_CONF_OPTS += \
--http-uwsgi-temp-path=/var/tmp/nginx/uwsgi
NGINX_CONF_OPTS += \
$(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio)
$(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \
$(if $(BR2_PACKAGE_NGINX_THREADS),--with-threads)
ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y)
NGINX_DEPENDENCIES += libatomic_ops
NGINX_CONF_OPTS += --with-libatomic
NGINX_CONF_ENV += ngx_force_have_libatomic=yes
ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
NGINX_CFLAGS += "-DAO_NO_SPARC_V9"
endif
else
NGINX_CONF_ENV += ngx_force_have_libatomic=no
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
NGINX_DEPENDENCIES += pcre
@@ -104,9 +115,9 @@ else
NGINX_CONF_OPTS += --without-http-cache
endif
ifeq ($(BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE),y)
ifeq ($(BR2_PACKAGE_NGINX_HTTP_V2_MODULE),y)
NGINX_DEPENDENCIES += zlib
NGINX_CONF_OPTS += --with-http_spdy_module
NGINX_CONF_OPTS += --with-http_v2_module
endif
ifeq ($(BR2_PACKAGE_NGINX_HTTP_SSL_MODULE),y)
@@ -117,8 +128,6 @@ endif
ifeq ($(BR2_PACKAGE_NGINX_HTTP_XSLT_MODULE),y)
NGINX_DEPENDENCIES += libxml2 libxslt
NGINX_CONF_OPTS += --with-http_xslt_module
NGINX_CONF_ENV += \
ngx_feature_path_libxslt=$(STAGING_DIR)/usr/include/libxml2
endif
ifeq ($(BR2_PACKAGE_NGINX_HTTP_IMAGE_FILTER_MODULE),y)
@@ -147,6 +156,11 @@ else
NGINX_CONF_OPTS += --without-http_gzip_module
endif
ifeq ($(BR2_PACKAGE_NGINX_NAXSI),y)
NGINX_DEPENDENCIES += nginx-naxsi
NGINX_CONF_OPTS += --add-module=$(NGINX_NAXSI_DIR)/naxsi_src
endif
ifeq ($(BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE),y)
NGINX_DEPENDENCIES += pcre
else
@@ -193,6 +207,7 @@ endif # BR2_PACKAGE_NGINX_HTTP
# mail modules
ifeq ($(BR2_PACKAGE_NGINX_MAIL),y)
NGINX_CONF_OPTS += --with-mail
ifeq ($(BR2_PACKAGE_NGINX_MAIL_SSL_MODULE),y)
NGINX_DEPENDENCIES += openssl
@@ -206,6 +221,33 @@ NGINX_CONF_OPTS += \
endif # BR2_PACKAGE_NGINX_MAIL
# stream modules
ifeq ($(BR2_PACKAGE_NGINX_STREAM),y)
NGINX_CONF_OPTS += --with-stream
ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_MODULE),y)
NGINX_DEPENDENCIES += openssl
NGINX_CONF_OPTS += --with-stream_ssl_module
endif
NGINX_CONF_OPTS += \
$(if $(BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE),,--without-stream_limit_conn_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE),,--without-stream_access_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE),,--without-stream_upstream_hash_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE),,--without-stream_upstream_least_conn_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE),,--without-stream_upstream_zone_module)
endif # BR2_PACKAGE_NGINX_STREAM
# external modules
ifeq ($(BR2_PACKAGE_NGINX_UPLOAD),y)
NGINX_CONF_OPTS += $(addprefix --add-module=,$(NGINX_UPLOAD_DIR))
NGINX_DEPENDENCIES += nginx-upload
endif
# Debug logging
NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug)
define NGINX_DISABLE_WERROR
$(SED) 's/-Werror//g' -i $(@D)/auto/cc/*
endef
@@ -213,7 +255,11 @@ endef
NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR
define NGINX_CONFIGURE_CMDS
cd $(@D) ; $(NGINX_CONF_ENV) ./configure $(NGINX_CONF_OPTS)
cd $(@D) ; $(NGINX_CONF_ENV) \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \
./configure $(NGINX_CONF_OPTS) \
--with-cc-opt="$(TARGET_CFLAGS) $(NGINX_CFLAGS)"
endef
define NGINX_BUILD_CMDS

3
bsp/buildroot/package/nginx/nginx.service
View File

@@ -5,7 +5,8 @@ After=syslog.target network.target
[Service]
Type=forking
PIDFile=/var/run/nginx.pid
ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx; /usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx
ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload
ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit