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>
69 lines
2.0 KiB
Diff
69 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 14 Jan 2014 13:12:23 -0500
|
|
Subject: [PATCH] Add devicetree loading
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
|
Switch to use APM Mustang device tree, for hardware testing.
|
|
|
|
Signed-off-by: David A. Marlin <d.marlin@redhat.com>
|
|
|
|
Use the default device tree from the grub default file
|
|
|
|
instead of hardcoding a value.
|
|
|
|
Signed-off-by: David A. Marlin <dmarlin@redhat.com>
|
|
---
|
|
util/grub-mkconfig.in | 3 ++-
|
|
util/grub.d/10_linux.in | 15 +++++++++++++++
|
|
2 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
index 9ecbcfb5b43..c645351dd2a 100644
|
|
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -254,7 +254,8 @@ export GRUB_DEFAULT \
|
|
GRUB_ENABLE_CRYPTODISK \
|
|
GRUB_BADRAM \
|
|
GRUB_OS_PROBER_SKIP_LIST \
|
|
- GRUB_DISABLE_SUBMENU
|
|
+ GRUB_DISABLE_SUBMENU \
|
|
+ GRUB_DEFAULT_DTB
|
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
rm -f "${grub_cfg}.new"
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index 58defdbd83f..dd3128440c4 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -153,6 +153,13 @@ EOF
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
echo '$(echo "$message" | grub_quote)'
|
|
initrd $(echo $initrd_path)
|
|
+EOF
|
|
+ fi
|
|
+ if test -n "${fdt}" ; then
|
|
+ message="$(gettext_printf "Loading fdt ...")"
|
|
+ sed "s/^/$submenu_indentation/" << EOF
|
|
+ echo '$(echo "$message" | grub_quote)'
|
|
+ devicetree ${rel_dirname}/${fdt}
|
|
EOF
|
|
fi
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
@@ -236,6 +243,14 @@ while [ "x$list" != "x" ] ; do
|
|
gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
|
|
fi
|
|
|
|
+ fdt=
|
|
+ for i in "dtb-${version}" "dtb-${alt_version}"; do
|
|
+ if test -f "${dirname}/${i}/${GRUB_DEFAULT_DTB}" ; then
|
|
+ fdt="${i}/${GRUB_DEFAULT_DTB}"
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
+
|
|
config=
|
|
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
if test -e "${i}" ; then
|