Bump buildroot to 2020.11-rc1 (#985)
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
This commit is contained in:
Stefan Agner
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NGINX_VERSION = 1.17.9
|
||||
NGINX_VERSION = 1.18.0
|
||||
NGINX_SITE = http://nginx.org/download
|
||||
NGINX_LICENSE = BSD-2-Clause
|
||||
NGINX_LICENSE_FILES = LICENSE
|
||||
@@ -14,8 +14,7 @@ NGINX_CONF_OPTS = \
|
||||
--crossbuild=Linux::$(BR2_ARCH) \
|
||||
--with-cc="$(TARGET_CC)" \
|
||||
--with-cpp="$(TARGET_CC)" \
|
||||
--with-ld-opt="$(TARGET_LDFLAGS)" \
|
||||
--with-ipv6
|
||||
--with-ld-opt="$(TARGET_LDFLAGS)"
|
||||
|
||||
# www-data user and group are used for nginx. Because these user and group
|
||||
# are already set by buildroot, it is not necessary to redefine them.
|
||||
@@ -50,8 +49,8 @@ NGINX_CONF_OPTS += \
|
||||
--prefix=/usr \
|
||||
--conf-path=/etc/nginx/nginx.conf \
|
||||
--sbin-path=/usr/sbin/nginx \
|
||||
--pid-path=/var/run/nginx.pid \
|
||||
--lock-path=/var/run/lock/nginx.lock \
|
||||
--pid-path=/run/nginx.pid \
|
||||
--lock-path=/run/lock/nginx.lock \
|
||||
--user=www-data \
|
||||
--group=www-data \
|
||||
--error-log-path=/var/log/nginx/error.log \
|
||||
@@ -86,7 +85,6 @@ endif
|
||||
|
||||
# modules disabled or not activated because of missing dependencies:
|
||||
# - google_perftools (googleperftools)
|
||||
# - http_geoip_module (geoip)
|
||||
# - http_perl_module (host-perl)
|
||||
# - pcre-jit (want to rebuild pcre)
|
||||
|
||||
@@ -135,6 +133,11 @@ NGINX_DEPENDENCIES += gd jpeg libpng
|
||||
NGINX_CONF_OPTS += --with-http_image_filter_module
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NGINX_HTTP_GEOIP_MODULE),y)
|
||||
NGINX_DEPENDENCIES += geoip
|
||||
NGINX_CONF_OPTS += --with-http_geoip_module
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NGINX_HTTP_GUNZIP_MODULE),y)
|
||||
NGINX_DEPENDENCIES += zlib
|
||||
NGINX_CONF_OPTS += --with-http_gunzip_module
|
||||
@@ -172,6 +175,7 @@ NGINX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_AUTH_REQUEST_MODULE),--with-http_auth_request_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_RANDOM_INDEX_MODULE),--with-http_random_index_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_DEGRADATION_MODULE),--with-http_degradation_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_SLICE_MODULE),--with-http_slice_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_STUB_STATUS_MODULE),--with-http_stub_status_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_CHARSET_MODULE),,--without-http_charset_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_SSI_MODULE),,--without-http_ssi_module) \
|
||||
@@ -194,6 +198,7 @@ NGINX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_BROWSER_MODULE),,--without-http_browser_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE),,--without-http_upstream_random_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module)
|
||||
|
||||
else # !BR2_PACKAGE_NGINX_HTTP
|
||||
@@ -220,16 +225,34 @@ endif # BR2_PACKAGE_NGINX_MAIL
|
||||
ifeq ($(BR2_PACKAGE_NGINX_STREAM),y)
|
||||
NGINX_CONF_OPTS += --with-stream
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NGINX_STREAM_REALIP_MODULE),y)
|
||||
NGINX_CONF_OPTS += --with-stream_realip_module
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_MODULE),y)
|
||||
NGINX_DEPENDENCIES += openssl
|
||||
NGINX_CONF_OPTS += --with-stream_ssl_module
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE),y)
|
||||
NGINX_DEPENDENCIES += geoip
|
||||
NGINX_CONF_OPTS += --with-stream_geoip_module
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_PREREAD_MODULE),y)
|
||||
NGINX_CONF_OPTS += --with-stream_ssl_preread_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_GEO_MODULE),,--without-stream_geo_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_STREAM_MAP_MODULE),,--without-stream_map_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_STREAM_SPLIT_CLIENTS_MODULE),,--without-stream_split_clients_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE),,--without-stream_return_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_RANDOM_MODULE),,--without-stream_upstream_random_module) \
|
||||
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE),,--without-stream_upstream_zone_module)
|
||||
|
||||
endif # BR2_PACKAGE_NGINX_STREAM
|
||||
@@ -267,7 +290,6 @@ NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR
|
||||
define NGINX_CONFIGURE_CMDS
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user