mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 13:49:26 +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
103 lines
3.8 KiB
Diff
103 lines
3.8 KiB
Diff
From cc087b11462af9f971a2c090d07e8d780a867b50 Mon Sep 17 00:00:00 2001
|
|
From: Kairui Song <kasong@redhat.com>
|
|
Date: Wed, 29 Jan 2020 13:38:19 +0800
|
|
Subject: kexec-tools: Remove duplicated variable declarations
|
|
|
|
When building kexec-tools for Fedora 32, following error is observed:
|
|
|
|
/usr/bin/ld: kexec/arch/x86_64/kexec-bzImage64.o:(.bss+0x0): multiple definition of `bzImage_support_efi_boot';
|
|
kexec/arch/i386/kexec-bzImage.o:(.bss+0x0): first defined here
|
|
|
|
/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm/../../fs2dt.h:33: multiple definition of `my_debug';
|
|
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/kexec/fs2dt.h:33: first defined here
|
|
|
|
/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:68: multiple definition of `arm64_mem';
|
|
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:68: first defined here
|
|
|
|
/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:54: multiple definition of `initrd_size';
|
|
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:54: first defined here
|
|
|
|
/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:53: multiple definition of `initrd_base';
|
|
kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:53: first defined here
|
|
|
|
And apparently, these variables are wrongly declared multiple times. So
|
|
remove duplicated declaration.
|
|
|
|
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
[Retrieved from:
|
|
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=cc087b11462af9f971a2c090d07e8d780a867b50]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
kexec/arch/arm64/kexec-arm64.h | 6 +++---
|
|
kexec/arch/ppc64/kexec-elf-ppc64.c | 2 --
|
|
kexec/arch/x86_64/kexec-bzImage64.c | 1 -
|
|
kexec/fs2dt.h | 2 +-
|
|
4 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/kexec/arch/arm64/kexec-arm64.h b/kexec/arch/arm64/kexec-arm64.h
|
|
index 628de79..ed447ac 100644
|
|
--- a/kexec/arch/arm64/kexec-arm64.h
|
|
+++ b/kexec/arch/arm64/kexec-arm64.h
|
|
@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **argv, const char *kernel_buf,
|
|
void zImage_arm64_usage(void);
|
|
|
|
|
|
-off_t initrd_base;
|
|
-off_t initrd_size;
|
|
+extern off_t initrd_base;
|
|
+extern off_t initrd_size;
|
|
|
|
/**
|
|
* struct arm64_mem - Memory layout info.
|
|
@@ -65,7 +65,7 @@ struct arm64_mem {
|
|
};
|
|
|
|
#define arm64_mem_ngv UINT64_MAX
|
|
-struct arm64_mem arm64_mem;
|
|
+extern struct arm64_mem arm64_mem;
|
|
|
|
uint64_t get_phys_offset(void);
|
|
uint64_t get_vp_offset(void);
|
|
diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c
|
|
index 3510b70..695b8b0 100644
|
|
--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
|
|
+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
|
|
@@ -44,8 +44,6 @@
|
|
uint64_t initrd_base, initrd_size;
|
|
unsigned char reuse_initrd = 0;
|
|
const char *ramdisk;
|
|
-/* Used for enabling printing message from purgatory code */
|
|
-int my_debug = 0;
|
|
|
|
int elf_ppc64_probe(const char *buf, off_t len)
|
|
{
|
|
diff --git a/kexec/arch/x86_64/kexec-bzImage64.c b/kexec/arch/x86_64/kexec-bzImage64.c
|
|
index 8edb3e4..ba8dc48 100644
|
|
--- a/kexec/arch/x86_64/kexec-bzImage64.c
|
|
+++ b/kexec/arch/x86_64/kexec-bzImage64.c
|
|
@@ -42,7 +42,6 @@
|
|
#include <arch/options.h>
|
|
|
|
static const int probe_debug = 0;
|
|
-int bzImage_support_efi_boot;
|
|
|
|
int bzImage64_probe(const char *buf, off_t len)
|
|
{
|
|
diff --git a/kexec/fs2dt.h b/kexec/fs2dt.h
|
|
index 7633273..fe24931 100644
|
|
--- a/kexec/fs2dt.h
|
|
+++ b/kexec/fs2dt.h
|
|
@@ -30,7 +30,7 @@ extern struct bootblock bb[1];
|
|
|
|
/* Used for enabling printing message from purgatory code
|
|
* Only has implemented for PPC64 */
|
|
-int my_debug;
|
|
+extern int my_debug;
|
|
extern int dt_no_old_root;
|
|
|
|
void reserve(unsigned long long where, unsigned long long length);
|
|
--
|
|
cgit 1.2.3-1.el7
|
|
|