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,81 +0,0 @@
|
||||
From 6fea0a8e33760258c4baa5d0a6f3a145897427fe Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Tue, 3 Sep 2019 14:01:39 +0200
|
||||
Subject: [PATCH] localedef: Use initializer for flexible array member [BZ
|
||||
#24950]
|
||||
|
||||
struct charseq used a zero-length array instead of a flexible array
|
||||
member. This required a strange construct to initialize struct
|
||||
charseq objects, and GCC 10 warns about that:
|
||||
|
||||
cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
|
||||
In file included from programs/repertoire.h:24,
|
||||
from programs/localedef.h:32,
|
||||
from programs/ld-ctype.c:35:
|
||||
programs/charmap.h:63:17: note: destination object declared here
|
||||
63 | unsigned char bytes[0];
|
||||
| ^~~~~
|
||||
cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
|
||||
programs/charmap.h:63:17: note: destination object declared here
|
||||
cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
|
||||
programs/charmap.h:63:17: note: destination object declared here
|
||||
cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
|
||||
programs/charmap.h:63:17: note: destination object declared here
|
||||
|
||||
The change makes the object physically const, but it is not expected
|
||||
to be modified.
|
||||
|
||||
[Upstream: https://sourceware.org/git/?p=glibc.git;a=patch;h=1471fa556afb428c4a4c46cf5543a4101d5bcf91]
|
||||
[Dropped confliciting ChangeLog part]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
locale/programs/charmap.h | 2 +-
|
||||
locale/programs/ld-ctype.c | 12 ++++++------
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h
|
||||
index 870a9e95..70db330d 100644
|
||||
--- a/locale/programs/charmap.h
|
||||
+++ b/locale/programs/charmap.h
|
||||
@@ -60,7 +60,7 @@ struct charseq
|
||||
const char *name;
|
||||
uint32_t ucs4;
|
||||
int nbytes;
|
||||
- unsigned char bytes[0];
|
||||
+ unsigned char bytes[];
|
||||
};
|
||||
|
||||
|
||||
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
|
||||
index cfc9c43f..9123f64a 100644
|
||||
--- a/locale/programs/ld-ctype.c
|
||||
+++ b/locale/programs/ld-ctype.c
|
||||
@@ -842,8 +842,6 @@ no input digits defined and none of the standard names in the charmap"));
|
||||
for (cnt = 0; cnt < 10; ++cnt)
|
||||
if (ctype->mboutdigits[cnt] == NULL)
|
||||
{
|
||||
- static struct charseq replace[2];
|
||||
-
|
||||
if (!warned)
|
||||
{
|
||||
record_error (0, 0, _("\
|
||||
@@ -851,10 +849,12 @@ not all characters used in `outdigit' are available in the charmap"));
|
||||
warned = 1;
|
||||
}
|
||||
|
||||
- replace[0].nbytes = 1;
|
||||
- replace[0].bytes[0] = '?';
|
||||
- replace[0].bytes[1] = '\0';
|
||||
- ctype->mboutdigits[cnt] = &replace[0];
|
||||
+ static const struct charseq replace =
|
||||
+ {
|
||||
+ .nbytes = 1,
|
||||
+ .bytes = "?",
|
||||
+ };
|
||||
+ ctype->mboutdigits[cnt] = (struct charseq *) &replace;
|
||||
}
|
||||
|
||||
warned = 0;
|
||||
--
|
||||
2.26.0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Locally calculated (fetched from Github)
|
||||
sha256 4462f56696332efbc5b0c2f86d7aa75a2a02c3d44bc4345fa42b5bab1225de5c glibc-2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427.tar.gz
|
||||
sha256 e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176 glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz
|
||||
|
||||
# Hashes for license files
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES
|
||||
sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES
|
||||
@@ -7,7 +7,7 @@
|
||||
# Use the same VERSION and SITE as target glibc
|
||||
# As in glibc.mk, generate version string using:
|
||||
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
|
||||
LOCALEDEF_VERSION = 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427
|
||||
LOCALEDEF_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d
|
||||
LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
|
||||
LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
|
||||
HOST_LOCALEDEF_DL_SUBDIR = glibc
|
||||
|
||||
Reference in New Issue
Block a user