mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 21:59:27 +00:00
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
73 lines
3.2 KiB
Diff
73 lines
3.2 KiB
Diff
From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001
|
|
From: Chris Packham <chris.packham@alliedtelesis.co.nz>
|
|
Date: Mon, 18 Nov 2019 12:52:15 +1300
|
|
Subject: kexec: build multiboot2 for i386
|
|
|
|
This addresses the following compilation issues when building for i386.
|
|
|
|
kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'?
|
|
{ "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
|
|
^~~~~~~~~~~~~~~~~~~~
|
|
multiboot_x86_probe
|
|
kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'?
|
|
{ "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
|
|
^~~~~~~~~~~~~~~~~~~
|
|
multiboot_x86_load
|
|
kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'?
|
|
multiboot2_x86_usage },
|
|
^~~~~~~~~~~~~~~~~~~~
|
|
multiboot_x86_usage
|
|
make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1
|
|
make: *** Waiting for unfinished jobs....
|
|
|
|
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Retrieved from:
|
|
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615]
|
|
---
|
|
kexec/arch/i386/Makefile | 2 +-
|
|
kexec/arch/i386/kexec-x86.h | 5 +++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
|
|
index 105cefd..f486103 100644
|
|
--- a/kexec/arch/i386/Makefile
|
|
+++ b/kexec/arch/i386/Makefile
|
|
@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c
|
|
i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c
|
|
i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c
|
|
i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c
|
|
+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
|
|
i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
|
|
i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
|
|
i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
|
|
@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
|
|
|
|
dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
|
|
kexec/arch/i386/crashdump-x86.h \
|
|
- kexec/arch/i386/kexec-mb2-x86.c \
|
|
kexec/arch/i386/kexec-x86.h \
|
|
kexec/arch/i386/x86-linux-setup.h \
|
|
kexec/arch/i386/include/arch/options.h
|
|
diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
|
|
index 1b58c3b..0f941df 100644
|
|
--- a/kexec/arch/i386/kexec-x86.h
|
|
+++ b/kexec/arch/i386/kexec-x86.h
|
|
@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
|
|
struct kexec_info *info);
|
|
void multiboot_x86_usage(void);
|
|
|
|
+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
|
|
+ struct kexec_info *info);
|
|
+void multiboot2_x86_usage(void);
|
|
+int multiboot2_x86_probe(const char *buf, off_t buf_len);
|
|
+
|
|
int elf_x86_probe(const char *buf, off_t len);
|
|
int elf_x86_load(int argc, char **argv, const char *buf, off_t len,
|
|
struct kexec_info *info);
|
|
--
|
|
cgit 1.2-0.3.lf.el7
|
|
|