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

qemu-2.0.0-rc0.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8ce73480cd41ddfb9482e7174b1850a996964b344108493eec0d4a43611a53c
+oid sha256:f1e7ca59846d333605bed46f3c9e52b27ebb849dda82e85dda89a5a8d5c4e0e4
-size 12795764
+size 12552381

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
 

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
+Patch0003:      0003-qemu-0.9.0.cvs-binfmt.patch
-Patch0004:      0004-qemu-cvs-alsa_bitfield.patch.patch
+Patch0004:      0004-qemu-cvs-alsa_bitfield.patch
-Patch0005:      0005-qemu-cvs-alsa_ioctl.patch.patch
+Patch0005:      0005-qemu-cvs-alsa_ioctl.patch
-Patch0006:      0006-qemu-cvs-alsa_mmap.patch.patch
+Patch0006:      0006-qemu-cvs-alsa_mmap.patch
-Patch0007:      0007-qemu-cvs-gettimeofday.patch.patch
+Patch0007:      0007-qemu-cvs-gettimeofday.patch
-Patch0008:      0008-qemu-cvs-ioctl_debug.patch.patch
+Patch0008:      0008-qemu-cvs-ioctl_debug.patch
-Patch0009:      0009-qemu-cvs-ioctl_nodirection.patch.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
+Patch0013:      0013-PPC-KVM-Disable-mmu-notifier-check.patch
-Patch0014:      0014-linux-user-fix-segfault-deadlock.pa.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
+Patch0020:      0020-linux-user-lock-tb-flushing-too.patch
-Patch0021:      0021-linux-user-Fake-proc-cpuinfo.patch.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
+Patch0024:      0024-linux-user-XXX-disable-fiemap.patch
-Patch0025:      0025-slirp-nooutgoing.patch.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
+Patch0027:      0027-linux-user-add-more-blk-ioctls.patch
-Patch0028:      0028-linux-user-use-target_ulong.patch.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

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
 

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
+Patch0003:      0003-qemu-0.9.0.cvs-binfmt.patch
-Patch0004:      0004-qemu-cvs-alsa_bitfield.patch.patch
+Patch0004:      0004-qemu-cvs-alsa_bitfield.patch
-Patch0005:      0005-qemu-cvs-alsa_ioctl.patch.patch
+Patch0005:      0005-qemu-cvs-alsa_ioctl.patch
-Patch0006:      0006-qemu-cvs-alsa_mmap.patch.patch
+Patch0006:      0006-qemu-cvs-alsa_mmap.patch
-Patch0007:      0007-qemu-cvs-gettimeofday.patch.patch
+Patch0007:      0007-qemu-cvs-gettimeofday.patch
-Patch0008:      0008-qemu-cvs-ioctl_debug.patch.patch
+Patch0008:      0008-qemu-cvs-ioctl_debug.patch
-Patch0009:      0009-qemu-cvs-ioctl_nodirection.patch.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
+Patch0013:      0013-PPC-KVM-Disable-mmu-notifier-check.patch
-Patch0014:      0014-linux-user-fix-segfault-deadlock.pa.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
+Patch0020:      0020-linux-user-lock-tb-flushing-too.patch
-Patch0021:      0021-linux-user-Fake-proc-cpuinfo.patch.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
+Patch0024:      0024-linux-user-XXX-disable-fiemap.patch
-Patch0025:      0025-slirp-nooutgoing.patch.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
+Patch0027:      0027-linux-user-add-more-blk-ioctls.patch
-Patch0028:      0028-linux-user-use-target_ulong.patch.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

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

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