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:
@@ -18,7 +18,7 @@ diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
|
||||
index 71a6b7b..d09d029 100644
|
||||
--- a/glib/gthread-posix.c
|
||||
+++ b/glib/gthread-posix.c
|
||||
@@ -68,7 +68,7 @@
|
||||
@@ -73,7 +73,7 @@
|
||||
#endif
|
||||
|
||||
/* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/meson.build b/meson.build
|
||||
index 99806d0..3206603 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -77,7 +77,7 @@ installed_tests_template = files('template.test.in')
|
||||
@@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in')
|
||||
installed_tests_template_tap = files('template-tap.test.in')
|
||||
|
||||
# Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)
|
||||
|
||||
@@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644
|
||||
@@ -1,4 +1,4 @@
|
||||
-project('glib', 'c', 'cpp',
|
||||
+project('glib', 'c',
|
||||
version : '2.62.5',
|
||||
version : '2.64.4',
|
||||
# NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
|
||||
meson_version : '>= 0.49.2',
|
||||
@@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
|
||||
@@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644
|
||||
|
||||
cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
|
||||
|
||||
@@ -1484,20 +1483,6 @@ if g_have_iso_c_varargs
|
||||
@@ -1548,20 +1547,6 @@ if g_have_iso_c_varargs
|
||||
#endif''')
|
||||
endif
|
||||
|
||||
@@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644
|
||||
g_have_gnuc_varargs = cc.compiles('''
|
||||
void some_func (void) {
|
||||
int a(int p1, int p2, int p3);
|
||||
@@ -2095,7 +2080,6 @@ subdir('gobject')
|
||||
@@ -2167,7 +2152,6 @@ subdir('gobject')
|
||||
subdir('gthread')
|
||||
subdir('gmodule')
|
||||
subdir('gio')
|
||||
@@ -79,7 +79,7 @@ diff --git a/tests/meson.build b/tests/meson.build
|
||||
index e4ea226..7fd974c 100644
|
||||
--- a/tests/meson.build
|
||||
+++ b/tests/meson.build
|
||||
@@ -56,11 +56,6 @@ tests = {
|
||||
@@ -55,11 +55,6 @@ tests = {
|
||||
'source': 'module-test.c',
|
||||
'c_args': ['-DMODULE_TYPE="plugin"'],
|
||||
},
|
||||
|
||||
@@ -15,7 +15,7 @@ diff --git a/meson.build b/meson.build
|
||||
index 3c615b7..7cae4e8 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -366,6 +366,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
|
||||
@@ -372,6 +372,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
|
||||
'-Wno-cast-function-type',
|
||||
+ '-Wno-format-nonliteral',
|
||||
# Due to function casts through (void*) we cannot support -Wpedantic:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# https://download.gnome.org/sources/glib/2.62/glib-2.62.5.sha256sum
|
||||
sha256 b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e glib-2.62.5.tar.xz
|
||||
# https://download.gnome.org/sources/glib/2.64/glib-2.64.4.sha256sum
|
||||
sha256 f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50 glib-2.64.4.tar.xz
|
||||
# License files, locally calculated
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGLIB2_VERSION_MAJOR = 2.62
|
||||
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).5
|
||||
LIBGLIB2_VERSION_MAJOR = 2.64
|
||||
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
|
||||
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
|
||||
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
|
||||
LIBGLIB2_LICENSE = LGPL-2.1+
|
||||
@@ -85,10 +85,14 @@ endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
|
||||
LIBGLIB2_CONF_OPTS += -Dlibmount=true
|
||||
LIBGLIB2_DEPENDENCIES += util-linux
|
||||
LIBGLIB2_CONF_OPTS += -Dlibmount=enabled
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBS),y)
|
||||
LIBGLIB2_DEPENDENCIES += util-linux-libs
|
||||
else
|
||||
LIBGLIB2_CONF_OPTS += -Dlibmount=false
|
||||
LIBGLIB2_DEPENDENCIES += util-linux
|
||||
endif
|
||||
else
|
||||
LIBGLIB2_CONF_OPTS += -Dlibmount=disabled
|
||||
endif
|
||||
|
||||
# Purge useless binaries from target
|
||||
|
||||
Reference in New Issue
Block a user