mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 06:22:43 +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>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mark Salter <msalter@redhat.com>
|
|
Date: Mon, 17 Apr 2017 08:44:29 -0400
|
|
Subject: [PATCH] arm64: make sure fdt has #address-cells and #size-cells
|
|
properties
|
|
|
|
Recent upstream changes to kexec-tools relies on #address-cells
|
|
and #size-cells properties in the FDT. If grub2 needs to create
|
|
a chosen node, it is likely because firmware did not provide one.
|
|
In that case, set #address-cells and #size-cells properties to
|
|
make sure they exist.
|
|
---
|
|
grub-core/loader/arm64/linux.c | 16 +++++++++++++++-
|
|
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
|
index 04994d5c67d..4c0a09c06de 100644
|
|
--- a/grub-core/loader/arm64/linux.c
|
|
+++ b/grub-core/loader/arm64/linux.c
|
|
@@ -81,7 +81,21 @@ finalize_params_linux (void)
|
|
|
|
node = grub_fdt_find_subnode (fdt, 0, "chosen");
|
|
if (node < 0)
|
|
- node = grub_fdt_add_subnode (fdt, 0, "chosen");
|
|
+ {
|
|
+ /*
|
|
+ * If we have to create a chosen node, Make sure we
|
|
+ * have #address-cells and #size-cells properties.
|
|
+ */
|
|
+ retval = grub_fdt_set_prop32(fdt, 0, "#address-cells", 2);
|
|
+ if (retval)
|
|
+ goto failure;
|
|
+
|
|
+ retval = grub_fdt_set_prop32(fdt, 0, "#size-cells", 2);
|
|
+ if (retval)
|
|
+ goto failure;
|
|
+
|
|
+ node = grub_fdt_add_subnode (fdt, 0, "chosen");
|
|
+ }
|
|
|
|
if (node < 1)
|
|
goto failure;
|