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
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
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
|
|
|