d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Buildroot to 2019.02.3 (#415)

Browse Source 
* Update Buildroot to 2019-02.3

* Fix enter script

* Update ova_defconfig

* Fix network manager

* Remove runc patches

* Use same docker version

* Fix build

* Fix vmtools

* Fix depens

* Fix handling with tempfiles

* Fix permission handling

* Fix cp

* Cleanup

* Fix mounts
This commit is contained in:
Pascal Vizeli
2019-06-27 11:58:50 +02:00
committed by GitHub
parent bb201fb842
commit 41d3f59002
2416 changed files with 36288 additions and 21885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot/package/haproxy/haproxy.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
HAPROXY_VERSION_MAJOR = 1.8
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14
HAPROXY_VERSION_MAJOR = 1.9
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1
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
@@ -48,12 +48,12 @@ endif
ifeq ($(BR2_PACKAGE_PCRE2),y)
HAPROXY_DEPENDENCIES += pcre2
HAPROXY_MAKE_OPTS += \
PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \
PCRE2_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config \
USE_PCRE2=1
else ifeq ($(BR2_PACKAGE_PCRE),y)
HAPROXY_DEPENDENCIES += pcre
HAPROXY_MAKE_OPTS += \
PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config \
USE_PCRE=1
endif