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:
Stefan Agner
@@ -1,55 +0,0 @@
|
||||
From eb47c07e9d20e0b1a6cc4b0df26f24f22f024f1c Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Mon, 10 Nov 2014 11:44:55 +0300
|
||||
Subject: [PATCH] Fix various minor issues with rt-tests build system
|
||||
|
||||
The issues fixed are :
|
||||
|
||||
* Remove the automatic NUMA detection from the host
|
||||
architecture. This is broken when doing cross-compilation. One can
|
||||
still set NUMA=1 if NUMA support is desired.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Cc: Peter Korsgaard <peter@korsgaard.com>
|
||||
[Romain:
|
||||
rebase on v1.0
|
||||
Remove HASPYTHON since PYLIB can be overriden from the environment]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
Makefile | 19 -------------------
|
||||
1 file changed, 19 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a54d82b..0946f93 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -38,25 +38,6 @@ else
|
||||
CFLAGS += -O0 -g
|
||||
endif
|
||||
|
||||
-# We make some gueses on how to compile rt-tests based on the machine type
|
||||
-# and the ostype. These can often be overridden.
|
||||
-dumpmachine := $(shell $(CC) -dumpmachine)
|
||||
-
|
||||
-# The ostype is typically something like linux or android
|
||||
-ostype := $(lastword $(subst -, ,$(dumpmachine)))
|
||||
-
|
||||
-machinetype := $(shell echo $(dumpmachine)| \
|
||||
- sed -e 's/-.*//' -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/')
|
||||
-
|
||||
-# The default is to assume you have libnuma installed, which is fine to do
|
||||
-# even on non-numa machines. If you don't want to install the numa libs, for
|
||||
-# example, they might not be available in an embedded environment, then
|
||||
-# compile with
|
||||
-# make NUMA=0
|
||||
-ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),)
|
||||
-NUMA := 1
|
||||
-endif
|
||||
-
|
||||
# The default is to assume that you have numa_parse_cpustring_all
|
||||
# If you have an older version of libnuma that only has numa_parse_cpustring
|
||||
# then compile with
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From 165b597e3003c6870f5980e8902014d9344e6cf3 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Xu <peterx@redhat.com>
|
||||
Date: Thu, 1 Oct 2020 14:47:26 -0400
|
||||
Subject: [PATCH] rt-tests: oslat: Allow build for not supported archs
|
||||
|
||||
Now rt-tests won't build for archs other than x86/i386/ppc64 after oslat is
|
||||
merged. Instead of failing the build, let's make it pass. However, whenever
|
||||
oslat is executed, instead of running the real program, dump an error message,
|
||||
so that people can try to implement the frc() function for it when there's a
|
||||
real need for the new arch.
|
||||
|
||||
Signed-off-by: Peter Xu <peterx@redhat.com>
|
||||
Signed-off-by: John Kacur <jkacur@redhat.com>
|
||||
|
||||
[Taken from:
|
||||
https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/commit/src/oslat/oslat.c?h=unstable/devel/latest&id=165b597e3003c6870f5980e8902014d9344e6cf3]
|
||||
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
---
|
||||
src/oslat/oslat.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c
|
||||
index f1a82f2..a8b6155 100644
|
||||
--- a/src/oslat/oslat.c
|
||||
+++ b/src/oslat/oslat.c
|
||||
@@ -69,7 +69,9 @@ static inline void frc(uint64_t *pval)
|
||||
__asm__ __volatile__("mfspr %0, 268\n" : "=r" (*pval));
|
||||
}
|
||||
# else
|
||||
-# error Need frc() for this platform.
|
||||
+# define relax() do { } while (0)
|
||||
+# define frc(x)
|
||||
+# define FRC_MISSING
|
||||
# endif
|
||||
#else
|
||||
# error Need to add support for this compiler.
|
||||
@@ -810,6 +812,12 @@ int main(int argc, char *argv[])
|
||||
int i, n_cores;
|
||||
cpu_set_t cpu_set;
|
||||
|
||||
+#ifdef FRC_MISSING
|
||||
+ printf("This architecture is not yet supported. "
|
||||
+ "Please implement frc() function first for %s.\n", argv[0]);
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
CPU_ZERO(&cpu_set);
|
||||
|
||||
g.app_name = argv[0];
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From 53c7e8bc75f0f27752309ddae49e8d3b867a7681 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Mon, 15 Aug 2016 18:20:47 +0200
|
||||
Subject: [PATCH] Add syscall-number for sched_(gs)etattr() for SH4
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
src/include/rt-sched.h | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h
|
||||
index 679c4bd..83394c6 100644
|
||||
--- a/src/include/rt-sched.h
|
||||
+++ b/src/include/rt-sched.h
|
||||
@@ -51,6 +51,16 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+/* SCHED_DEADLINE available on sh4 since kernel 4.8 */
|
||||
+#ifdef __SH4__
|
||||
+#ifndef __NR_sched_setattr
|
||||
+#define __NR_sched_setattr 370
|
||||
+#endif
|
||||
+#ifndef __NR_sched_getattr
|
||||
+#define __NR_sched_getattr 369
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
#ifdef __tilegx__
|
||||
#define __NR_sched_setattr 274
|
||||
#define __NR_sched_getattr 275
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -5,6 +5,8 @@ config BR2_PACKAGE_RT_TESTS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS # dlopen
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # cyclictest
|
||||
depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_NUMACTL
|
||||
help
|
||||
Set of utilities for testing the real-time behaviour of a
|
||||
Linux system.
|
||||
@@ -21,7 +23,7 @@ config BR2_PACKAGE_RT_TESTS
|
||||
case with uClibc toolchains, since the thread implementation
|
||||
is configurable).
|
||||
|
||||
http://rt.wiki.kernel.org
|
||||
https://wiki.linuxfoundation.org/realtime/documentation/howto/tools/rt-tests
|
||||
|
||||
comment "rt-tests may not work on MIPS with an external uClibc toolchain"
|
||||
depends on BR2_PACKAGE_RT_TESTS
|
||||
@@ -32,3 +34,4 @@ comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, headers >= 3.14, dy
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|
||||
|| BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc
|
||||
sha256 611c5a2b02964ab778e037ae16402e8d1cb8456628c7ca38d85a7548f33e52e3 rt-tests-1.9.tar.xz
|
||||
# locally computed hash
|
||||
sha256 bcb94448324116f29c248b14a6051c7ab72a0135234e714685a2a3a3e7d531f8 rt-tests-1.6.tar.xz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
|
||||
@@ -6,13 +6,10 @@
|
||||
|
||||
RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests
|
||||
RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz
|
||||
RT_TESTS_VERSION = 1.6
|
||||
RT_TESTS_VERSION = 1.9
|
||||
RT_TESTS_LICENSE = GPL-2.0+
|
||||
RT_TESTS_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||
RT_TESTS_DEPENDENCIES = python3
|
||||
endif
|
||||
RT_TESTS_DEPENDENCIES = numactl
|
||||
|
||||
define RT_TESTS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
|
||||
Reference in New Issue
Block a user