Accepting request 749743 from home:bfrogers:branches:Virtualization

- Expose pschange-mc-no "feature", indicating CPU does not have
  the page size change machine check vulnerability (CVE-2018-12207
  bsc#1155812)
  target-i386-add-PSCHANGE_NO-bit-for-the-.patch
- Expose taa-no "feature", indicating CPU does not have the
  TSX Async Abort vulnerability. (CVE-2019-11135 bsc#1152506)
  target-i386-Export-TAA_NO-bit-to-guests.patch
Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.1

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

update_git.sh

@@ -462,8 +462,8 @@ rm -rf $BUNDLE_DIR
     echo "QEMU source version: $SOURCE_VERSION"
     echo "QEMU version extra: $VERSION_EXTRA"
 
-    SEABIOS_VERSION=$(tar JxfO qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz \
-        qemu-$SOURCE_VERSION/roms/seabios/.version | cut -d '-' -f 2)
+    SEABIOS_VERSION=${SEABIOS_VERSION:-$(tar JxfO qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz \
+        qemu-$SOURCE_VERSION/roms/seabios/.version | cut -d '-' -f 2)}
 
     for package in qemu; do
         while IFS= read -r line; do
@@ -507,18 +507,16 @@ rm -rf $BUNDLE_DIR
                         echo "%patch$NUM -p1"
                     fi
                 done
-            elif [ "$line" = "QEMU_VERSION" ]; then
+            elif [ "$line" = "INSERT_VERSIONING" ]; then
                 echo "%define qemuver $QEMU_VERSION$VERSION_EXTRA"
                 echo "%define srcver  $SOURCE_VERSION$VERSION_EXTRA"
-                echo "Version:        %qemuver"
+                echo "%define sbver   $SEABIOS_VERSION"
             elif [[ "$line" =~ ^Source: ]]; then
                 echo "$line"
                 if [ ${#QEMU_TARBALL_SIG[@]} -eq 1 ]; then
 # We assume the signature file corresponds - just add .sig
                     echo "$line.sig"|sed 's/^Source:  /Source99:/'
                 fi
-            elif [ "$line" = "SEABIOS_VERSION" ]; then
-                echo "Version:        $SEABIOS_VERSION"
             else
                 echo "$line"
             fi