- Update qemu from 5.0.0 to 5.2.0 - Changelogs for 5.1.0 and 5.2.0 available at https://wiki.qemu.org/ChangeLog/ - rootfile updated - patch no longer needed as fix built into source. patch was not utilised for 5.0.0 version. Patch line was commented out in previous lfs

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/qemu | 16 ++--- lfs/qemu | 9 +-- .../qemu-4.1.0-build-fix-glibc-2.31.patch | 65 ------------------- 3 files changed, 9 insertions(+), 81 deletions(-) delete mode 100644 src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 21ae286e8..ee4b9f736 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,7 +1,5 @@ lib/udev/rules.d/65-kvm.rules usr/bin/elf2dmp -usr/bin/ivshmem-client -usr/bin/ivshmem-server usr/bin/qemu usr/bin/qemu-arm usr/bin/qemu-edid @@ -19,8 +17,6 @@ usr/bin/qemu-x86_64 usr/libexec/qemu-bridge-helper usr/libexec/virtiofsd #usr/share/applications/qemu.desktop -#usr/share/icons -#usr/share/icons/hicolor #usr/share/icons/hicolor/128x128 #usr/share/icons/hicolor/128x128/apps #usr/share/icons/hicolor/128x128/apps/qemu.png @@ -46,8 +42,6 @@ usr/libexec/virtiofsd #usr/share/icons/hicolor/64x64 #usr/share/icons/hicolor/64x64/apps #usr/share/icons/hicolor/64x64/apps/qemu.png -#usr/share/icons/hicolor/scalable -#usr/share/icons/hicolor/scalable/apps #usr/share/icons/hicolor/scalable/apps/qemu.svg #usr/share/qemu #usr/share/qemu/QEMU,cgthree.bin @@ -121,13 +115,14 @@ usr/share/qemu/kvmvapic.bin usr/share/qemu/linuxboot.bin usr/share/qemu/linuxboot_dma.bin usr/share/qemu/multiboot.bin +usr/share/qemu/npcm7xx_bootrom.bin #usr/share/qemu/openbios-ppc #usr/share/qemu/openbios-sparc32 #usr/share/qemu/openbios-sparc64 -#usr/share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin -#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/opensbi-riscv32-generic-fw_dynamic.bin +#usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf +#usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.bin +#usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf #usr/share/qemu/palcode-clipper #usr/share/qemu/petalogix-ml605.dtb #usr/share/qemu/petalogix-s3adsp1800.dtb @@ -138,6 +133,7 @@ usr/share/qemu/pxe-ne2k_pci.rom usr/share/qemu/pxe-pcnet.rom usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom +usr/share/qemu/qboot.rom usr/share/qemu/qemu-nsis.bmp usr/share/qemu/qemu_vga.ndrv #usr/share/qemu/s390-ccw.img diff --git a/lfs/qemu b/lfs/qemu index edd7a78a9..2ab1bf8c0 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@

include Config

-VER = 5.0.0 +VER = 5.2.0

THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 28 +PAK_VER = 29

DEPS = libusbredir spice libseccomp

@@ -45,7 +45,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = ede6005d7143fe994dd089d31dc2cf6c +$(DL_FILE)_MD5 = 179f86928835da857c237b42f4b2df73

install : $(TARGET)

@@ -78,9 +78,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch b/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch deleted file mode 100644 index 37c744d3b..000000000 --- a/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier laurent@vivier.eu -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include <time.h> - #include <stdio.h> - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson crobinso@redhat.com -Signed-off-by: Laurent Vivier laurent@vivier.eu -Reviewed-by: Peter Maydell peter.maydell@linaro.org -Message-Id: 20191112142556.6335-1-laurent@vivier.eu ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 4e97bcf..ce399a5 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7764,10 +7764,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ --- -1.8.3.1 -