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
2020-11-13 18:25:44 +01:00
committed by GitHub
parent 25a0dd3082
commit a0871be6c0
4024 changed files with 68095 additions and 47900 deletions

View File

@@ -0,0 +1,39 @@
From ca81a62bb3f8ce67d564631bb8d4e11619acf430 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Fri, 3 Apr 2020 19:59:47 +0200
Subject: [PATCH] Do not use deprecated QLinkedList
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Do not use (internally already by QT_NO_LINKED_LIST) deprecated QLinkeList,
use QList instead.
Fixes:
../../include/Enginio/1.6.3/Enginio/private/../../../../../src/enginio_client/enginioclient_p.h:293:5: error: QLinkedList does not name a type
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
src/enginio_client/enginioclient_p.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/enginio_client/enginioclient_p.h b/src/enginio_client/enginioclient_p.h
index 6b5dc53..f3fe68e 100644
--- a/src/enginio_client/enginioclient_p.h
+++ b/src/enginio_client/enginioclient_p.h
@@ -290,7 +290,11 @@ public:
QByteArray _backendId;
EnginioIdentity *_identity;
+#if defined(QT_NO_LINKED_LIST)
+ QList<QMetaObject::Connection> _connections;
+#else
QLinkedList<QMetaObject::Connection> _connections;
+#endif
QVarLengthArray<QMetaObject::Connection, 4> _identityConnections;
QUrl _serviceUrl;
QSharedPointer<QNetworkAccessManager> _networkManager;
--
2.26.0

View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_QT5ENGINIO
bool "qt5enginio"
depends on BR2_PACKAGE_QT5BASE_OPENSSL
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5BASE_NETWORK
help
@@ -14,13 +14,3 @@ config BR2_PACKAGE_QT5ENGINIO
5.6 and not recommended for new design.
http://doc.qt.io/archives/qt-5.5/enginio-index.html
# When Qt 5.6 is removed, replace the depends on
# BR2_PACKAGE_QT5BASE_OPENSSL above by a select BR2_PACKAGE_OPENSSL.
comment "qt5enginio needs libressl"
depends on BR2_PACKAGE_QT5_VERSION_5_6
depends on !BR2_PACKAGE_QT5BASE_OPENSSL
comment "qt5enginio needs openssl"
depends on BR2_PACKAGE_QT5_VERSION_LATEST
depends on !BR2_PACKAGE_QT5BASE_OPENSSL

View File

@@ -9,7 +9,7 @@
QT5ENGINIO_VERSION = 1.6.3
QT5ENGINIO_SITE = https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules
QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz
QT5ENGINIO_DEPENDENCIES = openssl qt5base
QT5ENGINIO_DEPENDENCIES = openssl
QT5ENGINIO_INSTALL_STAGING = YES
QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
@@ -22,40 +22,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5ENGINIO_DEPENDENCIES += qt5declarative
endif
define QT5ENGINIO_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
endef
define QT5ENGINIO_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
define QT5ENGINIO_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5ENGINIO_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/Enginio $(TARGET_DIR)/usr/qml/
endef
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
define QT5ENGINIO_INSTALL_TARGET_EXAMPLES
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/enginio $(TARGET_DIR)/usr/lib/qt/examples/
endef
endif
ifneq ($(BR2_STATIC_LIBS),y)
define QT5ENGINIO_INSTALL_TARGET_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libEnginio.so.* $(TARGET_DIR)/usr/lib
endef
endif
define QT5ENGINIO_INSTALL_TARGET_CMDS
$(QT5ENGINIO_INSTALL_TARGET_LIBS)
$(QT5ENGINIO_INSTALL_TARGET_QMLS)
$(QT5ENGINIO_INSTALL_TARGET_EXAMPLES)
endef
$(eval $(generic-package))
$(eval $(qmake-package))