[1/4] Qemu: remove files only needed for Power PC

Message ID 20200201141540.3300-2-jonatan.schlag@ipfire.org
State Accepted
Commit 36cdd4e1f211edc870870826fa7e168bac1363d1
Headers
Series [1/4] Qemu: remove files only needed for Power PC |

Commit Message

Jonatan Schlag Feb. 1, 2020, 2:15 p.m. UTC
  This is based on the debian package content (qemu-system-pcc)

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 config/rootfiles/packages/qemu | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
  

Comments

Michael Tremer Feb. 3, 2020, 2:56 p.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 1 Feb 2020, at 14:15, Jonatan Schlag <jonatan.schlag@ipfire.org> wrote:
> 
> This is based on the debian package content (qemu-system-pcc)
> 
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
> config/rootfiles/packages/qemu | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
> index e5c0cd189..e08ee05d5 100644
> --- a/config/rootfiles/packages/qemu
> +++ b/config/rootfiles/packages/qemu
> @@ -50,10 +50,10 @@ usr/libexec/qemu-bridge-helper
> #usr/share/qemu
> usr/share/qemu/QEMU,cgthree.bin
> usr/share/qemu/QEMU,tcx.bin
> -usr/share/qemu/bamboo.dtb
> +#usr/share/qemu/bamboo.dtb
> usr/share/qemu/bios-256k.bin
> usr/share/qemu/bios.bin
> -usr/share/qemu/canyonlands.dtb
> +#usr/share/qemu/canyonlands.dtb
> usr/share/qemu/edk2-aarch64-code.fd
> usr/share/qemu/edk2-arm-code.fd
> usr/share/qemu/edk2-arm-vars.fd
> @@ -118,7 +118,7 @@ usr/share/qemu/kvmvapic.bin
> usr/share/qemu/linuxboot.bin
> usr/share/qemu/linuxboot_dma.bin
> usr/share/qemu/multiboot.bin
> -usr/share/qemu/openbios-ppc
> +#usr/share/qemu/openbios-ppc
> usr/share/qemu/openbios-sparc32
> usr/share/qemu/openbios-sparc64
> usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin
> @@ -127,7 +127,7 @@ usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
> usr/share/qemu/palcode-clipper
> usr/share/qemu/petalogix-ml605.dtb
> usr/share/qemu/petalogix-s3adsp1800.dtb
> -usr/share/qemu/ppc_rom.bin
> +#usr/share/qemu/ppc_rom.bin
> usr/share/qemu/pvh.bin
> usr/share/qemu/pxe-e1000.rom
> usr/share/qemu/pxe-eepro100.rom
> @@ -141,8 +141,8 @@ usr/share/qemu/s390-ccw.img
> usr/share/qemu/s390-netboot.img
> usr/share/qemu/sgabios.bin
> usr/share/qemu/skiboot.lid
> -usr/share/qemu/slof.bin
> -usr/share/qemu/spapr-rtas.bin
> +#usr/share/qemu/slof.bin
> +#usr/share/qemu/spapr-rtas.bin
> usr/share/qemu/trace-events-all
> usr/share/qemu/u-boot-sam460-20100605.bin
> usr/share/qemu/u-boot.e500
> -- 
> 2.20.1
>
  
Michael Tremer Feb. 13, 2020, 1:23 p.m. UTC | #2
Thank you Arne for merging this patchset.

However, I overlooked that the release version was not bumped and so this is not being found as an update.

Could you please bump the release?

Best,
-Michael

> On 3 Feb 2020, at 14:56, Michael Tremer <michael.tremer@ipfire.org> wrote:
> 
> Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
> 
>> On 1 Feb 2020, at 14:15, Jonatan Schlag <jonatan.schlag@ipfire.org> wrote:
>> 
>> This is based on the debian package content (qemu-system-pcc)
>> 
>> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
>> ---
>> config/rootfiles/packages/qemu | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>> 
>> diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
>> index e5c0cd189..e08ee05d5 100644
>> --- a/config/rootfiles/packages/qemu
>> +++ b/config/rootfiles/packages/qemu
>> @@ -50,10 +50,10 @@ usr/libexec/qemu-bridge-helper
>> #usr/share/qemu
>> usr/share/qemu/QEMU,cgthree.bin
>> usr/share/qemu/QEMU,tcx.bin
>> -usr/share/qemu/bamboo.dtb
>> +#usr/share/qemu/bamboo.dtb
>> usr/share/qemu/bios-256k.bin
>> usr/share/qemu/bios.bin
>> -usr/share/qemu/canyonlands.dtb
>> +#usr/share/qemu/canyonlands.dtb
>> usr/share/qemu/edk2-aarch64-code.fd
>> usr/share/qemu/edk2-arm-code.fd
>> usr/share/qemu/edk2-arm-vars.fd
>> @@ -118,7 +118,7 @@ usr/share/qemu/kvmvapic.bin
>> usr/share/qemu/linuxboot.bin
>> usr/share/qemu/linuxboot_dma.bin
>> usr/share/qemu/multiboot.bin
>> -usr/share/qemu/openbios-ppc
>> +#usr/share/qemu/openbios-ppc
>> usr/share/qemu/openbios-sparc32
>> usr/share/qemu/openbios-sparc64
>> usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin
>> @@ -127,7 +127,7 @@ usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
>> usr/share/qemu/palcode-clipper
>> usr/share/qemu/petalogix-ml605.dtb
>> usr/share/qemu/petalogix-s3adsp1800.dtb
>> -usr/share/qemu/ppc_rom.bin
>> +#usr/share/qemu/ppc_rom.bin
>> usr/share/qemu/pvh.bin
>> usr/share/qemu/pxe-e1000.rom
>> usr/share/qemu/pxe-eepro100.rom
>> @@ -141,8 +141,8 @@ usr/share/qemu/s390-ccw.img
>> usr/share/qemu/s390-netboot.img
>> usr/share/qemu/sgabios.bin
>> usr/share/qemu/skiboot.lid
>> -usr/share/qemu/slof.bin
>> -usr/share/qemu/spapr-rtas.bin
>> +#usr/share/qemu/slof.bin
>> +#usr/share/qemu/spapr-rtas.bin
>> usr/share/qemu/trace-events-all
>> usr/share/qemu/u-boot-sam460-20100605.bin
>> usr/share/qemu/u-boot.e500
>> -- 
>> 2.20.1
>> 
>
  

Patch

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index e5c0cd189..e08ee05d5 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -50,10 +50,10 @@  usr/libexec/qemu-bridge-helper
 #usr/share/qemu
 usr/share/qemu/QEMU,cgthree.bin
 usr/share/qemu/QEMU,tcx.bin
-usr/share/qemu/bamboo.dtb
+#usr/share/qemu/bamboo.dtb
 usr/share/qemu/bios-256k.bin
 usr/share/qemu/bios.bin
-usr/share/qemu/canyonlands.dtb
+#usr/share/qemu/canyonlands.dtb
 usr/share/qemu/edk2-aarch64-code.fd
 usr/share/qemu/edk2-arm-code.fd
 usr/share/qemu/edk2-arm-vars.fd
@@ -118,7 +118,7 @@  usr/share/qemu/kvmvapic.bin
 usr/share/qemu/linuxboot.bin
 usr/share/qemu/linuxboot_dma.bin
 usr/share/qemu/multiboot.bin
-usr/share/qemu/openbios-ppc
+#usr/share/qemu/openbios-ppc
 usr/share/qemu/openbios-sparc32
 usr/share/qemu/openbios-sparc64
 usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin
@@ -127,7 +127,7 @@  usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
 usr/share/qemu/palcode-clipper
 usr/share/qemu/petalogix-ml605.dtb
 usr/share/qemu/petalogix-s3adsp1800.dtb
-usr/share/qemu/ppc_rom.bin
+#usr/share/qemu/ppc_rom.bin
 usr/share/qemu/pvh.bin
 usr/share/qemu/pxe-e1000.rom
 usr/share/qemu/pxe-eepro100.rom
@@ -141,8 +141,8 @@  usr/share/qemu/s390-ccw.img
 usr/share/qemu/s390-netboot.img
 usr/share/qemu/sgabios.bin
 usr/share/qemu/skiboot.lid
-usr/share/qemu/slof.bin
-usr/share/qemu/spapr-rtas.bin
+#usr/share/qemu/slof.bin
+#usr/share/qemu/spapr-rtas.bin
 usr/share/qemu/trace-events-all
 usr/share/qemu/u-boot-sam460-20100605.bin
 usr/share/qemu/u-boot.e500