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
@@ -1,4 +1,4 @@
|
||||
From 2a5711651bee9d021733da19126a71aeda45e646 Mon Sep 17 00:00:00 2001
|
||||
From dfa9555010535003eac69788597f53d3ff44168f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 29 Nov 2018 23:33:10 +0100
|
||||
Subject: [PATCH] qsgtexture: fix debug build with uclibc
|
||||
@@ -23,17 +23,19 @@ Fixes:
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/qt/qtdeclarative/pull/4]
|
||||
[Rebased for Qt5.14.0]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/quick/scenegraph/util/qsgtexture.cpp | 2 +-
|
||||
src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
|
||||
index fea92a512..a26191006 100644
|
||||
--- a/src/quick/scenegraph/util/qsgtexture.cpp
|
||||
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
|
||||
@@ -53,7 +53,7 @@
|
||||
#endif
|
||||
diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
||||
index dfbe4d3f..6a7bc79b 100644
|
||||
--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
||||
+++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
||||
@@ -46,7 +46,7 @@
|
||||
#include <private/qsgmaterialshader_p.h>
|
||||
#include <QtGui/private/qrhi_p.h>
|
||||
|
||||
-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__)
|
||||
+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__)
|
||||
@@ -41,5 +43,5 @@ index fea92a512..a26191006 100644
|
||||
#endif
|
||||
|
||||
--
|
||||
2.14.1
|
||||
2.23.0
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From b616a7e2a7e03e2eb189dca3dc428c0e19e1652b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 6 Apr 2017 21:53:40 +0200
|
||||
Subject: [PATCH] examples: photoviewer needs widgets support
|
||||
|
||||
Fixes:
|
||||
|
||||
.../qt5declarative-5.8.0/examples/quick/demos/photoviewer/photoviewer.pro
|
||||
Project ERROR: Unknown module(s) in QT: widgets
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
examples/quick/demos/demos.pro | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
|
||||
index 0644b81a2..5a6fd52ba 100644
|
||||
--- a/examples/quick/demos/demos.pro
|
||||
+++ b/examples/quick/demos/demos.pro
|
||||
@@ -7,5 +7,7 @@ SUBDIRS = samegame \
|
||||
photosurface \
|
||||
stocqt
|
||||
|
||||
-qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer
|
||||
-
|
||||
+qtHaveModule(xmlpatterns) {
|
||||
+ SUBDIRS += rssnews
|
||||
+ qtHaveModule(widgets): SUBDIRS += photoviewer
|
||||
+}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
From b4db5c6cef877b33b5e7cd5a07fe4a7e6797dcfc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Tue, 16 May 2017 19:47:19 +0200
|
||||
Subject: [PATCH] examples: qquickviewcomparison and quickwidget needs OpenGL
|
||||
support
|
||||
|
||||
Fixes:
|
||||
|
||||
main.cpp:(.text._ZN11QQmlPrivate10createIntoI6FbItemEEvPv[_ZN11QQmlPrivate10createIntoI6FbItemEEvPv]+0x18): undefined reference to `QQuickFramebufferObject::QQuickFramebufferObject(QQuickItem*)'
|
||||
.obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
|
||||
main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED2Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED5Ev]+0x5c): undefined reference to `vtable for QQuickFramebufferObject'
|
||||
.obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
|
||||
main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev]+0x64): undefined reference to `vtable for QQuickFramebufferObject'
|
||||
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x48): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
|
||||
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x4c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
|
||||
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
|
||||
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
|
||||
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xbc): undefined reference to `QQuickFramebufferObject::releaseResources()'
|
||||
.obj/moc_fbitem.o: In function `FbItem::qt_metacast(char const*)':
|
||||
moc_fbitem.cpp:(.text+0x70): undefined reference to `QQuickFramebufferObject::qt_metacast(char const*)'
|
||||
.obj/moc_fbitem.o: In function `FbItem::qt_metacall(QMetaObject::Call, int, void**)':
|
||||
moc_fbitem.cpp:(.text+0x80): undefined reference to `QQuickFramebufferObject::qt_metacall(QMetaObject::Call, int, void**)'
|
||||
.obj/moc_fbitem.o: In function `FbItem::~FbItem()':
|
||||
moc_fbitem.cpp:(.text._ZN6FbItemD2Ev[_ZN6FbItemD5Ev]+0x38): undefined reference to `vtable for QQuickFramebufferObject'
|
||||
.obj/moc_fbitem.o: In function `FbItem::~FbItem()':
|
||||
moc_fbitem.cpp:(.text._ZN6FbItemD0Ev[_ZN6FbItemD0Ev]+0x40): undefined reference to `vtable for QQuickFramebufferObject'
|
||||
.obj/moc_fbitem.o:(.data.rel.ro+0x8): undefined reference to `typeinfo for QQuickFramebufferObject'
|
||||
.obj/moc_fbitem.o:(.data.rel.ro+0x58): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
|
||||
.obj/moc_fbitem.o:(.data.rel.ro+0x5c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
|
||||
.obj/moc_fbitem.o:(.data.rel.ro+0xc4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
|
||||
.obj/moc_fbitem.o:(.data.rel.ro+0xc8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
|
||||
.obj/moc_fbitem.o:(.data.rel.ro+0xcc): undefined reference to `QQuickFramebufferObject::releaseResources()'
|
||||
.obj/moc_fbitem.o:(.data.rel.ro+0xf0): undefined reference to `QQuickFramebufferObject::staticMetaObject'
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
|
||||
Note:
|
||||
An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for
|
||||
backporting to this version due to license differences.
|
||||
|
||||
---
|
||||
examples/quick/quick.pro | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
|
||||
index 445dfb0fa..26ca0138e 100644
|
||||
--- a/examples/quick/quick.pro
|
||||
+++ b/examples/quick/quick.pro
|
||||
@@ -36,7 +36,10 @@ qtConfig(opengl(es1|es2)?) {
|
||||
# Widget dependent examples
|
||||
qtHaveModule(widgets) {
|
||||
SUBDIRS += embeddedinwidgets
|
||||
- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
|
||||
+ # OpenGL Support Required
|
||||
+ qtConfig(opengl(es1|es2)?) {
|
||||
+ qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
|
||||
+ }
|
||||
}
|
||||
|
||||
EXAMPLE_FILES = \
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
config BR2_PACKAGE_QT5DECLARATIVE
|
||||
bool "qt5declarative"
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
select BR2_PACKAGE_QT5BASE
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
@@ -15,12 +14,8 @@ config BR2_PACKAGE_QT5DECLARATIVE
|
||||
|
||||
if BR2_PACKAGE_QT5DECLARATIVE
|
||||
|
||||
comment "quick module needs an OpenGL-capable backend"
|
||||
depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
|
||||
|
||||
config BR2_PACKAGE_QT5DECLARATIVE_QUICK
|
||||
bool "quick module"
|
||||
depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST
|
||||
select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist
|
||||
sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz
|
||||
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtdeclarative-everywhere-src-5.12.8.tar.xz.sha256
|
||||
sha256 7e1059be9f3faab6fd3d40b58666798963bb9d9c5442d5d16e6870c51327160b qtdeclarative-everywhere-src-5.12.8.tar.xz
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtdeclarative-everywhere-src-5.15.1.tar.xz.sha256
|
||||
sha256 7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768 qtdeclarative-everywhere-src-5.15.1.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
|
||||
@@ -10,7 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
|
||||
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
|
||||
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
|
||||
sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
|
||||
sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
|
||||
sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
|
||||
sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
|
||||
|
||||
@@ -7,60 +7,9 @@
|
||||
QT5DECLARATIVE_VERSION = $(QT5_VERSION)
|
||||
QT5DECLARATIVE_SITE = $(QT5_SITE)
|
||||
QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz
|
||||
QT5DECLARATIVE_DEPENDENCIES = qt5base
|
||||
QT5DECLARATIVE_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
|
||||
else
|
||||
QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
|
||||
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
|
||||
endif
|
||||
|
||||
define QT5DECLARATIVE_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
|
||||
endef
|
||||
|
||||
define QT5DECLARATIVE_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define QT5DECLARATIVE_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
|
||||
endef
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quick/ $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_LIBS
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins
|
||||
$(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS)
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qml* $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
$(QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES)
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_CMDS
|
||||
cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr
|
||||
$(QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES)
|
||||
$(QT5DECLARATIVE_INSTALL_TARGET_LIBS)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(qmake-package))
|
||||
|
||||
Reference in New Issue
Block a user