SHA256
1
0
forked from pool/qemu
Bruce Rogers 2012-02-28 04:13:32 +00:00 committed by Git OBS Bridge
parent 0f0c05abe1
commit bc1786fe60
3 changed files with 57 additions and 23 deletions

View File

@ -99,12 +99,16 @@ BuildRequires: libfdt1-devel
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
BuildRequires: glib2-devel-static BuildRequires: glib2-devel-static
%endif %endif
%if 0%{?suse_version} >= 1130
%ifarch %ix86 x86_64
BuildRequires: libspice-server-devel
BuildRequires: spice-protocol-devel
%endif
%endif
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libspice-server-devel
BuildRequires: libvdeplug3-devel BuildRequires: libvdeplug3-devel
BuildRequires: python BuildRequires: python
BuildRequires: spice-protocol-devel
Requires: timezone Requires: timezone
Requires: virt-utils Requires: virt-utils
@ -184,7 +188,20 @@ run cross architectures builds
# build QEMU # build QEMU
mkdir -p dynamic mkdir -p dynamic
# build qemu-system # build qemu-system
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir --interp-prefix=%_datadir/%name/qemu-i386 --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user --enable-spice ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--interp-prefix=%_datadir/%name/qemu-i386 \
--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
%if 0%{?suse_version} >= 1130
%ifarch %ix86 x86_64
--enable-spice
%else
--disable-spice
%endif
%else
--disable-spice
%endif
# curl test fails for no reason in build system # curl test fails for no reason in build system
echo "CONFIG_CURL=y" >> config-host.mak echo "CONFIG_CURL=y" >> config-host.mak
echo "CURL_LIBS=-lcurl" >> config-host.mak echo "CURL_LIBS=-lcurl" >> config-host.mak
@ -194,7 +211,12 @@ make qemu-img V=1
mv */qemu */qemu-* qemu-io dynamic || true mv */qemu */qemu-* qemu-io dynamic || true
make clean make clean
# build userland emus # build userland emus
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir --interp-prefix=%_datadir/%name/qemu-i386 --enable-linux-user --disable-system --static --disable-linux-aio --extra-cflags="$QEMU_OPT_FLAGS" ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--interp-prefix=%_datadir/%name/qemu-i386 \
--enable-linux-user \
--disable-system \
--static --disable-linux-aio \
--extra-cflags="$QEMU_OPT_FLAGS"
make %{?jobs:-j%jobs} V=1 make %{?jobs:-j%jobs} V=1
%install %install

View File

@ -1,7 +1,7 @@
# #
# spec file for package qemu # spec file for package qemu
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,20 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: qemu Name: qemu
Url: http://fabrice.bellard.free.fr/qemu/ Url: http://fabrice.bellard.free.fr/qemu/
License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar)
Group: System/Emulators/PC
Summary: Universal CPU emulator Summary: Universal CPU emulator
Version: 1.0 License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT
Group: System/Emulators/PC
Version: 1.0.1
Release: 0 Release: 0
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
PATCH_FILES PATCH_FILES
# this is to make lint happy # this is to make lint happy
Source300: rpmlintrc Source300: rpmlintrc
Source400: update_git.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: bison BuildRequires: bison
@ -55,12 +54,16 @@ BuildRequires: libfdt1-devel
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
BuildRequires: glib2-devel-static BuildRequires: glib2-devel-static
%endif %endif
%if 0%{?suse_version} >= 1130
%ifarch %ix86 x86_64
BuildRequires: libspice-server-devel
BuildRequires: spice-protocol-devel
%endif
%endif
BuildRequires: libvdeplug3-devel BuildRequires: libvdeplug3-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libspice-server-devel
BuildRequires: python BuildRequires: python
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: spice-protocol-devel
Requires: timezone Requires: timezone
Requires: virt-utils Requires: virt-utils
@ -95,11 +98,20 @@ PATCH_EXEC
# build QEMU # build QEMU
mkdir -p dynamic mkdir -p dynamic
# build qemu-system # build qemu-system
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\
--interp-prefix=%_datadir/%name/qemu-i386 \ --interp-prefix=%_datadir/%name/qemu-i386 \\
--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \\
--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \\
--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user --enable-spice --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \\
%if 0%{?suse_version} >= 1130
%ifarch %ix86 x86_64
--enable-spice
%else
--disable-spice
%endif
%else
--disable-spice
%endif
# curl test fails for no reason in build system # curl test fails for no reason in build system
echo "CONFIG_CURL=y" >> config-host.mak echo "CONFIG_CURL=y" >> config-host.mak
echo "CURL_LIBS=-lcurl" >> config-host.mak echo "CURL_LIBS=-lcurl" >> config-host.mak
@ -109,11 +121,11 @@ make qemu-img V=1
mv */qemu */qemu-* qemu-io dynamic || true mv */qemu */qemu-* qemu-io dynamic || true
make clean make clean
# build userland emus # build userland emus
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\
--interp-prefix=%_datadir/%name/qemu-i386 \ --interp-prefix=%_datadir/%name/qemu-i386 \\
--enable-linux-user \ --enable-linux-user \\
--disable-system \ --disable-system \\
--static --disable-linux-aio \ --static --disable-linux-aio \\
--extra-cflags="$QEMU_OPT_FLAGS" --extra-cflags="$QEMU_OPT_FLAGS"
make %{?jobs:-j%jobs} V=1 make %{?jobs:-j%jobs} V=1

View File

@ -38,7 +38,7 @@ while read line; do
if [ "$line" = "PATCH_FILES" ]; then if [ "$line" = "PATCH_FILES" ]; then
for i in 0*; do for i in 0*; do
NUM=${i%%-*} NUM=${i%%-*}
echo "Patch$NUM: $i" echo -e "Patch$NUM:\t$i"
done done
elif [ "$line" = "PATCH_EXEC" ]; then elif [ "$line" = "PATCH_EXEC" ]; then
for i in 0*; do for i in 0*; do