Accepting request 662931 from home:bfrogers:branches:Virtualization

Follow up on ideas prompted by last change: clean up the patches generated by git workflow. There is no value to the first line (mbox From line), or [PATCH] on subject line. Get rid of those.
Other minor fixes and improvements to update_git.sh

OBS-URL: https://build.opensuse.org/request/show/662931
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=443

0001-XXX-dont-dump-core-on-sigabort.patch

@@ -1,7 +1,6 @@
-From 832434a783511ecfd30db4d718dcf15210da866e Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 21 Nov 2011 23:50:36 +0100
-Subject: [PATCH] XXX dont dump core on sigabort
+Subject: XXX dont dump core on sigabort
 
 Signed-off-by: Bruce Rogers <brogers@suse.com>
 ---

0002-qemu-binfmt-conf-Modify-default-pat.patch

@@ -1,7 +1,6 @@
-From ecb8f5651091fb6538366fefc43ecd095328194a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 10 Aug 2016 19:00:24 +0200
-Subject: [PATCH] qemu-binfmt-conf: Modify default path
+Subject: qemu-binfmt-conf: Modify default path
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0003-qemu-cvs-gettimeofday.patch

@@ -1,7 +1,6 @@
-From 540d7a5df50656e9ec56cc78c909c36382814e54 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:25:41 +0200
-Subject: [PATCH] qemu-cvs-gettimeofday
+Subject: qemu-cvs-gettimeofday
 
 No clue what this is for.
 

0004-qemu-cvs-ioctl_debug.patch

@@ -1,7 +1,6 @@
-From 4b8064e9cf51af12d6c57a56fc795774eaf84ade Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:26:33 +0200
-Subject: [PATCH] qemu-cvs-ioctl_debug
+Subject: qemu-cvs-ioctl_debug
 
 Extends unsupported ioctl debug output.
 

0005-qemu-cvs-ioctl_nodirection.patch

@@ -1,7 +1,6 @@
-From ae20a979f7196eca1934f963b52a657374f1ac10 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:27:36 +0200
-Subject: [PATCH] qemu-cvs-ioctl_nodirection
+Subject: qemu-cvs-ioctl_nodirection
 
 the direction given in the ioctl should be correct so we can assume the
 communication is uni-directional. The alsa developers did not like this

0006-linux-user-add-binfmt-wrapper-for-a.patch

@@ -1,7 +1,6 @@
-From 677597f3df31a00bfdfc515744a5acf20a20d204 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 30 Sep 2011 19:40:36 +0200
-Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
+Subject: linux-user: add binfmt wrapper for argv[0] handling
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0007-PPC-KVM-Disable-mmu-notifier-check.patch

@@ -1,7 +1,6 @@
-From 698f8163ca702dd9b7c5e456907178579b7bf4a0 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 6 Jan 2012 01:05:55 +0100
-Subject: [PATCH] PPC: KVM: Disable mmu notifier check
+Subject: PPC: KVM: Disable mmu notifier check
 
 When using hugetlbfs (which is required for HV mode KVM on 970), we
 check for MMU notifiers that on 970 can not be implemented properly.

0008-linux-user-binfmt-support-host-bina.patch

@@ -1,7 +1,6 @@
-From 73f6e4c049e433b4f492916e7366aedd3a970edb Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 18:02:33 +0100
-Subject: [PATCH] linux-user: binfmt: support host binaries
+Subject: linux-user: binfmt: support host binaries
 
 When we have a working host binary equivalent for the guest binary we're
 trying to run, let's just use that instead as it will be a lot faster.

0009-linux-user-Fake-proc-cpuinfo.patch

@@ -1,7 +1,6 @@
-From 650ba31a809fe4d89bf3a0625c07729bbf5af035 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 23 Jul 2012 10:24:14 +0200
-Subject: [PATCH] linux-user: Fake /proc/cpuinfo
+Subject: linux-user: Fake /proc/cpuinfo
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0010-Remove-problematic-evdev-86-key-fro.patch

@@ -1,7 +1,6 @@
-From 1e6c62c45c22da52f13ab2c1aefd0544c0307549 Mon Sep 17 00:00:00 2001
 From: Adam Williamson <awilliam@redhat.com>
 Date: Wed, 20 Dec 2017 15:43:07 -0800
-Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap
+Subject: Remove problematic 'evdev 86' key from en-us keymap
 
 This causes LP#1738283. Gerd will have to come up with a better
 fix, but just hacking out the problematic key definition should

0011-linux-user-use-target_ulong.patch

@@ -1,7 +1,6 @@
-From a4464c46f03789eae3abf93281f1addcbdb53da0 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 9 Oct 2012 09:06:49 +0200
-Subject: [PATCH] linux-user: use target_ulong
+Subject: linux-user: use target_ulong
 
 Linux syscalls pass pointers or data length or other information of that sort
 to the kernel. This is all stuff you don't want to have sign extended.

0012-Make-char-muxer-more-robust-wrt-sma.patch

@@ -1,7 +1,6 @@
-From 35506374079e31a526a7206813ef8f89aecaa04c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Apr 2010 17:36:23 +0200
-Subject: [PATCH] Make char muxer more robust wrt small FIFOs
+Subject: Make char muxer more robust wrt small FIFOs
 
 Virtio-Console can only process one character at a time. Using it on S390
 gave me strage "lags" where I got the character I pressed before when

0013-linux-user-lseek-explicitly-cast-no.patch

@@ -1,7 +1,6 @@
-From 02ce2ef5ff260d7ef395aa31dabd757776a6b67f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 13 Dec 2012 14:29:22 +0100
-Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
+Subject: linux-user: lseek: explicitly cast non-set offsets to signed
 
 When doing lseek, SEEK_SET indicates that the offset is an unsigned variable.
 Other seek types have parameters that can be negative.

0014-AIO-Reduce-number-of-threads-for-32.patch

@@ -1,7 +1,6 @@
-From a2de9e871de89fe1b188dfdb13cc6701eb302b00 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 14 Jan 2015 01:32:11 +0100
-Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts
+Subject: AIO: Reduce number of threads for 32bit hosts
 
 On hosts with limited virtual address space (32bit pointers), we can very
 easily run out of virtual memory with big thread pools.

0015-xen_disk-Add-suse-specific-flush-di.patch

@@ -1,8 +1,7 @@
-From 59d91f48a4a839456fcff66ba375f5c01dd6c42c Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Wed, 9 Mar 2016 15:18:11 -0700
-Subject: [PATCH] xen_disk: Add suse specific flush disable handling and map to
+Subject: xen_disk: Add suse specific flush disable handling and map to QEMU
- QEMU equiv
+ equiv
 
 Add code to read the suse specific suse-diskcache-disable-flush flag out
 of xenstore, and set the equivalent flag within QEMU.

0016-qemu-bridge-helper-reduce-security-.patch

@@ -1,7 +1,6 @@
-From 12e80a565b210d70bc2a230e808ed6102ec3b123 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Tue, 2 Aug 2016 11:36:02 -0600
-Subject: [PATCH] qemu-bridge-helper: reduce security profile
+Subject: qemu-bridge-helper: reduce security profile
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch

@@ -1,7 +1,6 @@
-From 8d32cd58427d7207c1ab44b666a7faf09e270c1b Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@suse.de>
 Date: Fri, 12 Aug 2016 18:20:49 +0200
-Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt
+Subject: qemu-binfmt-conf: use qemu-ARCH-binfmt
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0018-linux-user-properly-test-for-infini.patch

@@ -1,7 +1,6 @@
-From 28321798381384bff19f886b167e25dc15e9fcdf Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@linux-m68k.org>
 Date: Thu, 8 Sep 2016 11:21:05 +0200
-Subject: [PATCH] linux-user: properly test for infinite timeout in poll (#8)
+Subject: linux-user: properly test for infinite timeout in poll (#8)
 
 After "linux-user: use target_ulong" the poll syscall was no longer
 handling infinite timeout.

0019-roms-Makefile-pass-a-packaging-time.patch

@@ -1,8 +1,7 @@
-From 2df2bfd0ca9aabad27114bb778863cfeb76ca111 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Sat, 19 Nov 2016 08:06:30 -0700
-Subject: [PATCH] roms/Makefile: pass a packaging timestamp to subpackages with
+Subject: roms/Makefile: pass a packaging timestamp to subpackages with date
- date info
+ info
 
 Certain rom subpackages build from qemu git-submodules call the date
 program to include date information in the packaged binaries. This

0020-Raise-soft-address-space-limit-to-h.patch

@@ -1,7 +1,6 @@
-From 544752d713e0a6a8a00cae1cbd902d95944d68a2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 15 Jan 2012 19:53:49 +0100
-Subject: [PATCH] Raise soft address space limit to hard limit
+Subject: Raise soft address space limit to hard limit
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0021-increase-x86_64-physical-bits-to-42.patch

@@ -1,7 +1,6 @@
-From da91336daba1034e76118bb089beb312124f0e90 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 17 May 2013 16:49:58 -0600
-Subject: [PATCH] increase x86_64 physical bits to 42
+Subject: increase x86_64 physical bits to 42
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch

@@ -1,7 +1,6 @@
-From 3643b477312298e50ad42cc9ee4b0e047521c1cb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 12 Jun 2013 19:26:37 +0200
-Subject: [PATCH] vga: Raise VRAM to 16 MiB for pc-0.15 and below
+Subject: vga: Raise VRAM to 16 MiB for pc-0.15 and below
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0023-i8254-Fix-migration-from-SLE11-SP2.patch

@@ -1,7 +1,6 @@
-From 52eec29e3edc64659edd2911aae28d82a8893528 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 31 Jul 2013 17:05:29 +0200
-Subject: [PATCH] i8254: Fix migration from SLE11 SP2
+Subject: i8254: Fix migration from SLE11 SP2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0024-acpi_piix4-Fix-migration-from-SLE11.patch

@@ -1,7 +1,6 @@
-From 292bd3fb22d5487b3deecd660d2ab8d0d24d0c82 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 31 Jul 2013 17:32:35 +0200
-Subject: [PATCH] acpi_piix4: Fix migration from SLE11 SP2
+Subject: acpi_piix4: Fix migration from SLE11 SP2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0025-Fix-tigervnc-long-press-issue.patch

@@ -1,7 +1,6 @@
-From 8616cd9931328170f8a4a3ecae6dda9d180601b8 Mon Sep 17 00:00:00 2001
 From: Chunyan Liu <cyliu@suse.com>
 Date: Thu, 3 Mar 2016 16:48:17 +0800
-Subject: [PATCH] Fix tigervnc long press issue
+Subject: Fix tigervnc long press issue
 
 Using xen tools 'xl vncviewer' with tigervnc (default on SLE-12),
 found that: the display of the guest is unexpected while keep

0026-string-input-visitor-Fix-uint64-par.patch

@@ -1,7 +1,6 @@
-From 259d16f0a869f9d2371036a20fb5ff19980e61b8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:21:11 +0200
-Subject: [PATCH] string-input-visitor: Fix uint64 parsing
+Subject: string-input-visitor: Fix uint64 parsing
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0027-test-string-input-visitor-Add-int-t.patch

@@ -1,7 +1,6 @@
-From 1729f9280988abd42f94d5f9a4bae20febac90cb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:23:50 +0200
-Subject: [PATCH] test-string-input-visitor: Add int test case
+Subject: test-string-input-visitor: Add int test case
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0028-test-string-input-visitor-Add-uint6.patch

@@ -1,7 +1,6 @@
-From 327e8a8a3e53dd39c6966dac5428e440ec376514 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:24:23 +0200
-Subject: [PATCH] test-string-input-visitor: Add uint64 test
+Subject: test-string-input-visitor: Add uint64 test
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0029-tests-Add-QOM-property-unit-tests.patch

@@ -1,7 +1,6 @@
-From 310ea98c034bd4c957375b3ebb02b6d43e8d8c09 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 6 Sep 2015 20:12:42 +0200
-Subject: [PATCH] tests: Add QOM property unit tests
+Subject: tests: Add QOM property unit tests
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0030-tests-Add-scsi-disk-test.patch

@@ -1,7 +1,6 @@
-From 3c695b87e039baa1539d8855aeda4ee072bc6a42 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Fri, 25 Sep 2015 12:31:11 +0200
-Subject: [PATCH] tests: Add scsi-disk test
+Subject: tests: Add scsi-disk test
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0031-Switch-order-of-libraries-for-mpath.patch

@@ -1,7 +1,6 @@
-From bd18c7118a50c88b572a0df2f7cc24562ea20767 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 3 Nov 2017 11:12:40 -0600
-Subject: [PATCH] Switch order of libraries for mpath support
+Subject: Switch order of libraries for mpath support
 
 Signed-off-by: Bruce Rogers <brogers@suse.com>
 ---

0032-Make-installed-scripts-explicitly-p.patch

@@ -1,7 +1,6 @@
-From fac5e1c088d083876e9a707e0f7e9d6d05d092c0 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Thu, 25 Jan 2018 14:16:10 -0700
-Subject: [PATCH] Make installed scripts explicitly python3
+Subject: Make installed scripts explicitly python3
 
 We want to expliitly reference python3 in the scripts we install.
 

0033-smbios-Add-1-terminator-if-any-stri.patch

@@ -1,8 +1,6 @@
-From f6b18bb5a86c6bcff0589078e156c116fb3a95af Mon Sep 17 00:00:00 2001
 From: Lin Ma <lma@suse.com>
 Date: Wed, 14 Mar 2018 14:31:26 +0800
-Subject: [PATCH] smbios: Add 1 terminator if any string fields defined in
+Subject: smbios: Add 1 terminator if any string fields defined in given table.
- given table.
 
 If user specifies smbios table files through qemu command line, Then will
 get error messages while decoding those table content in guest.

0034-qemu-io-tests-comment-out-problemat.patch

@@ -1,7 +1,6 @@
-From 9684904be240ac18d63e9b1e8f3293d80a028abe Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 6 Apr 2018 13:33:31 -0600
-Subject: [PATCH] qemu-io tests: comment out problematic block io tests issues
+Subject: qemu-io tests: comment out problematic block io tests issues
 
 The following issues are seen:
 153 - error resulting from failed to get "write" lock

0035-tests-test-thread-pool-is-racy-add-.patch

@@ -1,7 +1,6 @@
-From d58238438527d65192caa54feac77221880b3ba2 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 13 Apr 2018 11:46:47 -0600
-Subject: [PATCH] tests: test-thread-pool is racy - add some barriers
+Subject: tests: test-thread-pool is racy - add some barriers
 
 I imagine there is more to be done to fix the memory consistency
 races here, but these added barriers at least let it pass on ppc64le,

0036-xen-add-block-resize-support-for-xe.patch

@@ -1,7 +1,6 @@
-From 197d3a02669dce7d0ac0207cea5c989cc12b391d Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 8 Jun 2018 11:04:36 -0600
-Subject: [PATCH] xen: add block resize support for xen disks
+Subject: xen: add block resize support for xen disks
 
 Provide monitor naming of xen disks, and plumb guest driver
 notification through xenstore of resizing instigated via the

0037-tests-qemu-iotests-Triple-timeout-o.patch

@@ -1,7 +1,6 @@
-From ea96fb81295d2c6e5ed20201dc3c9583d2b8bb4c Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Tue, 20 Nov 2018 15:46:41 -0700
-Subject: [PATCH] tests/qemu-iotests: Triple timeout of i/o tests due to obs
+Subject: tests/qemu-iotests: Triple timeout of i/o tests due to obs
  environment
 
 Executing tests in obs is very fickle, since you aren't guaranteed

0038-tests-block-io-test-130-needs-some-.patch

@@ -1,7 +1,6 @@
-From 20ab0810e2eab9dc47fab57bb1949e1a84c8cba5 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Sun, 25 Nov 2018 18:01:36 -0700
-Subject: [PATCH] tests: block-io test 130 needs some delays
+Subject: tests: block-io test 130 needs some delays
 
 I haven't figured out exactly the best solution, but we need some delays
 in this test.

0039-xen_disk-Avoid-repeated-memory-allo.patch

@@ -1,7 +1,6 @@
-From f88c2f1b54da7a92420724189a6df37e6b3faed3 Mon Sep 17 00:00:00 2001
 From: Tim Smith <tim.smith@citrix.com>
 Date: Fri, 2 Nov 2018 10:01:09 +0000
-Subject: [PATCH] xen_disk: Avoid repeated memory allocation
+Subject: xen_disk: Avoid repeated memory allocation
 
 xen_disk currently allocates memory to hold the data for each ioreq
 as that ioreq is used, and frees it afterwards. Because it requires

qemu-linux-user.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Jan  4 19:53:55 UTC 2019 - Bruce Rogers <brogers@suse.com>
+
+- Follow up on ideas prompted by last change: clean up the patches
+  generated by git workflow. There is no value to the first line
+  (mbox From line), or [PATCH] on subject line. Get rid of those
+- Other minor fixes and improvements to update_git.sh
+
+-------------------------------------------------------------------
+Thu Jan  3 14:12:56 UTC 2019 - olaf@aepfle.de
+
+- Modify update_git.sh script:
+  pass --zero-commit to format-patch
+  This removes needless noise in the buildservice when the same set
+  of patches is imported/exported at different times by different users.
+  pass --no-signature to format-patch
+  Remove sed call which used to remove the signature, use mv instead
+
 -------------------------------------------------------------------
 Wed Dec 12 21:33:15 UTC 2018 - Bruce Rogers <brogers@suse.com>
 

qemu-linux-user.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-linux-user
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

qemu-linux-user.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-linux-user
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

qemu-testsuite.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  4 19:53:55 UTC 2019 - Bruce Rogers <brogers@suse.com>
+
+- Follow up on ideas prompted by last change: clean up the patches
+  generated by git workflow. There is no value to the first line
+  (mbox From line), or [PATCH] on subject line. Get rid of those
+- Other minor fixes and improvements to update_git.sh
+
 -------------------------------------------------------------------
 Thu Jan  3 14:12:56 UTC 2019 - olaf@aepfle.de
 

qemu-testsuite.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-testsuite
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

qemu.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  4 19:53:55 UTC 2019 - Bruce Rogers <brogers@suse.com>
+
+- Follow up on ideas prompted by last change: clean up the patches
+  generated by git workflow. There is no value to the first line
+  (mbox From line), or [PATCH] on subject line. Get rid of those
+- Other minor fixes and improvements to update_git.sh
+
 -------------------------------------------------------------------
 Thu Jan  3 14:12:56 UTC 2019 - olaf@aepfle.de
 

qemu.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

qemu.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

update_git.sh

@@ -213,10 +213,9 @@ else # not based on LATEST upstream master, rather any upstream commitish
     WRITE_LOG=1
 fi
 
-(cd $GIT_DIR && git format-patch -N --stat=72 --indent-heuristic \
+(cd $GIT_DIR && git format-patch -N --suffix= --no-renames -o $CMP_DIR -k \
-    --zero-commit \
+    --stat=72 --indent-heuristic --zero-commit --no-signature \
-    --no-signature \
+    $GIT_UPSTREAM_COMMIT_ISH >/dev/null)
-    $GIT_UPSTREAM_COMMIT_ISH --suffix= -o $CMP_DIR --no-renames >/dev/null)
 
 check_patch()
 {
@@ -239,11 +238,10 @@ rm -rf $GIT_DIR
 
     shopt -s nullglob
 
-    # Process patches to eliminate useless differences: limit file names to 40
+    # limit patch base file name to 40 chars ('30' is for path length)
-    # chars before extension and remove git signature. ('30' below gets us past
-    # dir prefix)
     for i in $CMP_DIR/*; do
-        mv $i $CMP_DIR/${i:30:40}.patch
+        tail -n +2 $i > $CMP_DIR/${i:30:40}.patch
+	rm $i
     done
 
     for i in 0???-*.patch; do
@@ -276,7 +274,7 @@ rm -rf $GIT_DIR
     rm -f checkpatch.pl
     if [ -s checkpatch.log ]; then
         echo "WARNING: Issues reported by qemu patch checker. Please handle" \
-            "ERRORS now:"
+            "ERROR items now:"
         cat checkpatch.log
     fi
     rm -f checkpatch.log
@@ -315,8 +313,8 @@ rm -rf $GIT_DIR
             elif [[ "$line" =~ ^Source: ]]; then
                 echo "$line"
                 if [ ${#QEMU_TARBALL_SIG[@]} -eq 1 ]; then
-                    # We assume the signature file is right
+                    # We assume the signature file corresponds - just add .sig
-                    echo "$(echo $line|sed 's/^Source*/&99/').sig"
+                    echo "$line.sig"|sed 's/^Source:  /Source99:/'
                 fi
             elif [ "$line" = "SEABIOS_VERSION" ]; then
                 echo "Version:        $SEABIOS_VERSION"
@@ -371,8 +369,12 @@ sed -e 's|^\(Name:.*qemu\)|\1-testsuite|' < qemu.spec > qemu-testsuite.spec
 sed -i 's/^# spec file for package qemu/&-testsuite/' qemu-testsuite.spec
 
 if [ "$1" = "-f" ]; then
-    echo "running osc service to format spec file"
+    if [ "$(rpm -q --queryformat '%{VERSION}' obs-service-format_spec_file)" -lt "20180820" ]; then
-    osc service localrun format_spec_file
+        echo "WARNING! Not running osc format-spec-file service - recent obs package needed"
+    else
+        echo "running osc service to format spec file"
+        osc service localrun format_spec_file
+    fi
 else
     echo "note: not running osc format_spec_file service. If desired, pass -f"
 fi