Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
Pascal Vizeli
@@ -0,0 +1,56 @@
|
||||
From f3dcdf6c9ffea4d9b89dca9706a48c44bd76c470 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 28 Sep 2018 19:21:26 +0200
|
||||
Subject: [PATCH] Allow configuration of pcre-config path
|
||||
|
||||
Add PCRE_CONFIGDIR variable to allow the user to configure path of
|
||||
pcre-config or pcre-config2 instead of using the one in his path.
|
||||
This is particular useful when cross-compiling.
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
Makefile | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 382f944f..7c31f1ba 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -78,6 +78,7 @@
|
||||
# Other variables :
|
||||
# DLMALLOC_SRC : build with dlmalloc, indicate the location of dlmalloc.c.
|
||||
# DLMALLOC_THRES : should match PAGE_SIZE on every platform (default: 4096).
|
||||
+# PCRE_CONFIGDIR : force the path to pcre-config or pcre-config2
|
||||
# PCREDIR : force the path to libpcre.
|
||||
# PCRE_LIB : force the lib path to libpcre (defaults to $PCREDIR/lib).
|
||||
# PCRE_INC : force the include path to libpcre ($PCREDIR/inc)
|
||||
@@ -734,7 +735,7 @@ endif
|
||||
# Forcing PCREDIR to an empty string will let the compiler use the default
|
||||
# locations.
|
||||
|
||||
-PCREDIR := $(shell pcre-config --prefix 2>/dev/null || echo /usr/local)
|
||||
+PCREDIR := $(shell $(PCRE_CONFIGDIR)pcre-config --prefix 2>/dev/null || echo /usr/local)
|
||||
ifneq ($(PCREDIR),)
|
||||
PCRE_INC := $(PCREDIR)/include
|
||||
PCRE_LIB := $(PCREDIR)/lib
|
||||
@@ -759,7 +760,7 @@ endif
|
||||
endif
|
||||
|
||||
ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(USE_PCRE2_JIT),)
|
||||
-PCRE2DIR := $(shell pcre2-config --prefix 2>/dev/null || echo /usr/local)
|
||||
+PCRE2DIR := $(shell $(PCRE_CONFIGDIR)pcre2-config --prefix 2>/dev/null || echo /usr/local)
|
||||
ifneq ($(PCRE2DIR),)
|
||||
PCRE2_INC := $(PCRE2DIR)/include
|
||||
PCRE2_LIB := $(PCRE2DIR)/lib
|
||||
@@ -777,7 +778,7 @@ endif
|
||||
endif
|
||||
|
||||
|
||||
-PCRE2_LDFLAGS := $(shell pcre2-config --libs$(PCRE2_WIDTH) 2>/dev/null || echo -L/usr/local/lib -lpcre2-$(PCRE2_WIDTH))
|
||||
+PCRE2_LDFLAGS := $(shell $(PCRE_CONFIGDIR)pcre2-config --libs$(PCRE2_WIDTH) 2>/dev/null || echo -L/usr/local/lib -lpcre2-$(PCRE2_WIDTH))
|
||||
|
||||
ifeq ($(PCRE2_LDFLAGS),)
|
||||
$(error libpcre2-$(PCRE2_WIDTH) not found)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
10
buildroot/package/haproxy/Config.in
Normal file
10
buildroot/package/haproxy/Config.in
Normal file
@@ -0,0 +1,10 @@
|
||||
config BR2_PACKAGE_HAPROXY
|
||||
bool "haproxy"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics
|
||||
help
|
||||
HAProxy is a free, very fast and reliable solution offering
|
||||
high availability, load balancing, and proxying for TCP and
|
||||
HTTP-based applications.
|
||||
|
||||
http://www.haproxy.org
|
||||
5
buildroot/package/haproxy/haproxy.hash
Normal file
5
buildroot/package/haproxy/haproxy.hash
Normal file
@@ -0,0 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf haproxy-1.8.14.tar.gz
|
||||
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
|
||||
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt
|
||||
sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 doc/gpl.txt
|
||||
82
buildroot/package/haproxy/haproxy.mk
Normal file
82
buildroot/package/haproxy/haproxy.mk
Normal file
@@ -0,0 +1,82 @@
|
||||
################################################################################
|
||||
#
|
||||
# haproxy
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HAPROXY_VERSION_MAJOR = 1.8
|
||||
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14
|
||||
HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
|
||||
HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
|
||||
HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
|
||||
|
||||
HAPROXY_MAKE_OPTS = \
|
||||
LD=$(TARGET_CC) \
|
||||
PREFIX=/usr \
|
||||
TARGET=custom
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
HAPROXY_LIBS += -latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
# threads uses atomics on gcc >= 4.7 and sync otherwise (see
|
||||
# include/common/hathreads.h)
|
||||
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y)
|
||||
HAPROXY_MAKE_OPTS += USE_THREAD=1
|
||||
else ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y)
|
||||
HAPROXY_MAKE_OPTS += USE_THREAD=1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
HAPROXY_DEPENDENCIES += lua
|
||||
HAPROXY_MAKE_OPTS += \
|
||||
LUA_LIB_NAME=lua \
|
||||
USE_LUA=1
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
HAPROXY_DEPENDENCIES += openssl
|
||||
HAPROXY_MAKE_OPTS += USE_OPENSSL=1
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
HAPROXY_LIBS += -lz
|
||||
endif
|
||||
endif
|
||||
|
||||
# pcre and pcre2 can't be enabled at the same time so prefer pcre2
|
||||
ifeq ($(BR2_PACKAGE_PCRE2),y)
|
||||
HAPROXY_DEPENDENCIES += pcre2
|
||||
HAPROXY_MAKE_OPTS += \
|
||||
PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \
|
||||
USE_PCRE2=1
|
||||
else ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
HAPROXY_DEPENDENCIES += pcre
|
||||
HAPROXY_MAKE_OPTS += \
|
||||
PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \
|
||||
USE_PCRE=1
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
HAPROXY_DEPENDENCIES += systemd
|
||||
HAPROXY_MAKE_OPTS += USE_SYSTEMD=1
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
HAPROXY_DEPENDENCIES += zlib
|
||||
HAPROXY_MAKE_OPTS += USE_ZLIB=1
|
||||
endif
|
||||
|
||||
HAPROXY_MAKE_OPTS += ADDLIB="$(HAPROXY_LIBS)"
|
||||
|
||||
define HAPROXY_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
|
||||
$(HAPROXY_MAKE_OPTS) -C $(@D)
|
||||
endef
|
||||
|
||||
define HAPROXY_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
|
||||
$(HAPROXY_MAKE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user