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:
@@ -5,6 +5,7 @@ config BR2_PACKAGE_WIRESHARK
|
||||
depends on BR2_USE_MMU # fork(), glib2
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
||||
select BR2_PACKAGE_C_ARES
|
||||
select BR2_PACKAGE_LIBPCAP
|
||||
select BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
@@ -20,12 +21,12 @@ config BR2_PACKAGE_WIRESHARK_GUI
|
||||
bool "Qt5 GUI"
|
||||
default y
|
||||
depends on BR2_INSTALL_LIBSTDCPP # qt5
|
||||
depends on BR2_HOST_GCC_AT_LEAST_5 # qt5
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qt5
|
||||
depends on !BR2_arc # qt5
|
||||
depends on BR2_PACKAGE_HAS_UDEV # qt5 input
|
||||
select BR2_PACKAGE_QT5
|
||||
select BR2_PACKAGE_QT5BASE
|
||||
select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime
|
||||
select BR2_PACKAGE_QT5BASE_PNG # runtime
|
||||
select BR2_PACKAGE_QT5BASE_WIDGETS
|
||||
@@ -36,10 +37,11 @@ config BR2_PACKAGE_WIRESHARK_GUI
|
||||
help
|
||||
Enable Qt5 GUI
|
||||
|
||||
comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8"
|
||||
comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, host gcc >= 5.0, gcc >= 5.0"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_5
|
||||
|
||||
endif # BR2_PACKAGE_WIRESHARK
|
||||
|
||||
|
||||
Reference in New Issue
Block a user