packaging: change version 2.6.0sandbox/hyokeun/qemu-260-test

Change-Id: I0e6282581b9f98a300cba41f1db8b514cb8d75b9

5 files changed, 31 insertions, 33 deletions

diff --git a/packaging/kvm_stat b/packaging/kvm_stat
index 762544b19..722649d2d 100644
--- a/packaging/kvm_stat
+++ b/packaging/kvm_stat
@@ -142,26 +142,26 @@ svm_exit_reasons = {
 }
 
 s390_exit_reasons = {
-	0x000: 'UNKNOWN',
-	0x001: 'EXCEPTION',
-	0x002: 'IO',
-	0x003: 'HYPERCALL',
-	0x004: 'DEBUG',
-	0x005: 'HLT',
-	0x006: 'MMIO',
-	0x007: 'IRQ_WINDOW_OPEN',
-	0x008: 'SHUTDOWN',
-	0x009: 'FAIL_ENTRY',
-	0x010: 'INTR',
-	0x011: 'SET_TPR',
-	0x012: 'TPR_ACCESS',
-	0x013: 'S390_SIEIC',
-	0x014: 'S390_RESET',
-	0x015: 'DCR',
-	0x016: 'NMI',
-	0x017: 'INTERNAL_ERROR',
-	0x018: 'OSI',
-	0x019: 'PAPR_HCALL',
+  0x000: 'UNKNOWN',
+  0x001: 'EXCEPTION',
+  0x002: 'IO',
+  0x003: 'HYPERCALL',
+  0x004: 'DEBUG',
+  0x005: 'HLT',
+  0x006: 'MMIO',
+  0x007: 'IRQ_WINDOW_OPEN',
+  0x008: 'SHUTDOWN',
+  0x009: 'FAIL_ENTRY',
+  0x010: 'INTR',
+  0x011: 'SET_TPR',
+  0x012: 'TPR_ACCESS',
+  0x013: 'S390_SIEIC',
+  0x014: 'S390_RESET',
+  0x015: 'DCR',
+  0x016: 'NMI',
+  0x017: 'INTERNAL_ERROR',
+  0x018: 'OSI',
+  0x019: 'PAPR_HCALL',
 }
 
 vendor_exit_reasons = {
@@ -509,3 +509,4 @@ elif not options.once:
     curses.wrapper(tui, stats)
 else:
     batch(stats)
+
diff --git a/packaging/qemu-2.6.0.tar.bz2.sig b/packaging/qemu-2.6.0.tar.bz2.sig
new file mode 100644
index 000000000..4951d7e73
--- /dev/null
+++ b/packaging/qemu-2.6.0.tar.bz2.sig
diff --git a/packaging/qemu-2.7.0.tar.bz2.sig b/packaging/qemu-2.7.0.tar.bz2.sig
deleted file mode 100644
index af6b643bd..000000000
--- a/packaging/qemu-2.7.0.tar.bz2.sig
+++ /dev/null
diff --git a/packaging/qemu-linux-user.spec b/packaging/qemu-linux-user.spec
index 1f5a1ec7a..bdeb7a66f 100644
--- a/packaging/qemu-linux-user.spec
+++ b/packaging/qemu-linux-user.spec
@@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.7.0
+Version:        2.6.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.7.0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.6.0.tar.bz2
 Source300:      qemu-rpmlintrc
 Source400:      update_git.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -75,7 +75,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.7.0
+%setup -q -n qemu-2.6.0
 
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
diff --git a/packaging/qemu.spec b/packaging/qemu.spec
index f2c8d36c5..f15a233b7 100644
--- a/packaging/qemu.spec
+++ b/packaging/qemu.spec
@@ -67,10 +67,10 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.7.0
+Version:        2.6.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.7.0.tar.bz2
-Source99:       http://wiki.qemu.org/download/qemu-2.7.0.tar.bz2.sig
+Source:         http://wiki.qemu.org/download/qemu-2.6.0.tar.bz2
+Source99:       http://wiki.qemu.org/download/qemu-2.6.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -301,8 +301,8 @@ Recommends:     qemu-ksm = %{version}
 %endif
 
 %ifarch x86_64
-%define x86_64_only_b_f_f {efi-e1000.rom efi-e1000e.rom efi-eepro100.rom \
-efi-pcnet.rom efi-ne2k_pci.rom efi-rtl8139.rom efi-virtio.rom efi-vmxnet3.rom}
+%define x86_64_only_b_f_f {efi-e1000.rom efi-eepro100.rom \
+efi-pcnet.rom efi-ne2k_pci.rom efi-rtl8139.rom efi-virtio.rom}
 %endif
 %define built_firmware_files {bios.bin bios-256k.bin sgabios.bin vgabios.bin \
 vgabios-cirrus.bin vgabios-stdvga.bin vgabios-virtio.bin vgabios-vmware.bin \
@@ -652,7 +652,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.7.0
+%setup -q -n qemu-2.6.0
 
 %if %{build_x86_fw_from_source}
 pushd roms/seabios
@@ -1063,7 +1063,7 @@ fi
 %doc %_mandir/man1/qemu.1.gz
 %dir %_datadir/%name
 %_datadir/%name/keymaps
-%_datadir/%name/trace-events-all
+%_datadir/%name/trace-events
 %_datadir/%name/qemu-icon.bmp
 %_datadir/%name/qemu_logo_no_text.svg
 %dir %_sysconfdir/%name
@@ -1088,7 +1088,6 @@ fi
 %_bindir/qemu-system-x86_64
 %_datadir/%name/kvmvapic.bin
 %_datadir/%name/linuxboot.bin
-%_datadir/%name/linuxboot_dma.bin
 %_datadir/%name/multiboot.bin
 
 %files ppc
@@ -1217,13 +1216,11 @@ fi
 %_datadir/%name/pxe-rtl8139.rom
 %_datadir/%name/pxe-virtio.rom
 %_datadir/%name/efi-e1000.rom
-%_datadir/%name/efi-e1000e.rom
 %_datadir/%name/efi-eepro100.rom
 %_datadir/%name/efi-pcnet.rom
 %_datadir/%name/efi-ne2k_pci.rom
 %_datadir/%name/efi-rtl8139.rom
 %_datadir/%name/efi-virtio.rom
-%_datadir/%name/efi-vmxnet3.rom
 %endif
 
 %files tools