From 115bf6c17f3f091c60d3d4ac1a156485ec3e727b Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 19 Sep 2019 10:50:22 -0700
Subject: [PATCH] aarch64: Fix live-iso creation on aarch64

Drop unneeded uboot-tools, and remove iso-graft from the aarch64.tmpl

Resolves: rhbz#1752002
(cherry picked from commit 5efaa876e1c08f1cbb3d35bae88c73a5bc3a5048)
---
 share/templates.d/99-generic/live/aarch64.tmpl      | 7 -------
 share/templates.d/99-generic/live/live-install.tmpl | 1 -
 2 files changed, 8 deletions(-)

diff --git a/share/templates.d/99-generic/live/aarch64.tmpl b/share/templates.d/99-generic/live/aarch64.tmpl
index e35d6188..9ddd2d21 100644
--- a/share/templates.d/99-generic/live/aarch64.tmpl
+++ b/share/templates.d/99-generic/live/aarch64.tmpl
@@ -68,13 +68,6 @@ mkdir ${KERNELDIR}
     %endif
 %endfor
 
-# Inherit iso-graft/ if it exists from external templates
-<%
-    import os
-    if os.path.exists(workdir + "/iso-graft"):
-        filegraft += " " + workdir + "/iso-graft"
-%>
-
 # Add the license files
 %for f in glob("/usr/share/licenses/*-release/*"):
     install ${f} ${f|basename}
diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl
index 88abff59..d1acbdb0 100644
--- a/share/templates.d/99-generic/live/live-install.tmpl
+++ b/share/templates.d/99-generic/live/live-install.tmpl
@@ -5,7 +5,6 @@
 %if basearch == "aarch64":
     installpkg efibootmgr
     installpkg grub2-efi-aa64-cdboot shim-aa64
-    installpkg uboot-tools
 %endif
 %if basearch in ("arm", "armhfp"):
     installpkg efibootmgr