dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0277-remove-temporary-.bin-files-kernel-and-modules.patch

4fe85b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4fe85b
From: Andrey Borzenkov <arvidjaar@gmail.com>
4fe85b
Date: Thu, 31 Dec 2015 23:00:25 +0300
4fe85b
Subject: [PATCH] remove temporary .bin files (kernel and modules)
4fe85b
4fe85b
---
4fe85b
 gentpl.py              | 2 ++
4fe85b
 grub-core/genmod.sh.in | 2 +-
4fe85b
 2 files changed, 3 insertions(+), 1 deletion(-)
4fe85b
4fe85b
diff --git a/gentpl.py b/gentpl.py
4fe85b
index 58430fcd236..c17a18b0ea0 100644
4fe85b
--- a/gentpl.py
4fe85b
+++ b/gentpl.py
4fe85b
@@ -723,9 +723,11 @@ def kernel(defn, platform):
4fe85b
 """if test x$(TARGET_APPLE_LINKER) = x1; then \
4fe85b
   $(TARGET_STRIP) -S -x $(""" + cname(defn) + """) -o $@.bin $<; \
4fe85b
   $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd $@.bin $@; \
4fe85b
+  rm -f $@.bin; \
4fe85b
    elif test ! -z '$(TARGET_OBJ2ELF)'; then \
4fe85b
      """  + "$(TARGET_STRIP) $(" + cname(defn) + "_STRIPFLAGS) -o $@.bin $< && \
4fe85b
      $(TARGET_OBJ2ELF) $@.bin $@ || (rm -f $@; rm -f $@.bin; exit 1); \
4fe85b
+     rm -f $@.bin; \
4fe85b
 else """  + "$(TARGET_STRIP) $(" + cname(defn) + "_STRIPFLAGS) -o $@ $<; \
4fe85b
 fi"""))
4fe85b
 
4fe85b
diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
4fe85b
index f74edd55181..ca2e59d5c42 100644
4fe85b
--- a/grub-core/genmod.sh.in
4fe85b
+++ b/grub-core/genmod.sh.in
4fe85b
@@ -91,7 +91,7 @@ else
4fe85b
 	    -nr:_grub_mod_init:grub_mod_init \
4fe85b
 	    -nr:_grub_mod_fini:grub_mod_fini \
4fe85b
 	    -wd1106 -nu -nd $tmpfile.bin $tmpfile || exit 1
4fe85b
-	rm -f $name.bin
4fe85b
+	rm -f $tmpfile.bin
4fe85b
 fi
4fe85b
 if test x@platform@ != xemu; then
4fe85b
     ./build-grub-module-verifier $tmpfile @target_cpu@