a0871be6c0
* 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
58 lines
2.6 KiB
Diff
58 lines
2.6 KiB
Diff
From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 26 Sep 2020 22:03:10 +0200
|
|
Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure
|
|
|
|
Rename user structure to bt_user to avoid the following build failure
|
|
with uclibc:
|
|
|
|
test_trace_ir_ref.c:41:8: error: redefinition of 'struct user'
|
|
struct user {
|
|
^
|
|
In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33,
|
|
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25,
|
|
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329,
|
|
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36,
|
|
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34,
|
|
from ../../src/common/assert.h:28,
|
|
from ../../src/lib/object.h:28,
|
|
from test_trace_ir_ref.c:25:
|
|
/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here
|
|
struct user
|
|
^~~~
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/efficios/babeltrace/pull/115]
|
|
---
|
|
tests/lib/test_trace_ir_ref.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c
|
|
index d5dfa9cf..70caf29c 100644
|
|
--- a/tests/lib/test_trace_ir_ref.c
|
|
+++ b/tests/lib/test_trace_ir_ref.c
|
|
@@ -25,7 +25,7 @@
|
|
|
|
#define NR_TESTS 37
|
|
|
|
-struct user {
|
|
+struct bt_user {
|
|
bt_trace_class *tc;
|
|
bt_stream_class *sc;
|
|
bt_event_class *ec;
|
|
@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp)
|
|
bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL;
|
|
bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL,
|
|
*weak_ec3 = NULL;
|
|
- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 };
|
|
+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 };
|
|
|
|
/* The only reference which exists at this point is on TC1. */
|
|
tc1 = create_tc1(self_comp);
|
|
--
|
|
2.28.0
|
|
|