From 0e7dd46c0127b485f14d1a4c5c59a78f5d7d0f967076850995a53e83706c6e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 1 Apr 2014 15:08:49 +0000 Subject: [PATCH] Accepting request 228442 from home:a_faerber:branches:Virtualization Enhance update_git.sh script to not duplicate .patch filename extension and to fill in the SeaBIOS version automatically OBS-URL: https://build.opensuse.org/request/show/228442 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=199 --- ... 0001-XXX-dont-dump-core-on-sigabort.patch | 0 ....patch => 0003-qemu-0.9.0.cvs-binfmt.patch | 0 ...patch => 0004-qemu-cvs-alsa_bitfield.patch | 0 ...ch.patch => 0005-qemu-cvs-alsa_ioctl.patch | 0 ...tch.patch => 0006-qemu-cvs-alsa_mmap.patch | 0 ....patch => 0007-qemu-cvs-gettimeofday.patch | 0 ...h.patch => 0008-qemu-cvs-ioctl_debug.patch | 0 ...h => 0009-qemu-cvs-ioctl_nodirection.patch | 0 ...3-PPC-KVM-Disable-mmu-notifier-check.patch | 0 ...014-linux-user-fix-segfault-deadlock.patch | 0 ...ch.patch => 0018-linux-user-lock-tcg.patch | 0 ...0020-linux-user-lock-tb-flushing-too.patch | 0 ...=> 0021-linux-user-Fake-proc-cpuinfo.patch | 0 ...> 0024-linux-user-XXX-disable-fiemap.patch | 0 ...patch.patch => 0025-slirp-nooutgoing.patch | 0 ... 0027-linux-user-add-more-blk-ioctls.patch | 0 ... => 0028-linux-user-use-target_ulong.patch | 0 ... 0030-block-Add-tar-container-format.patch | 0 ...patch => 0037-roms-Build-vgabios.bin.patch | 0 ...=> 0039-xen_disk-add-discard-support.patch | 0 qemu-2.0.0-rc0.tar.bz2 | 4 +- qemu-linux-user.changes | 5 +++ qemu-linux-user.spec | 40 +++++++++---------- qemu.changes | 12 ++++++ qemu.spec | 40 +++++++++---------- qemu.spec.in | 4 +- update_git.sh | 10 ++++- 27 files changed, 70 insertions(+), 45 deletions(-) rename 0001-XXX-dont-dump-core-on-sigabort.patc.patch => 0001-XXX-dont-dump-core-on-sigabort.patch (100%) rename 0003-qemu-0.9.0.cvs-binfmt.patch.patch => 0003-qemu-0.9.0.cvs-binfmt.patch (100%) rename 0004-qemu-cvs-alsa_bitfield.patch.patch => 0004-qemu-cvs-alsa_bitfield.patch (100%) rename 0005-qemu-cvs-alsa_ioctl.patch.patch => 0005-qemu-cvs-alsa_ioctl.patch (100%) rename 0006-qemu-cvs-alsa_mmap.patch.patch => 0006-qemu-cvs-alsa_mmap.patch (100%) rename 0007-qemu-cvs-gettimeofday.patch.patch => 0007-qemu-cvs-gettimeofday.patch (100%) rename 0008-qemu-cvs-ioctl_debug.patch.patch => 0008-qemu-cvs-ioctl_debug.patch (100%) rename 0009-qemu-cvs-ioctl_nodirection.patch.patch => 0009-qemu-cvs-ioctl_nodirection.patch (100%) rename 0013-PPC-KVM-Disable-mmu-notifier-check..patch => 0013-PPC-KVM-Disable-mmu-notifier-check.patch (100%) rename 0014-linux-user-fix-segfault-deadlock.pa.patch => 0014-linux-user-fix-segfault-deadlock.patch (100%) rename 0018-linux-user-lock-tcg.patch.patch => 0018-linux-user-lock-tcg.patch (100%) rename 0020-linux-user-lock-tb-flushing-too.pat.patch => 0020-linux-user-lock-tb-flushing-too.patch (100%) rename 0021-linux-user-Fake-proc-cpuinfo.patch.patch => 0021-linux-user-Fake-proc-cpuinfo.patch (100%) rename 0024-linux-user-XXX-disable-fiemap.patch.patch => 0024-linux-user-XXX-disable-fiemap.patch (100%) rename 0025-slirp-nooutgoing.patch.patch => 0025-slirp-nooutgoing.patch (100%) rename 0027-linux-user-add-more-blk-ioctls.patc.patch => 0027-linux-user-add-more-blk-ioctls.patch (100%) rename 0028-linux-user-use-target_ulong.patch.patch => 0028-linux-user-use-target_ulong.patch (100%) rename 0030-block-Add-tar-container-format.patc.patch => 0030-block-Add-tar-container-format.patch (100%) rename 0037-roms-Build-vgabios.bin.patch.patch => 0037-roms-Build-vgabios.bin.patch (100%) rename 0039-xen_disk-add-discard-support.patch.patch => 0039-xen_disk-add-discard-support.patch (100%) diff --git a/0001-XXX-dont-dump-core-on-sigabort.patc.patch b/0001-XXX-dont-dump-core-on-sigabort.patch similarity index 100% rename from 0001-XXX-dont-dump-core-on-sigabort.patc.patch rename to 0001-XXX-dont-dump-core-on-sigabort.patch diff --git a/0003-qemu-0.9.0.cvs-binfmt.patch.patch b/0003-qemu-0.9.0.cvs-binfmt.patch similarity index 100% rename from 0003-qemu-0.9.0.cvs-binfmt.patch.patch rename to 0003-qemu-0.9.0.cvs-binfmt.patch diff --git a/0004-qemu-cvs-alsa_bitfield.patch.patch b/0004-qemu-cvs-alsa_bitfield.patch similarity index 100% rename from 0004-qemu-cvs-alsa_bitfield.patch.patch rename to 0004-qemu-cvs-alsa_bitfield.patch diff --git a/0005-qemu-cvs-alsa_ioctl.patch.patch b/0005-qemu-cvs-alsa_ioctl.patch similarity index 100% rename from 0005-qemu-cvs-alsa_ioctl.patch.patch rename to 0005-qemu-cvs-alsa_ioctl.patch diff --git a/0006-qemu-cvs-alsa_mmap.patch.patch b/0006-qemu-cvs-alsa_mmap.patch similarity index 100% rename from 0006-qemu-cvs-alsa_mmap.patch.patch rename to 0006-qemu-cvs-alsa_mmap.patch diff --git a/0007-qemu-cvs-gettimeofday.patch.patch b/0007-qemu-cvs-gettimeofday.patch similarity index 100% rename from 0007-qemu-cvs-gettimeofday.patch.patch rename to 0007-qemu-cvs-gettimeofday.patch diff --git a/0008-qemu-cvs-ioctl_debug.patch.patch b/0008-qemu-cvs-ioctl_debug.patch similarity index 100% rename from 0008-qemu-cvs-ioctl_debug.patch.patch rename to 0008-qemu-cvs-ioctl_debug.patch diff --git a/0009-qemu-cvs-ioctl_nodirection.patch.patch b/0009-qemu-cvs-ioctl_nodirection.patch similarity index 100% rename from 0009-qemu-cvs-ioctl_nodirection.patch.patch rename to 0009-qemu-cvs-ioctl_nodirection.patch diff --git a/0013-PPC-KVM-Disable-mmu-notifier-check..patch b/0013-PPC-KVM-Disable-mmu-notifier-check.patch similarity index 100% rename from 0013-PPC-KVM-Disable-mmu-notifier-check..patch rename to 0013-PPC-KVM-Disable-mmu-notifier-check.patch diff --git a/0014-linux-user-fix-segfault-deadlock.pa.patch b/0014-linux-user-fix-segfault-deadlock.patch similarity index 100% rename from 0014-linux-user-fix-segfault-deadlock.pa.patch rename to 0014-linux-user-fix-segfault-deadlock.patch diff --git a/0018-linux-user-lock-tcg.patch.patch b/0018-linux-user-lock-tcg.patch similarity index 100% rename from 0018-linux-user-lock-tcg.patch.patch rename to 0018-linux-user-lock-tcg.patch diff --git a/0020-linux-user-lock-tb-flushing-too.pat.patch b/0020-linux-user-lock-tb-flushing-too.patch similarity index 100% rename from 0020-linux-user-lock-tb-flushing-too.pat.patch rename to 0020-linux-user-lock-tb-flushing-too.patch diff --git a/0021-linux-user-Fake-proc-cpuinfo.patch.patch b/0021-linux-user-Fake-proc-cpuinfo.patch similarity index 100% rename from 0021-linux-user-Fake-proc-cpuinfo.patch.patch rename to 0021-linux-user-Fake-proc-cpuinfo.patch diff --git a/0024-linux-user-XXX-disable-fiemap.patch.patch b/0024-linux-user-XXX-disable-fiemap.patch similarity index 100% rename from 0024-linux-user-XXX-disable-fiemap.patch.patch rename to 0024-linux-user-XXX-disable-fiemap.patch diff --git a/0025-slirp-nooutgoing.patch.patch b/0025-slirp-nooutgoing.patch similarity index 100% rename from 0025-slirp-nooutgoing.patch.patch rename to 0025-slirp-nooutgoing.patch diff --git a/0027-linux-user-add-more-blk-ioctls.patc.patch b/0027-linux-user-add-more-blk-ioctls.patch similarity index 100% rename from 0027-linux-user-add-more-blk-ioctls.patc.patch rename to 0027-linux-user-add-more-blk-ioctls.patch diff --git a/0028-linux-user-use-target_ulong.patch.patch b/0028-linux-user-use-target_ulong.patch similarity index 100% rename from 0028-linux-user-use-target_ulong.patch.patch rename to 0028-linux-user-use-target_ulong.patch diff --git a/0030-block-Add-tar-container-format.patc.patch b/0030-block-Add-tar-container-format.patch similarity index 100% rename from 0030-block-Add-tar-container-format.patc.patch rename to 0030-block-Add-tar-container-format.patch diff --git a/0037-roms-Build-vgabios.bin.patch.patch b/0037-roms-Build-vgabios.bin.patch similarity index 100% rename from 0037-roms-Build-vgabios.bin.patch.patch rename to 0037-roms-Build-vgabios.bin.patch diff --git a/0039-xen_disk-add-discard-support.patch.patch b/0039-xen_disk-add-discard-support.patch similarity index 100% rename from 0039-xen_disk-add-discard-support.patch.patch rename to 0039-xen_disk-add-discard-support.patch diff --git a/qemu-2.0.0-rc0.tar.bz2 b/qemu-2.0.0-rc0.tar.bz2 index db0ba40..f445265 100644 --- a/qemu-2.0.0-rc0.tar.bz2 +++ b/qemu-2.0.0-rc0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8ce73480cd41ddfb9482e7174b1850a996964b344108493eec0d4a43611a53c -size 12795764 +oid sha256:f1e7ca59846d333605bed46f3c9e52b27ebb849dda82e85dda89a5a8d5c4e0e4 +size 12552381 diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 7efeaf6..f937113 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 1 14:52:02 UTC 2014 - afaerber@suse.de + +- Fix update_git.sh script to not duplicate .patch in filename + ------------------------------------------------------------------- Fri Mar 28 11:54:19 UTC 2014 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 49d30f6..1615182 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -25,45 +25,45 @@ Version: 1.7.90 Release: 0 Source: qemu-2.0.0-rc0.tar.bz2 # This patch queue is auto-generated from https://github.com/openSUSE/qemu -Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch +Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch -Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch.patch -Patch0004: 0004-qemu-cvs-alsa_bitfield.patch.patch -Patch0005: 0005-qemu-cvs-alsa_ioctl.patch.patch -Patch0006: 0006-qemu-cvs-alsa_mmap.patch.patch -Patch0007: 0007-qemu-cvs-gettimeofday.patch.patch -Patch0008: 0008-qemu-cvs-ioctl_debug.patch.patch -Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch.patch +Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch +Patch0004: 0004-qemu-cvs-alsa_bitfield.patch +Patch0005: 0005-qemu-cvs-alsa_ioctl.patch +Patch0006: 0006-qemu-cvs-alsa_mmap.patch +Patch0007: 0007-qemu-cvs-gettimeofday.patch +Patch0008: 0008-qemu-cvs-ioctl_debug.patch +Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch Patch0012: 0012-linux-user-be-silent-about-capget-f.patch -Patch0013: 0013-PPC-KVM-Disable-mmu-notifier-check..patch -Patch0014: 0014-linux-user-fix-segfault-deadlock.pa.patch +Patch0013: 0013-PPC-KVM-Disable-mmu-notifier-check.patch +Patch0014: 0014-linux-user-fix-segfault-deadlock.patch Patch0015: 0015-linux-user-binfmt-support-host-bina.patch Patch0016: 0016-linux-user-arm-no-tb_flush-on-reset.patch Patch0017: 0017-linux-user-Ignore-broken-loop-ioctl.patch -Patch0018: 0018-linux-user-lock-tcg.patch.patch +Patch0018: 0018-linux-user-lock-tcg.patch Patch0019: 0019-linux-user-Run-multi-threaded-code-.patch -Patch0020: 0020-linux-user-lock-tb-flushing-too.pat.patch -Patch0021: 0021-linux-user-Fake-proc-cpuinfo.patch.patch +Patch0020: 0020-linux-user-lock-tb-flushing-too.patch +Patch0021: 0021-linux-user-Fake-proc-cpuinfo.patch Patch0022: 0022-linux-user-implement-FS_IOC_GETFLAG.patch Patch0023: 0023-linux-user-implement-FS_IOC_SETFLAG.patch -Patch0024: 0024-linux-user-XXX-disable-fiemap.patch.patch -Patch0025: 0025-slirp-nooutgoing.patch.patch +Patch0024: 0024-linux-user-XXX-disable-fiemap.patch +Patch0025: 0025-slirp-nooutgoing.patch Patch0026: 0026-vnc-password-file-and-incoming-conn.patch -Patch0027: 0027-linux-user-add-more-blk-ioctls.patc.patch -Patch0028: 0028-linux-user-use-target_ulong.patch.patch +Patch0027: 0027-linux-user-add-more-blk-ioctls.patch +Patch0028: 0028-linux-user-use-target_ulong.patch Patch0029: 0029-block-Add-support-for-DictZip-enabl.patch -Patch0030: 0030-block-Add-tar-container-format.patc.patch +Patch0030: 0030-block-Add-tar-container-format.patch Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-dictzip.patch Patch0032: 0032-Legacy-Patch-kvm-qemu-preXX-report-.patch Patch0033: 0033-console-add-question-mark-escape-op.patch Patch0034: 0034-Make-char-muxer-more-robust-wrt-sma.patch Patch0035: 0035-linux-user-lseek-explicitly-cast-no.patch Patch0036: 0036-virtfs-proxy-helper-Provide-__u64-f.patch -Patch0037: 0037-roms-Build-vgabios.bin.patch.patch +Patch0037: 0037-roms-Build-vgabios.bin.patch Patch0038: 0038-configure-Enable-PIE-for-ppc-and-pp.patch -Patch0039: 0039-xen_disk-add-discard-support.patch.patch +Patch0039: 0039-xen_disk-add-discard-support.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: rpmlintrc diff --git a/qemu.changes b/qemu.changes index f0bea1d..f5233f2 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 1 14:50:37 UTC 2014 - afaerber@suse.de + +- Enhance update_git.sh script +* Fix duplicate .patch for short filenames +* Read SeaBIOS version from QEMU tarball + +------------------------------------------------------------------- +Mon Mar 31 14:51:30 UTC 2014 - afaerber@suse.de + +- Re-create qemu-2.0.0-rc0.tar.bz2 to include SeaBIOS .version + ------------------------------------------------------------------- Fri Mar 28 11:53:31 UTC 2014 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 24b4f61..ddf8042 100644 --- a/qemu.spec +++ b/qemu.spec @@ -38,45 +38,45 @@ Source4: qemu-kvm.1.gz Source5: 60-kvm.rules Source6: ksm.service # This patch queue is auto-generated from https://github.com/openSUSE/qemu -Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch +Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch -Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch.patch -Patch0004: 0004-qemu-cvs-alsa_bitfield.patch.patch -Patch0005: 0005-qemu-cvs-alsa_ioctl.patch.patch -Patch0006: 0006-qemu-cvs-alsa_mmap.patch.patch -Patch0007: 0007-qemu-cvs-gettimeofday.patch.patch -Patch0008: 0008-qemu-cvs-ioctl_debug.patch.patch -Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch.patch +Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch +Patch0004: 0004-qemu-cvs-alsa_bitfield.patch +Patch0005: 0005-qemu-cvs-alsa_ioctl.patch +Patch0006: 0006-qemu-cvs-alsa_mmap.patch +Patch0007: 0007-qemu-cvs-gettimeofday.patch +Patch0008: 0008-qemu-cvs-ioctl_debug.patch +Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch Patch0012: 0012-linux-user-be-silent-about-capget-f.patch -Patch0013: 0013-PPC-KVM-Disable-mmu-notifier-check..patch -Patch0014: 0014-linux-user-fix-segfault-deadlock.pa.patch +Patch0013: 0013-PPC-KVM-Disable-mmu-notifier-check.patch +Patch0014: 0014-linux-user-fix-segfault-deadlock.patch Patch0015: 0015-linux-user-binfmt-support-host-bina.patch Patch0016: 0016-linux-user-arm-no-tb_flush-on-reset.patch Patch0017: 0017-linux-user-Ignore-broken-loop-ioctl.patch -Patch0018: 0018-linux-user-lock-tcg.patch.patch +Patch0018: 0018-linux-user-lock-tcg.patch Patch0019: 0019-linux-user-Run-multi-threaded-code-.patch -Patch0020: 0020-linux-user-lock-tb-flushing-too.pat.patch -Patch0021: 0021-linux-user-Fake-proc-cpuinfo.patch.patch +Patch0020: 0020-linux-user-lock-tb-flushing-too.patch +Patch0021: 0021-linux-user-Fake-proc-cpuinfo.patch Patch0022: 0022-linux-user-implement-FS_IOC_GETFLAG.patch Patch0023: 0023-linux-user-implement-FS_IOC_SETFLAG.patch -Patch0024: 0024-linux-user-XXX-disable-fiemap.patch.patch -Patch0025: 0025-slirp-nooutgoing.patch.patch +Patch0024: 0024-linux-user-XXX-disable-fiemap.patch +Patch0025: 0025-slirp-nooutgoing.patch Patch0026: 0026-vnc-password-file-and-incoming-conn.patch -Patch0027: 0027-linux-user-add-more-blk-ioctls.patc.patch -Patch0028: 0028-linux-user-use-target_ulong.patch.patch +Patch0027: 0027-linux-user-add-more-blk-ioctls.patch +Patch0028: 0028-linux-user-use-target_ulong.patch Patch0029: 0029-block-Add-support-for-DictZip-enabl.patch -Patch0030: 0030-block-Add-tar-container-format.patc.patch +Patch0030: 0030-block-Add-tar-container-format.patch Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-dictzip.patch Patch0032: 0032-Legacy-Patch-kvm-qemu-preXX-report-.patch Patch0033: 0033-console-add-question-mark-escape-op.patch Patch0034: 0034-Make-char-muxer-more-robust-wrt-sma.patch Patch0035: 0035-linux-user-lseek-explicitly-cast-no.patch Patch0036: 0036-virtfs-proxy-helper-Provide-__u64-f.patch -Patch0037: 0037-roms-Build-vgabios.bin.patch.patch +Patch0037: 0037-roms-Build-vgabios.bin.patch Patch0038: 0038-configure-Enable-PIE-for-ppc-and-pp.patch -Patch0039: 0039-xen_disk-add-discard-support.patch.patch +Patch0039: 0039-xen_disk-add-discard-support.patch # Please do not add patches manually here, run update_git.sh. # roms/ipxe patches diff --git a/qemu.spec.in b/qemu.spec.in index 9a367c1..31f7393 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -350,7 +350,7 @@ This sub-package contains the guest agent. %package seabios Summary: X86 BIOS for QEMU Group: System/Emulators/PC -Version: 1.7.4 +SEABIOS_VERSION Release: 0 BuildArch: noarch Conflicts: qemu < 1.6.0 @@ -362,7 +362,7 @@ is the default BIOS for QEMU. %package vgabios Summary: VGA BIOSes for QEMU Group: System/Emulators/PC -Version: 1.7.4 +SEABIOS_VERSION Release: 0 BuildArch: noarch Conflicts: qemu < 1.6.0 diff --git a/update_git.sh b/update_git.sh index bb1b3ac..7522781 100644 --- a/update_git.sh +++ b/update_git.sh @@ -58,7 +58,7 @@ rm -rf $QEMU_TMP # while at it, also remove the signature. for i in 0*; do PATCHNAME=${i%.patch} - PATCHNAME=${i:0:40}.patch + PATCHNAME=${PATCHNAME:0:40}.patch head -n $(expr $(wc -l $i | cut -d ' ' -f 1) - 3) $i > "$PATCHNAME.tmp" rm "$i" mv "$PATCHNAME.tmp" "$PATCHNAME" @@ -80,6 +80,14 @@ for package in qemu qemu-linux-user; do done elif [ "$line" = "QEMU_VERSION" ]; then echo "Version: $QEMU_VERSION" + elif [[ "$line" =~ ^Source: ]]; then + QEMU_TARBALL=qemu-`echo "$line" | cut -d '-' -f 2-` + VERSION_FILE=${QEMU_TARBALL%.tar.bz2}/roms/seabios/.version + SEABIOS_VERSION=`tar jxfO "$QEMU_TARBALL" "$VERSION_FILE"` + SEABIOS_VERSION=`echo $SEABIOS_VERSION | cut -d '-' -f 2` + echo "$line" + elif [ "$line" = "SEABIOS_VERSION" ]; then + echo "Version: $SEABIOS_VERSION" else echo "$line" fi