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,66 +0,0 @@
|
||||
From 15f62343916fcb3cae82e618da28eaa82bc8c007 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Francis <alistair.francis@wdc.com>
|
||||
Date: Tue, 16 Apr 2019 09:03:41 -0700
|
||||
Subject: [PATCH] Revert "riscv: Use latest system call ABI"
|
||||
|
||||
This reverts commit d4c08b9776b392e20efc6198ebe1bc8ec1911d9b.
|
||||
|
||||
The latest RISC-V 32bit glibc submission doesn't work with this patch,
|
||||
so let's revert it. This revert can be reverted when the glibc
|
||||
submission is updated to work on the 5.1 kernel.
|
||||
|
||||
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||
---
|
||||
arch/riscv/Kconfig | 1 +
|
||||
arch/riscv/include/uapi/asm/unistd.h | 5 ++++-
|
||||
arch/riscv/kernel/vdso/Makefile | 2 --
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
|
||||
index eb56c82d8aa1..43dd2680c696 100644
|
||||
--- a/arch/riscv/Kconfig
|
||||
+++ b/arch/riscv/Kconfig
|
||||
@@ -11,6 +11,7 @@ config 32BIT
|
||||
|
||||
config RISCV
|
||||
def_bool y
|
||||
+ select ARCH_32BIT_OFF_T if !64BIT
|
||||
# even on 32-bit, physical (and DMA) addresses are > 32-bits
|
||||
select PHYS_ADDR_T_64BIT
|
||||
select OF
|
||||
diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h
|
||||
index 0e2eeeb1fd27..486a288b454c 100644
|
||||
--- a/arch/riscv/include/uapi/asm/unistd.h
|
||||
+++ b/arch/riscv/include/uapi/asm/unistd.h
|
||||
@@ -17,8 +17,11 @@
|
||||
|
||||
#ifdef __LP64__
|
||||
#define __ARCH_WANT_NEW_STAT
|
||||
-#define __ARCH_WANT_SET_GET_RLIMIT
|
||||
#endif /* __LP64__ */
|
||||
+#define __ARCH_WANT_SET_GET_RLIMIT
|
||||
+#ifndef __LP64__
|
||||
+#define __ARCH_WANT_TIME32_SYSCALLS
|
||||
+#endif
|
||||
|
||||
#include <asm-generic/unistd.h>
|
||||
|
||||
diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
|
||||
index fec62b24df89..eed1c137f618 100644
|
||||
--- a/arch/riscv/kernel/vdso/Makefile
|
||||
+++ b/arch/riscv/kernel/vdso/Makefile
|
||||
@@ -2,11 +2,9 @@
|
||||
|
||||
# Symbols present in the vdso
|
||||
vdso-syms = rt_sigreturn
|
||||
-ifdef CONFIG_64BIT
|
||||
vdso-syms += gettimeofday
|
||||
vdso-syms += clock_gettime
|
||||
vdso-syms += clock_getres
|
||||
-endif
|
||||
vdso-syms += getcpu
|
||||
vdso-syms += flush_icache
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Run Linux in emulation with:
|
||||
|
||||
qemu-system-riscv32 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80400000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic
|
||||
qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig
|
||||
|
||||
The login prompt will appear in the terminal that started Qemu.
|
||||
|
||||
Tested with QEMU 3.1
|
||||
|
||||
Reference in New Issue
Block a user