Hi,
the following patch series reduces the package size by 50 MB. The removed files are needed for architectures we do not support. Maybe we should consider removing all other architectures except x86_64 to reduce the size further.
Fixes: #12268
Greetings Jonatan
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
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
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
This is based on the debian package content (qemu-system-sparc)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/qemu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index e08ee05d5..90550f949 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -48,8 +48,8 @@ usr/libexec/qemu-bridge-helper #usr/share/icons/hicolor/scalable/apps #usr/share/icons/hicolor/scalable/apps/qemu.svg #usr/share/qemu -usr/share/qemu/QEMU,cgthree.bin -usr/share/qemu/QEMU,tcx.bin +#usr/share/qemu/QEMU,cgthree.bin +#usr/share/qemu/QEMU,tcx.bin #usr/share/qemu/bamboo.dtb usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin @@ -119,8 +119,8 @@ 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-sparc32 -usr/share/qemu/openbios-sparc64 +#usr/share/qemu/openbios-sparc32 +#usr/share/qemu/openbios-sparc64 usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
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-sparc)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/rootfiles/packages/qemu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index e08ee05d5..90550f949 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -48,8 +48,8 @@ usr/libexec/qemu-bridge-helper #usr/share/icons/hicolor/scalable/apps #usr/share/icons/hicolor/scalable/apps/qemu.svg #usr/share/qemu -usr/share/qemu/QEMU,cgthree.bin -usr/share/qemu/QEMU,tcx.bin +#usr/share/qemu/QEMU,cgthree.bin +#usr/share/qemu/QEMU,tcx.bin #usr/share/qemu/bamboo.dtb usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin @@ -119,8 +119,8 @@ 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-sparc32 -usr/share/qemu/openbios-sparc64 +#usr/share/qemu/openbios-sparc32 +#usr/share/qemu/openbios-sparc64 usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin -- 2.20.1
These are needed for s390, riscv and microblaze.
See https://lists.fedoraproject.org/pipermail/packaging/2012-July/008557.html
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/qemu | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 90550f949..f6d1f5297 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -121,12 +121,12 @@ usr/share/qemu/multiboot.bin #usr/share/qemu/openbios-ppc #usr/share/qemu/openbios-sparc32 #usr/share/qemu/openbios-sparc64 -usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin -usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin -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/opensbi-riscv32-virt-fw_jump.bin +#usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin +#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/pvh.bin usr/share/qemu/pxe-e1000.rom @@ -137,10 +137,10 @@ usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom usr/share/qemu/qemu-nsis.bmp usr/share/qemu/qemu_vga.ndrv -usr/share/qemu/s390-ccw.img -usr/share/qemu/s390-netboot.img +#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/skiboot.lid #usr/share/qemu/slof.bin #usr/share/qemu/spapr-rtas.bin usr/share/qemu/trace-events-all
Reviewed-by: Michael Tremer michael.tremer@ipfire.org
On 1 Feb 2020, at 14:15, Jonatan Schlag jonatan.schlag@ipfire.org wrote:
These are needed for s390, riscv and microblaze.
See https://lists.fedoraproject.org/pipermail/packaging/2012-July/008557.html
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/rootfiles/packages/qemu | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 90550f949..f6d1f5297 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -121,12 +121,12 @@ usr/share/qemu/multiboot.bin #usr/share/qemu/openbios-ppc #usr/share/qemu/openbios-sparc32 #usr/share/qemu/openbios-sparc64 -usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin -usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin -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/opensbi-riscv32-virt-fw_jump.bin +#usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin +#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/pvh.bin usr/share/qemu/pxe-e1000.rom @@ -137,10 +137,10 @@ usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom usr/share/qemu/qemu-nsis.bmp usr/share/qemu/qemu_vga.ndrv -usr/share/qemu/s390-ccw.img -usr/share/qemu/s390-netboot.img +#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/skiboot.lid #usr/share/qemu/slof.bin #usr/share/qemu/spapr-rtas.bin usr/share/qemu/trace-events-all -- 2.20.1
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/qemu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index f6d1f5297..af9499d2a 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -54,7 +54,7 @@ usr/libexec/qemu-bridge-helper usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin #usr/share/qemu/canyonlands.dtb -usr/share/qemu/edk2-aarch64-code.fd +#usr/share/qemu/edk2-aarch64-code.fd usr/share/qemu/edk2-arm-code.fd usr/share/qemu/edk2-arm-vars.fd usr/share/qemu/edk2-i386-code.fd @@ -74,11 +74,11 @@ usr/share/qemu/efi-vmxnet3.rom usr/share/qemu/firmware usr/share/qemu/firmware/50-edk2-i386-secure.json usr/share/qemu/firmware/50-edk2-x86_64-secure.json -usr/share/qemu/firmware/60-edk2-aarch64.json +#usr/share/qemu/firmware/60-edk2-aarch64.json usr/share/qemu/firmware/60-edk2-arm.json usr/share/qemu/firmware/60-edk2-i386.json usr/share/qemu/firmware/60-edk2-x86_64.json -usr/share/qemu/hppa-firmware.img +#usr/share/qemu/hppa-firmware.img usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/bepo
Reviewed-by: Michael Tremer michael.tremer@ipfire.org
On 1 Feb 2020, at 14:15, Jonatan Schlag jonatan.schlag@ipfire.org wrote:
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/rootfiles/packages/qemu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index f6d1f5297..af9499d2a 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -54,7 +54,7 @@ usr/libexec/qemu-bridge-helper usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin #usr/share/qemu/canyonlands.dtb -usr/share/qemu/edk2-aarch64-code.fd +#usr/share/qemu/edk2-aarch64-code.fd usr/share/qemu/edk2-arm-code.fd usr/share/qemu/edk2-arm-vars.fd usr/share/qemu/edk2-i386-code.fd @@ -74,11 +74,11 @@ usr/share/qemu/efi-vmxnet3.rom usr/share/qemu/firmware usr/share/qemu/firmware/50-edk2-i386-secure.json usr/share/qemu/firmware/50-edk2-x86_64-secure.json -usr/share/qemu/firmware/60-edk2-aarch64.json +#usr/share/qemu/firmware/60-edk2-aarch64.json usr/share/qemu/firmware/60-edk2-arm.json usr/share/qemu/firmware/60-edk2-i386.json usr/share/qemu/firmware/60-edk2-x86_64.json -usr/share/qemu/hppa-firmware.img +#usr/share/qemu/hppa-firmware.img usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/bepo -- 2.20.1
-
Jonatan Schlag -
Michael Tremer