From 9cc9bce1398ecd4a4492a724475f7051bb2e8920b7a45eae4ce4dc1b334f3259 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Tue, 21 Nov 2023 08:07:34 +0000
Subject: [PATCH] Accepting request 1127836 from
 home:michael-chang:branches:Base:System

- grub2.spec: Fix openQA test failure in SLE-15-SP6 due to missing
  font in memdisk

OBS-URL: https://build.opensuse.org/request/show/1127836
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=476
---
 grub2.changes | 6 ++++++
 grub2.spec    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/grub2.changes b/grub2.changes
index ec7aca3..8fa9959 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 21 06:52:08 UTC 2023 - Michael Chang <mchang@suse.com>
+
+- grub2.spec: Fix openQA test failure in SLE-15-SP6 due to missing
+  font in memdisk
+
 -------------------------------------------------------------------
 Thu Nov 16 06:39:46 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/grub2.spec b/grub2.spec
index e85a7ec..011744e 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -747,7 +747,7 @@ cp ./unicode.pf2 ./fonts
 %if 0%{?suse_version} > 1500
 tar -cf - ./fonts | mksquashfs - memdisk.sqsh -tar -comp xz -quiet -no-progress
 %else
-tar -cf mem.tar ./fonts && mksquashfs mem.tar memdisk.sqsh -comp xz -quiet -no-progress
+mksquashfs ./fonts memdisk.sqsh -keep-as-directory -comp xz -quiet -no-progress
 %endif
 
 ./grub-mkimage -O %{grubefiarch} -o grub.efi --memdisk=./memdisk.sqsh --prefix= %{?sbat_generation:--sbat sbat.csv} \