5e72956199
This reverts commit 93004a8494,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.
124 lines
4.0 KiB
Diff
124 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 11 Jul 2019 13:01:41 +0200
|
|
Subject: [PATCH] Rework how the fdt command builds.
|
|
|
|
Trying to avoid all variants of:
|
|
cat syminfo.lst | sort | gawk -f ../../grub-core/genmoddep.awk > moddep.lst || (rm -f moddep.lst; exit 1)
|
|
grub_fdt_install in linux is not defined
|
|
grub_fdt_load in linux is not defined
|
|
grub_fdt_unload in linux is not defined
|
|
grub_fdt_install in xen_boot is not defined
|
|
grub_fdt_load in xen_boot is not defined
|
|
grub_fdt_unload in xen_boot is not defined
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
[javierm: Fix build with platform emu, aarch64, and risc-v]
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
---
|
|
grub-core/Makefile.core.def | 5 ++---
|
|
grub-core/lib/fdt.c | 2 --
|
|
grub-core/loader/efi/fdt.c | 2 ++
|
|
include/grub/fdt.h | 6 ++++++
|
|
grub-core/Makefile.am | 1 +
|
|
5 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
index c40170f2dd2..84a3d89de9a 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -177,7 +177,6 @@ kernel = {
|
|
arm_coreboot = kern/arm/coreboot/init.c;
|
|
arm_coreboot = kern/arm/coreboot/timer.c;
|
|
arm_coreboot = kern/arm/coreboot/coreboot.S;
|
|
- arm_coreboot = lib/fdt.c;
|
|
arm_coreboot = bus/fdt.c;
|
|
arm_coreboot = term/ps2.c;
|
|
arm_coreboot = term/arm/pl050.c;
|
|
@@ -351,6 +350,8 @@ kernel = {
|
|
riscv64 = kern/riscv/cache_flush.S;
|
|
riscv64 = kern/riscv/dl.c;
|
|
|
|
+ fdt = lib/fdt.c;
|
|
+
|
|
emu = disk/host.c;
|
|
emu = kern/emu/cache_s.S;
|
|
emu = kern/emu/hostdisk.c;
|
|
@@ -1825,7 +1826,6 @@ module = {
|
|
riscv32 = loader/riscv/linux.c;
|
|
riscv64 = loader/riscv/linux.c;
|
|
emu = loader/emu/linux.c;
|
|
- fdt = lib/fdt.c;
|
|
|
|
common = loader/linux.c;
|
|
common = lib/cmdline.c;
|
|
@@ -1836,7 +1836,6 @@ module = {
|
|
module = {
|
|
name = fdt;
|
|
efi = loader/efi/fdt.c;
|
|
- common = lib/fdt.c;
|
|
enable = fdt;
|
|
};
|
|
|
|
diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
|
|
index 0d371c5633e..37e04bd69e7 100644
|
|
--- a/grub-core/lib/fdt.c
|
|
+++ b/grub-core/lib/fdt.c
|
|
@@ -21,8 +21,6 @@
|
|
#include <grub/mm.h>
|
|
#include <grub/dl.h>
|
|
|
|
-GRUB_MOD_LICENSE ("GPLv3+");
|
|
-
|
|
#define FDT_SUPPORTED_VERSION 17
|
|
|
|
#define FDT_BEGIN_NODE 0x00000001
|
|
diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
|
|
index c86f283d756..c572415d38a 100644
|
|
--- a/grub-core/loader/efi/fdt.c
|
|
+++ b/grub-core/loader/efi/fdt.c
|
|
@@ -27,6 +27,8 @@
|
|
#include <grub/efi/memory.h>
|
|
#include <grub/cpu/efi/memory.h>
|
|
|
|
+GRUB_MOD_LICENSE ("GPLv3+");
|
|
+
|
|
static void *loaded_fdt;
|
|
static void *fdt;
|
|
|
|
diff --git a/include/grub/fdt.h b/include/grub/fdt.h
|
|
index e609c7e4111..3514aa4a5b6 100644
|
|
--- a/include/grub/fdt.h
|
|
+++ b/include/grub/fdt.h
|
|
@@ -19,6 +19,9 @@
|
|
#ifndef GRUB_FDT_HEADER
|
|
#define GRUB_FDT_HEADER 1
|
|
|
|
+#if !defined(GRUB_MACHINE_EMU) && \
|
|
+ (defined(__arm__) || defined(__aarch64__) || defined(__riscv))
|
|
+
|
|
#include <grub/types.h>
|
|
#include <grub/symbol.h>
|
|
|
|
@@ -144,4 +147,7 @@ int EXPORT_FUNC(grub_fdt_set_prop) (void *fdt, unsigned int nodeoffset, const ch
|
|
grub_fdt_set_prop ((fdt), (nodeoffset), "reg", reg_64, 16); \
|
|
})
|
|
|
|
+#endif /* !defined(GRUB_MACHINE_EMU) && \
|
|
+ (defined(__arm__) || defined(__aarch64__) || defined(__riscv)) */
|
|
+
|
|
#endif /* ! GRUB_FDT_HEADER */
|
|
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
|
|
index f512573c0da..dd49939aaa9 100644
|
|
--- a/grub-core/Makefile.am
|
|
+++ b/grub-core/Makefile.am
|
|
@@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
|
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
|
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
|
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
|
|
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdt.h
|
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
|
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
|
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
|