mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
118 lines
3.7 KiB
Diff
118 lines
3.7 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>
|
|
---
|
|
grub-core/Makefile.core.def | 5 ++---
|
|
grub-core/lib/fdt.c | 2 --
|
|
grub-core/loader/efi/fdt.c | 2 ++
|
|
include/grub/fdt.h | 4 ++++
|
|
grub-core/Makefile.am | 1 +
|
|
5 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
index 48491b50683..556adca7074 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -175,7 +175,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;
|
|
@@ -348,6 +347,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;
|
|
@@ -1801,7 +1802,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;
|
|
@@ -1812,7 +1812,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 ee9c5592c70..37ca407bb36 100644
|
|
--- a/grub-core/loader/efi/fdt.c
|
|
+++ b/grub-core/loader/efi/fdt.c
|
|
@@ -26,6 +26,8 @@
|
|
#include <grub/efi/fdtload.h>
|
|
#include <grub/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..22b7c5463fc 100644
|
|
--- a/include/grub/fdt.h
|
|
+++ b/include/grub/fdt.h
|
|
@@ -19,6 +19,8 @@
|
|
#ifndef GRUB_FDT_HEADER
|
|
#define GRUB_FDT_HEADER 1
|
|
|
|
+#if defined(__arm__) || defined(__aarch64__)
|
|
+
|
|
#include <grub/types.h>
|
|
#include <grub/symbol.h>
|
|
|
|
@@ -144,4 +146,6 @@ 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(__arm__) || defined(__aarch64__) */
|
|
+
|
|
#endif /* ! GRUB_FDT_HEADER */
|
|
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
|
|
index d9ad30052f1..ee9c4e4eb88 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
|