starlingx/integ
Code Issues Proposed changes

Upgrade qemu to version 3.0.0

Browse Source 
Note that it now uses keycodemapdb source which was upgraded
earlier.

Story: 2003395
Task: 24521

Change-Id: I551d654c4b5d7c923911d8c33f0b5fca022d1dda
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
This commit is contained in:
Jim Somerville 2018-12-04 14:57:34 -05:00
parent 2bd19e3f8f
commit adf64cb917
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virt/qemu/centos/build_srpm.data
View File

@ -1,8 +1,10 @@
SRC_DIR="$CGCS_BASE/git/qemu" SRC_DIR="$CGCS_BASE/git/qemu"
COPY_LIST="$CGCS_BASE/downloads/kvm-unit-tests.git-4ea7633.tar.bz2 \ COPY_LIST="$CGCS_BASE/downloads/kvm-unit-tests.git-4ea7633.tar.bz2 \
$CGCS_BASE/downloads/keycodemapdb-16e5b07.tar.gz \
$FILES_BASE/* \ $FILES_BASE/* \
$PKG_BASE/qemu/qemu_clean \ $PKG_BASE/qemu/qemu_clean \
$PKG_BASE/qemu/qemu_clean.service \ $PKG_BASE/qemu/qemu_clean.service \
$PKG_BASE/qemu/qemu-system-x86.conf" $PKG_BASE/qemu/qemu-system-x86.conf"
TIS_BASE_SRCREV=c284b3d419e1cc9b1f25661f4f636f19b1399970 TIS_BASE_SRCREV=38441756b70eec5807b5f60dad11a93a91199866
TIS_PATCH_VER=GITREVCOUNT TIS_PATCH_VER=GITREVCOUNT

1
virt/qemu/centos/files/build_configure.sh
View File

@ -60,7 +60,6 @@ fi
--with-pkgversion=${nvr} \ --with-pkgversion=${nvr} \
--with-confsuffix=/${pkgname} \ --with-confsuffix=/${pkgname} \
--with-coroutine=ucontext \ --with-coroutine=ucontext \
--with-system-pixman \
--disable-bluez \ --disable-bluez \
--disable-brlapi \ --disable-brlapi \
--enable-cap-ng \ --enable-cap-ng \

12
virt/qemu/centos/qemu-kvm.spec
View File

@ -82,7 +82,7 @@ Obsoletes: %1 < %{obsoletes_version}
Summary: QEMU is a FAST! processor emulator Summary: QEMU is a FAST! processor emulator
Name: %{pkgname}%{?pkgsuffix} Name: %{pkgname}%{?pkgsuffix}
Version: 2.10.0 Version: 3.0.0
Release: 0%{?_tis_dist}.%{tis_patch_ver} Release: 0%{?_tis_dist}.%{tis_patch_ver}
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
Epoch: 10 Epoch: 10
@ -158,6 +158,7 @@ Source25: kvm-unit-tests.git-4ea7633.tar.bz2
Source26: vhost.conf Source26: vhost.conf
Source27: kvm.conf Source27: kvm.conf
Source28: 95-kvm-memlock.conf Source28: 95-kvm-memlock.conf
Source29: keycodemapdb-16e5b07.tar.gz
#WRS #WRS
Source127: qemu_clean Source127: qemu_clean
@ -422,6 +423,8 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
sed -i.debug 's/"-g $CFLAGS"/"$CFLAGS"/g' configure sed -i.debug 's/"-g $CFLAGS"/"$CFLAGS"/g' configure
%endif %endif
tar xzf %{SOURCE29} -C ui
cp %{SOURCE24} build_configure.sh cp %{SOURCE24} build_configure.sh
./build_configure.sh \ ./build_configure.sh \
@ -593,6 +596,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/s390-zipl.rom
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/s390-ccw.img rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/s390-ccw.img
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/s390-netboot.img rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/s390-netboot.img
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/u-boot.e500 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/u-boot.e500
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/canyonlands.dtb
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/hppa-firmware.img
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/u-boot-sam460-20100605.bin
%ifnarch %{power64} %ifnarch %{power64}
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/spapr-rtas.bin rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{pkgname}/spapr-rtas.bin
@ -794,7 +800,7 @@ exit 0
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%ifarch x86_64 %ifarch x86_64
%{_datadir}/%{pkgname}/acpi-dsdt.aml # %{_datadir}/%{pkgname}/acpi-dsdt.aml
%{_datadir}/%{pkgname}/bios.bin %{_datadir}/%{pkgname}/bios.bin
%{_datadir}/%{pkgname}/bios-256k.bin %{_datadir}/%{pkgname}/bios-256k.bin
%{_datadir}/%{pkgname}/linuxboot.bin %{_datadir}/%{pkgname}/linuxboot.bin
@ -856,7 +862,9 @@ exit 0
%{_bindir}/qemu-img %{_bindir}/qemu-img
%{_bindir}/qemu-io %{_bindir}/qemu-io
%{_bindir}/qemu-nbd %{_bindir}/qemu-nbd
%{_bindir}/qemu-pr-helper
%{_mandir}/man1/qemu-img.1* %{_mandir}/man1/qemu-img.1*
%{_mandir}/man7/qemu-block-drivers.7*
%{_mandir}/man8/qemu-nbd.8* %{_mandir}/man8/qemu-nbd.8*
# WRS: virtfs # WRS: virtfs
%{_mandir}/man1/virtfs-proxy-helper.1* %{_mandir}/man1/virtfs-proxy-helper.1*