From 00921ac734256f4fec6b92a1960598308cfc09d617e7af24b7fb1b22bf15c8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 22 Nov 2016 16:55:16 +0000 Subject: [PATCH] Accepting request 441455 from home:a_faerber:branches:Virtualization Tidy SLOF patch boilerplate OBS-URL: https://build.opensuse.org/request/show/441455 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=323 --- qemu-testsuite.changes | 5 +++++ qemu-testsuite.spec | 10 +++++----- qemu.changes | 5 +++++ qemu.spec | 10 +++++----- qemu.spec.in | 10 +++++----- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 35941059..59b9461f 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 22 14:44:51 UTC 2016 - afaerber@suse.de + +- Tidy SLOF patch boilerplate (michals) + ------------------------------------------------------------------- Mon Nov 21 17:26:36 UTC 2016 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 659c8857..d0593ec6 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -173,7 +173,9 @@ Patch1100: ipxe-stable-buildid.patch # sgabios Patch1200: sgabios-stable-buildid.patch +%endif +%if %{build_slof_from_source} # SLOF # (currently no patches) %endif @@ -823,15 +825,10 @@ popd pushd roms/ipxe %patch1100 -p1 popd - pushd roms/sgabios %patch1200 -p1 popd -pushd roms/SLOF -# (currently no patches) -popd - # as a safeguard, delete the firmware files that we intend to build for i in %built_firmware_files do @@ -840,6 +837,9 @@ done %endif %if %{build_slof_from_source} +pushd roms/SLOF +# (currently no patches) +popd rm -f pc-bios/slof.bin %endif diff --git a/qemu.changes b/qemu.changes index 35941059..59b9461f 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 22 14:44:51 UTC 2016 - afaerber@suse.de + +- Tidy SLOF patch boilerplate (michals) + ------------------------------------------------------------------- Mon Nov 21 17:26:36 UTC 2016 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index e0ea57ef..c3ef17c1 100644 --- a/qemu.spec +++ b/qemu.spec @@ -173,7 +173,9 @@ Patch1100: ipxe-stable-buildid.patch # sgabios Patch1200: sgabios-stable-buildid.patch +%endif +%if %{build_slof_from_source} # SLOF # (currently no patches) %endif @@ -823,15 +825,10 @@ popd pushd roms/ipxe %patch1100 -p1 popd - pushd roms/sgabios %patch1200 -p1 popd -pushd roms/SLOF -# (currently no patches) -popd - # as a safeguard, delete the firmware files that we intend to build for i in %built_firmware_files do @@ -840,6 +837,9 @@ done %endif %if %{build_slof_from_source} +pushd roms/SLOF +# (currently no patches) +popd rm -f pc-bios/slof.bin %endif diff --git a/qemu.spec.in b/qemu.spec.in index 3223c85f..3ffff8d9 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -105,7 +105,9 @@ Patch1100: ipxe-stable-buildid.patch # sgabios Patch1200: sgabios-stable-buildid.patch +%endif +%if %{build_slof_from_source} # SLOF # (currently no patches) %endif @@ -687,15 +689,10 @@ popd pushd roms/ipxe %patch1100 -p1 popd - pushd roms/sgabios %patch1200 -p1 popd -pushd roms/SLOF -# (currently no patches) -popd - # as a safeguard, delete the firmware files that we intend to build for i in %built_firmware_files do @@ -704,6 +701,9 @@ done %endif %if %{build_slof_from_source} +pushd roms/SLOF +# (currently no patches) +popd rm -f pc-bios/slof.bin %endif