Update Buildroot to 2019.02.3 (#415)
* 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:
@@ -1,35 +0,0 @@
|
||||
From 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Fri, 21 Sep 2018 09:04:24 -0700
|
||||
Subject: [PATCH] Export qt_open64 from QtCore
|
||||
|
||||
Other libs use qcore_unix_p.h.
|
||||
|
||||
qopenglprogrambinarycache.cpp:function QOpenGLProgramBinaryCache::load(QByteArray const&, unsigned int): error: undefined reference to 'qt_open64(char const*, int, unsigned int)'
|
||||
|
||||
Change-Id: I44e7d800c68141bdaae0fffd155675d15eded2e4
|
||||
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
||||
Reviewed-by: Eric Lemanissier <eric.lemanissier@gmail.com>
|
||||
|
||||
Upstream: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/corelib/kernel/qcore_unix_p.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
|
||||
index cb98bef347..5a2a29a327 100644
|
||||
--- a/src/corelib/kernel/qcore_unix_p.h
|
||||
+++ b/src/corelib/kernel/qcore_unix_p.h
|
||||
@@ -178,7 +178,7 @@ inline void qt_ignore_sigpipe()
|
||||
|
||||
#if defined(Q_PROCESSOR_X86_32) && defined(__GLIBC__)
|
||||
# if !__GLIBC_PREREQ(2, 22)
|
||||
-int qt_open64(const char *pathname, int flags, mode_t);
|
||||
+Q_CORE_EXPORT int qt_open64(const char *pathname, int flags, mode_t);
|
||||
# undef QT_OPEN
|
||||
# define QT_OPEN qt_open64
|
||||
# endif
|
||||
--
|
||||
2.19.0
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 982801a21c3abad7025a7110275a49e200bc460f Mon Sep 17 00:00:00 2001
|
||||
From: Stefan O'Rear <stefanor@cox.net>
|
||||
Date: Thu, 17 Nov 2016 09:54:33 -0800
|
||||
Subject: [PATCH] double-conversion: enable for riscv
|
||||
|
||||
Original double conversion patch [1] 'Add support for RISC-V' ported
|
||||
to qtbase-5.11.3.
|
||||
|
||||
[1] Upstream: https://github.com/google/double-conversion/commit/8316ed5bf405835558a476e528d8e1d0adf69dd9
|
||||
|
||||
Change-Id: Id88a356940f4d61dbcec3741a74db695e47af3f0
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
index 485f680180..a736b14d1e 100644
|
||||
--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
@@ -66,6 +66,7 @@
|
||||
defined(__SH4__) || defined(__alpha__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2) || \
|
||||
defined(__AARCH64EL__) || defined(__AARCH64EB__) || \
|
||||
+ defined(__riscv) || \
|
||||
defined(__or1k__) || \
|
||||
defined(__microblaze__)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz.mirrorlist
|
||||
sha256 6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107 qtbase-everywhere-src-5.11.2.tar.xz
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz.sha256
|
||||
sha256 c6bf887732b83ce072eb72eddb7497bedcdf9ca794e7ed91261a93f063623e1c qtbase-everywhere-src-5.11.3.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
|
||||
@@ -0,0 +1,29 @@
|
||||
From 62588f2d8267c67c2337004e83e80695280db9eb Mon Sep 17 00:00:00 2001
|
||||
From: James Grant <jamesg@zaltys.org>
|
||||
Date: Sun, 3 Mar 2019 17:29:29 +1300
|
||||
Subject: [PATCH 1/1] libressl - add -fpermissive gcc flag to allow
|
||||
compilation.
|
||||
|
||||
Workaround for 'const BIO_METHOD *' vs. 'BIO_METHOD *' changes to BIO_new() and BIO_s_mem() function signatures.
|
||||
|
||||
Signed-off-by: James Grant <jamesg@zaltys.org>
|
||||
---
|
||||
src/network/ssl/ssl.pri | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
|
||||
index 29c47cd7..f0aad448 100644
|
||||
--- a/src/network/ssl/ssl.pri
|
||||
+++ b/src/network/ssl/ssl.pri
|
||||
@@ -77,7 +77,7 @@ android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
|
||||
LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
|
||||
}
|
||||
|
||||
- QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
|
||||
+ QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS -fpermissive
|
||||
LIBS_PRIVATE += $$OPENSSL_LIBS
|
||||
win32: LIBS_PRIVATE += -lcrypt32
|
||||
}
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@@ -286,6 +286,12 @@ comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8"
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_8
|
||||
|
||||
config BR2_PACKAGE_QT5BASE_OPENSSL
|
||||
bool
|
||||
# No OpenSSL 1.1.x support in Qt 5.6.x
|
||||
default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
|
||||
default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_QT5BASE_TSLIB
|
||||
bool "Enable Tslib support"
|
||||
select BR2_PACKAGE_TSLIB
|
||||
|
||||
@@ -33,7 +33,24 @@ else
|
||||
QT5BASE_DEPENDENCIES += pcre2
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE2),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse2
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSE3),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse3
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSSE3),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-ssse3
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSE4),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse4.1
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSE42),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse4.2
|
||||
else ifeq ($(BR2_X86_CPU_HAS_AVX),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-avx
|
||||
else ifeq ($(BR2_X86_CPU_HAS_AVX2),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-avx2
|
||||
else
|
||||
# no buildroot BR2_X86_CPU_HAS_AVX512 option yet for qt configure
|
||||
# option '-no-avx512' (available for latest only)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -kms
|
||||
@@ -171,8 +188,15 @@ else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-eglfs
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
# No OpenSSL 1.1.x support in Qt 5.6.x
|
||||
# LibreSSL works with shared linkage only and -fpermissive patch
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBRESSL),-openssl-linked,-no-openssl)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBRESSL),openssl)
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
|
||||
@@ -271,6 +295,15 @@ define QT5BASE_CONFIGURE_ARCH_CONFIG
|
||||
endef
|
||||
endif
|
||||
|
||||
# This allows to use ccache when available
|
||||
define QT5BASE_CONFIGURE_HOSTCC
|
||||
$(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf
|
||||
$(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
|
||||
endef
|
||||
|
||||
# Must be last so can override all options set by Buildroot
|
||||
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||
|
||||
define QT5BASE_CONFIGURE_CMDS
|
||||
mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/
|
||||
sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
|
||||
@@ -281,10 +314,11 @@ define QT5BASE_CONFIGURE_CMDS
|
||||
$(QT5BASE_CONFIGURE_CONFIG_FILE)
|
||||
touch $(QT5BASE_ARCH_CONFIG_FILE)
|
||||
$(QT5BASE_CONFIGURE_ARCH_CONFIG)
|
||||
$(QT5BASE_CONFIGURE_HOSTCC)
|
||||
(cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \
|
||||
MAKEFLAGS="-j$(PARALLEL_JOBS) $(MAKEFLAGS)" \
|
||||
./configure \
|
||||
-v \
|
||||
-prefix /usr \
|
||||
|
||||
Reference in New Issue
Block a user