From 761c7e3dd8834d2fed06d4f93e61d20a8851808e Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 28 Oct 2020 20:00:35 -0400
Subject: [PATCH] Replace ppc64le template with upstream version

Fixes failure to build ppc64le ISO images.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 80-rhel/ppc64le.tmpl      | 28 ++++++++++++----------------
 lorax-templates-rhel.spec |  5 ++++-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/80-rhel/ppc64le.tmpl b/80-rhel/ppc64le.tmpl
index 0c2c0d1..dc03c09 100644
--- a/80-rhel/ppc64le.tmpl
+++ b/80-rhel/ppc64le.tmpl
@@ -12,17 +12,15 @@ def valid_label(ch):
 
 isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
 
+import os
 from os.path import basename
-%>
+from pylorax.sysutils import joinpaths
 
-## Test ${runtime_img} to see if udf is needed
-<%
-    import os
-    from pylorax.sysutils import joinpaths
-    if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
-        udfargs = "-allow-limited-size"
-    else:
-        udfargs = ""
+# Test the runtime_img, if it is > 4GiB we need to set -iso-level to 3
+if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
+    isoargs = "-iso-level 3"
+else:
+    isoargs = ""
 %>
 
 mkdir images
@@ -49,8 +47,6 @@ replace @PRODUCT@ '${product.name}'  ${GRUBDIR}/grub.cfg
 replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg
 replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUBDIR}/grub.cfg
 
-install ${configdir}/mapping ${BOOTDIR}
-
 ## Install kernel and bootloader config (in separate places for each arch)
 %for kernel in kernels:
     <%
@@ -90,14 +86,14 @@ install ${configdir}/mapping ${BOOTDIR}
 %endfor
 
 ## make boot.iso
-runcmd mkisofs -v -U -J -R -T \
+runcmd xorrisofs -v -U -J -R ${isoargs} \
         -o ${outroot}/images/boot.iso \
-        -part -hfs -r -l -sysid PPC \
+        -r -l -sysid PPC \
         -A "${product.name} ${product.version}" -V '${isolabel}' \
         -volset "${product.version}" -volset-size 1 -volset-seqno 1 \
-        -hfs-volid ${product.version} \
-        -chrp-boot -map ${inroot}/${configdir}/mapping \
-        -no-desktop -allow-multidot ${udfargs} -graft-points \
+        -chrp-boot \
+        -graft-points \
+        .discinfo=${outroot}/.discinfo \
         ${BOOTDIR}=${outroot}/${BOOTDIR} \
         ${GRUBDIR}=${outroot}/${GRUBDIR} \
         ${STAGE2IMG}=${outroot}/${STAGE2IMG} ${filegraft}
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index e153b50..fdf328c 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,6 +1,6 @@
 Name:           lorax-templates-rhel
 Version:        9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RHEL8 build templates for lorax and livemedia-creator
 
 License:        GPLv2+
@@ -31,6 +31,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Wed Oct 28 2020 Stephen Gallagher <sgallagh@redhat.com> - 9.0-2
+- Replace ppc64le template with upstream version
+
 * Tue Oct 27 2020 Brian C. Lane <bcl@redhat.com> - 9.0-1
 - Update release version for RHEL 9.0
 - Remove spice-vdagent (bcl)