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:
@@ -1,7 +1,6 @@
|
||||
config BR2_PACKAGE_QT5SCRIPT
|
||||
bool "qt5script"
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
select BR2_PACKAGE_QT5BASE
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
|
||||
@@ -1,16 +1,10 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist
|
||||
sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz
|
||||
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtscript-everywhere-src-5.12.8.tar.xz.sha256
|
||||
sha256 c8c13582bab8562792fab29f574768ef9fb2cdd232c102228cc511dbfc4b1097 qtscript-everywhere-src-5.12.8.tar.xz
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscript-everywhere-src-5.15.1.tar.xz.sha256
|
||||
sha256 0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca qtscript-everywhere-src-5.15.1.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
|
||||
sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
|
||||
sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
|
||||
sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
|
||||
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
|
||||
sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB
|
||||
sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING
|
||||
|
||||
@@ -7,53 +7,18 @@
|
||||
QT5SCRIPT_VERSION = $(QT5_VERSION)
|
||||
QT5SCRIPT_SITE = $(QT5_SITE)
|
||||
QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz
|
||||
QT5SCRIPT_DEPENDENCIES = qt5base
|
||||
QT5SCRIPT_INSTALL_STAGING = YES
|
||||
|
||||
# JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+.
|
||||
# This is linked into libQt5Script, which also contains Qt sources under
|
||||
# LGPL-2.1 (only). Therefore, the library is LGPL-2.1 and BSD-3-Clause.
|
||||
# libQt5ScriptTools is under the normal Qt opensource license.
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs)
|
||||
# LGPL-2.1 license file is missing
|
||||
QT5SCRIPT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
|
||||
else
|
||||
QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs)
|
||||
QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL
|
||||
endif
|
||||
# License files from JavaScriptCore
|
||||
QT5SCRIPT_LICENSE_FILES += \
|
||||
src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \
|
||||
src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING
|
||||
|
||||
define QT5SCRIPT_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
|
||||
endef
|
||||
|
||||
define QT5SCRIPT_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define QT5SCRIPT_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
define QT5SCRIPT_INSTALL_TARGET_LIBS
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Script*.so.* $(TARGET_DIR)/usr/lib
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
|
||||
define QT5SCRIPT_INSTALL_TARGET_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/script $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5SCRIPT_INSTALL_TARGET_CMDS
|
||||
$(QT5SCRIPT_INSTALL_TARGET_LIBS)
|
||||
$(QT5SCRIPT_INSTALL_TARGET_EXAMPLES)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(qmake-package))
|
||||
|
||||
Reference in New Issue
Block a user