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:
@@ -12,15 +12,17 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
|
||||
|
||||
comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7"
|
||||
comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9"
|
||||
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
|
||||
depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_7
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_9
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
config BR2_PACKAGE_WEBKITGTK
|
||||
bool "webkitgtk"
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://webkitgtk.org/releases/webkitgtk-2.28.4.tar.xz.sums
|
||||
md5 10e0cce27208dfbd4cf63dd68a9a47d7 webkitgtk-2.28.4.tar.xz
|
||||
sha1 70e9dd80647b30eaaf8a7f5b30d8869cd1254056 webkitgtk-2.28.4.tar.xz
|
||||
sha256 821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464 webkitgtk-2.28.4.tar.xz
|
||||
# From https://webkitgtk.org/releases/webkitgtk-2.30.2.tar.xz.sums
|
||||
md5 2163f1f982c63cb8fa75bf1b36396304 webkitgtk-2.30.2.tar.xz
|
||||
sha1 e27d336570226645f861b5a00116c17da39f9df4 webkitgtk-2.30.2.tar.xz
|
||||
sha256 c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a webkitgtk-2.30.2.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WEBKITGTK_VERSION = 2.28.4
|
||||
WEBKITGTK_VERSION = 2.30.2
|
||||
WEBKITGTK_SITE = https://www.webkitgtk.org/releases
|
||||
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
|
||||
WEBKITGTK_INSTALL_STAGING = YES
|
||||
@@ -105,12 +105,17 @@ WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
|
||||
endif
|
||||
|
||||
# JIT is not supported for MIPS r6, but the WebKit build system does not
|
||||
# have a check for these processors. Disable JIT forcibly here and use
|
||||
# the CLoop interpreter instead.
|
||||
# have a check for these processors. The same goes for ARMv5 and ARMv6.
|
||||
# Disable JIT forcibly here and use the CLoop interpreter instead.
|
||||
#
|
||||
# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258
|
||||
ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
|
||||
WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON
|
||||
# Also, we have to disable the sampling profiler, which does NOT work
|
||||
# with ENABLE_C_LOOP.
|
||||
#
|
||||
# Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=172765
|
||||
#
|
||||
ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
|
||||
WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user