!4 Fix live-iso creation on aarch64

Merge pull request !4 from t.feng/master

backport-Fix-live-iso-creation-on-aarch64.patch

@@ -0,0 +1,30 @@
+From 5dcb100b5edb443e7d39a1635a5a9aca191d2b18 Mon Sep 17 00:00:00 2001
+From: fengtao <fengtao40@huawei.com>
+Date: Mon, 24 Feb 2020 11:07:16 +0800
+Subject: [PATCH] Fix live-iso creation on aarch64
+
+---
+ share/templates.d/99-generic/live/aarch64.tmpl | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/share/templates.d/99-generic/live/aarch64.tmpl b/share/templates.d/99-generic/live/aarch64.tmpl
+index 532b242..969c0df 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}
+-- 
+1.8.3.1
+

lorax.spec

@@ -3,7 +3,7 @@
 
 Name:           lorax
 Version:        29.16
-Release:        8
+Release:        9
 Summary:        A set of tools used to create bootable images
 License:        GPLv2+
 URL:            https://github.com/weldr/lorax
@@ -21,6 +21,8 @@ Patch9008:      lorax-enable-GUI-installation.patch
 Patch9009:      lorax-enable-anaconda-KdumpSpoke.patch
 Patch9010:      lorax-delete-udisk2-iscsi.patch
 
+Patch6000:      backport-Fix-live-iso-creation-on-aarch64.patch
+
 BuildRequires:  python3-devel python3-sphinx_rtd_theme python3-magic 
 BuildRequires:  python3-nose python3-pytest-mock python3-pocketlint python3-gevent
 BuildRequires:  python3-mock python3-urllib3 python3-dnf python3-librepo 
@@ -117,6 +119,7 @@ build images, etc. from the command line.
 %patch9008 -p1
 %patch9009 -p1
 %patch9010 -p1
+%patch6000 -p1
 %endif
 
 %build
@@ -193,6 +196,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Feb 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.16-9
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:Fix live-iso creation on aarch64
+
 * Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.16-8
 - Type:bugfix
 - Id:NA