Accepting request 176308 from home:a_faerber:branches:Virtualization
Split off qemu-linux-user - this simplifies each build and decouples them, with the nice side-effect of fixing at least the qemu{,-tools,-guest-agent} SLE_11_SP2 x86_64 build.
OBS-URL: https://build.opensuse.org/request/show/176308
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=138
This commit is contained in:
Andreas Färber
Git OBS Bridge
parent
3f1aa4ed8c
commit
a719eba817
1237
qemu-linux-user.changes
Normal file
1237
qemu-linux-user.changes
Normal file
File diff suppressed because it is too large
Load Diff
241
qemu-linux-user.spec
Normal file
241
qemu-linux-user.spec
Normal file
@ -0,0 +1,241 @@
|
|||||||
|
#
|
||||||
|
# spec file for package qemu-linux-user
|
||||||
|
#
|
||||||
|
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
Name: qemu-linux-user
|
||||||
|
Url: http://www.qemu.org/
|
||||||
|
Summary: Universal CPU emulator
|
||||||
|
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||||
|
Group: System/Emulators/PC
|
||||||
|
Version: 1.5.0
|
||||||
|
Release: 0
|
||||||
|
Source: qemu-%version.tar.bz2
|
||||||
|
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch
|
||||||
|
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
|
||||||
|
Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch.patch
|
||||||
|
Patch0004: 0004-qemu-cvs-alsa_bitfield.patch.patch
|
||||||
|
Patch0005: 0005-qemu-cvs-alsa_ioctl.patch.patch
|
||||||
|
Patch0006: 0006-qemu-cvs-alsa_mmap.patch.patch
|
||||||
|
Patch0007: 0007-qemu-cvs-gettimeofday.patch.patch
|
||||||
|
Patch0008: 0008-qemu-cvs-ioctl_debug.patch.patch
|
||||||
|
Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch.patch
|
||||||
|
Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch
|
||||||
|
Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch
|
||||||
|
Patch0012: 0012-linux-user-Ignore-timer_create-sysc.patch
|
||||||
|
Patch0013: 0013-linux-user-be-silent-about-capget-f.patch
|
||||||
|
Patch0014: 0014-PPC-KVM-Disable-mmu-notifier-check..patch
|
||||||
|
Patch0015: 0015-linux-user-fix-segfault-deadlock.pa.patch
|
||||||
|
Patch0016: 0016-linux-user-binfmt-support-host-bina.patch
|
||||||
|
Patch0017: 0017-linux-user-arm-no-tb_flush-on-reset.patch
|
||||||
|
Patch0018: 0018-linux-user-Ignore-broken-loop-ioctl.patch
|
||||||
|
Patch0019: 0019-linux-user-fix-segmentation-fault-p.patch
|
||||||
|
Patch0020: 0020-linux-user-lock-tcg.patch.patch
|
||||||
|
Patch0021: 0021-linux-user-Run-multi-threaded-code-.patch
|
||||||
|
Patch0022: 0022-linux-user-lock-tb-flushing-too.pat.patch
|
||||||
|
Patch0023: 0023-linux-user-Fake-proc-cpuinfo.patch.patch
|
||||||
|
Patch0024: 0024-linux-user-implement-FS_IOC_GETFLAG.patch
|
||||||
|
Patch0025: 0025-linux-user-implement-FS_IOC_SETFLAG.patch
|
||||||
|
Patch0026: 0026-linux-user-XXX-disable-fiemap.patch.patch
|
||||||
|
Patch0027: 0027-slirp-nooutgoing.patch.patch
|
||||||
|
Patch0028: 0028-vnc-password-file-and-incoming-conn.patch
|
||||||
|
Patch0029: 0029-linux-user-add-more-blk-ioctls.patc.patch
|
||||||
|
Patch0030: 0030-linux-user-use-target_ulong.patch.patch
|
||||||
|
Patch0031: 0031-Add-support-for-DictZip-enabled-gzi.patch
|
||||||
|
Patch0032: 0032-Add-tar-container-format.patch.patch
|
||||||
|
Patch0033: 0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
|
||||||
|
Patch0034: 0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
|
||||||
|
Patch0035: 0035-console-add-question-mark-escape-op.patch
|
||||||
|
Patch0036: 0036-Make-char-muxer-more-robust-wrt-sma.patch
|
||||||
|
Patch0037: 0037-linux-user-lseek-explicitly-cast-en.patch
|
||||||
|
Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||||
|
# this is to make lint happy
|
||||||
|
Source300: rpmlintrc
|
||||||
|
Source400: update_git.sh
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
BuildRequires: SDL-devel
|
||||||
|
BuildRequires: alsa-devel
|
||||||
|
BuildRequires: bison
|
||||||
|
BuildRequires: bluez-devel
|
||||||
|
BuildRequires: curl-devel
|
||||||
|
BuildRequires: cyrus-sasl-devel
|
||||||
|
BuildRequires: e2fsprogs-devel
|
||||||
|
BuildRequires: libaio
|
||||||
|
BuildRequires: libaio-devel
|
||||||
|
BuildRequires: libattr-devel
|
||||||
|
BuildRequires: libcap-devel
|
||||||
|
BuildRequires: libcap-ng-devel
|
||||||
|
BuildRequires: libgnutls-devel
|
||||||
|
BuildRequires: libjpeg-devel
|
||||||
|
BuildRequires: libpcap-devel
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
%if 0%{?suse_version} > 1220
|
||||||
|
BuildRequires: makeinfo
|
||||||
|
%endif
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
# we must not install the qemu package when under qemu build
|
||||||
|
%if 0%{?qemu_user_space_build:1}
|
||||||
|
BuildRequires: -post-build-checks
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1120
|
||||||
|
BuildRequires: zlib-devel-static
|
||||||
|
%else
|
||||||
|
BuildRequires: zlib-devel
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1210
|
||||||
|
BuildRequires: glibc-devel-static
|
||||||
|
BuildRequires: libattr-devel-static
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1140
|
||||||
|
BuildRequires: glib2-devel-static
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1220
|
||||||
|
BuildRequires: pcre-devel-static
|
||||||
|
%endif
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: glib2-devel
|
||||||
|
BuildRequires: pwdutils
|
||||||
|
BuildRequires: python
|
||||||
|
Requires: pwdutils
|
||||||
|
Requires: timezone
|
||||||
|
Provides: qemu:%_bindir/qemu-arm
|
||||||
|
|
||||||
|
%description
|
||||||
|
QEMU is an extremely well-performing CPU emulator that allows you to
|
||||||
|
choose between simulating an entire system and running userspace
|
||||||
|
binaries for different architectures under your native operating
|
||||||
|
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
|
||||||
|
as PC and PowerMac systems.
|
||||||
|
|
||||||
|
This sub-package contains statically linked binaries for running linux-user
|
||||||
|
emulations. This can be used together with the OBS build script to
|
||||||
|
run cross-architecture builds.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n qemu-%version
|
||||||
|
%patch0001 -p1
|
||||||
|
%patch0002 -p1
|
||||||
|
%patch0003 -p1
|
||||||
|
%patch0004 -p1
|
||||||
|
%patch0005 -p1
|
||||||
|
%patch0006 -p1
|
||||||
|
%patch0007 -p1
|
||||||
|
%patch0008 -p1
|
||||||
|
%patch0009 -p1
|
||||||
|
%patch0010 -p1
|
||||||
|
%patch0011 -p1
|
||||||
|
%patch0012 -p1
|
||||||
|
%patch0013 -p1
|
||||||
|
%patch0014 -p1
|
||||||
|
%patch0015 -p1
|
||||||
|
%patch0016 -p1
|
||||||
|
%patch0017 -p1
|
||||||
|
%patch0018 -p1
|
||||||
|
%patch0019 -p1
|
||||||
|
%patch0020 -p1
|
||||||
|
%patch0021 -p1
|
||||||
|
%patch0022 -p1
|
||||||
|
%patch0023 -p1
|
||||||
|
%patch0024 -p1
|
||||||
|
%patch0025 -p1
|
||||||
|
%patch0026 -p1
|
||||||
|
%patch0027 -p1
|
||||||
|
%patch0028 -p1
|
||||||
|
%patch0029 -p1
|
||||||
|
%patch0030 -p1
|
||||||
|
%patch0031 -p1
|
||||||
|
%patch0032 -p1
|
||||||
|
%patch0033 -p1
|
||||||
|
%patch0034 -p1
|
||||||
|
%patch0035 -p1
|
||||||
|
%patch0036 -p1
|
||||||
|
%patch0037 -p1
|
||||||
|
%patch0038 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||||
|
--libexecdir=%_libexecdir \
|
||||||
|
--enable-linux-user \
|
||||||
|
--disable-system \
|
||||||
|
--disable-tools \
|
||||||
|
--disable-guest-agent \
|
||||||
|
--static --disable-linux-aio \
|
||||||
|
--disable-fdt \
|
||||||
|
--without-pixman \
|
||||||
|
--disable-blobs \
|
||||||
|
--disable-strip \
|
||||||
|
--extra-cflags="$QEMU_OPT_FLAGS"
|
||||||
|
%if 0%{?suse_version} == 1140
|
||||||
|
# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime
|
||||||
|
sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak
|
||||||
|
%endif
|
||||||
|
make %{?jobs:-j%jobs} V=1
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu.1
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man1/virtfs-proxy-helper.1
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_datadir/qemu/keymaps
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_sysconfdir/qemu/target-x86_64.conf
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_libexecdir/qemu-bridge-helper
|
||||||
|
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
|
||||||
|
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
|
||||||
|
%ifnarch %ix86 x86_64
|
||||||
|
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
|
||||||
|
%endif
|
||||||
|
%ifnarch ia64
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux
|
||||||
|
%endif
|
||||||
|
%fdupes -s $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%_bindir/qemu-alpha
|
||||||
|
%_bindir/qemu-arm
|
||||||
|
%_bindir/qemu-armeb
|
||||||
|
%_bindir/qemu-cris
|
||||||
|
%_bindir/qemu-i386
|
||||||
|
%_bindir/qemu-m68k
|
||||||
|
%_bindir/qemu-microblaze
|
||||||
|
%_bindir/qemu-microblazeel
|
||||||
|
%_bindir/qemu-mips
|
||||||
|
%_bindir/qemu-mipsel
|
||||||
|
%_bindir/qemu-mipsn32
|
||||||
|
%_bindir/qemu-mipsn32el
|
||||||
|
%_bindir/qemu-mips64
|
||||||
|
%_bindir/qemu-mips64el
|
||||||
|
%_bindir/qemu-or32
|
||||||
|
%_bindir/qemu-ppc64abi32
|
||||||
|
%_bindir/qemu-ppc64
|
||||||
|
%_bindir/qemu-ppc
|
||||||
|
%_bindir/qemu-s390x
|
||||||
|
%_bindir/qemu-sh4
|
||||||
|
%_bindir/qemu-sh4eb
|
||||||
|
%_bindir/qemu-sparc32plus
|
||||||
|
%_bindir/qemu-sparc64
|
||||||
|
%_bindir/qemu-sparc
|
||||||
|
%_bindir/qemu-unicore32
|
||||||
|
%_bindir/qemu-x86_64
|
||||||
|
%_bindir/qemu-*-binfmt
|
||||||
|
%_sbindir/qemu-binfmt-conf.sh
|
||||||
|
|
||||||
|
%changelog
|
||||||
167
qemu-linux-user.spec.in
Normal file
167
qemu-linux-user.spec.in
Normal file
@ -0,0 +1,167 @@
|
|||||||
|
#
|
||||||
|
# spec file for package qemu-linux-user
|
||||||
|
#
|
||||||
|
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
Name: qemu-linux-user
|
||||||
|
Url: http://www.qemu.org/
|
||||||
|
Summary: Universal CPU emulator
|
||||||
|
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||||
|
Group: System/Emulators/PC
|
||||||
|
Version: 1.5.0
|
||||||
|
Release: 0
|
||||||
|
Source: qemu-%version.tar.bz2
|
||||||
|
PATCH_FILES
|
||||||
|
# this is to make lint happy
|
||||||
|
Source300: rpmlintrc
|
||||||
|
Source400: update_git.sh
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
BuildRequires: SDL-devel
|
||||||
|
BuildRequires: alsa-devel
|
||||||
|
BuildRequires: bison
|
||||||
|
BuildRequires: bluez-devel
|
||||||
|
BuildRequires: curl-devel
|
||||||
|
BuildRequires: cyrus-sasl-devel
|
||||||
|
BuildRequires: e2fsprogs-devel
|
||||||
|
BuildRequires: libaio
|
||||||
|
BuildRequires: libaio-devel
|
||||||
|
BuildRequires: libattr-devel
|
||||||
|
BuildRequires: libcap-devel
|
||||||
|
BuildRequires: libcap-ng-devel
|
||||||
|
BuildRequires: libgnutls-devel
|
||||||
|
BuildRequires: libjpeg-devel
|
||||||
|
BuildRequires: libpcap-devel
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
%if 0%{?suse_version} > 1220
|
||||||
|
BuildRequires: makeinfo
|
||||||
|
%endif
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
# we must not install the qemu package when under qemu build
|
||||||
|
%if 0%{?qemu_user_space_build:1}
|
||||||
|
BuildRequires: -post-build-checks
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1120
|
||||||
|
BuildRequires: zlib-devel-static
|
||||||
|
%else
|
||||||
|
BuildRequires: zlib-devel
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1210
|
||||||
|
BuildRequires: glibc-devel-static
|
||||||
|
BuildRequires: libattr-devel-static
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1140
|
||||||
|
BuildRequires: glib2-devel-static
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} >= 1220
|
||||||
|
BuildRequires: pcre-devel-static
|
||||||
|
%endif
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: glib2-devel
|
||||||
|
BuildRequires: pwdutils
|
||||||
|
BuildRequires: python
|
||||||
|
Requires: pwdutils
|
||||||
|
Requires: timezone
|
||||||
|
Provides: qemu:%_bindir/qemu-arm
|
||||||
|
|
||||||
|
%description
|
||||||
|
QEMU is an extremely well-performing CPU emulator that allows you to
|
||||||
|
choose between simulating an entire system and running userspace
|
||||||
|
binaries for different architectures under your native operating
|
||||||
|
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
|
||||||
|
as PC and PowerMac systems.
|
||||||
|
|
||||||
|
This sub-package contains statically linked binaries for running linux-user
|
||||||
|
emulations. This can be used together with the OBS build script to
|
||||||
|
run cross-architecture builds.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n qemu-%version
|
||||||
|
PATCH_EXEC
|
||||||
|
|
||||||
|
%build
|
||||||
|
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||||
|
--libexecdir=%_libexecdir \
|
||||||
|
--enable-linux-user \
|
||||||
|
--disable-system \
|
||||||
|
--disable-tools \
|
||||||
|
--disable-guest-agent \
|
||||||
|
--static --disable-linux-aio \
|
||||||
|
--disable-fdt \
|
||||||
|
--without-pixman \
|
||||||
|
--disable-blobs \
|
||||||
|
--disable-strip \
|
||||||
|
--extra-cflags="$QEMU_OPT_FLAGS"
|
||||||
|
%if 0%{?suse_version} == 1140
|
||||||
|
# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime
|
||||||
|
sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak
|
||||||
|
%endif
|
||||||
|
make %{?jobs:-j%jobs} V=1
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu.1
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man1/virtfs-proxy-helper.1
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_datadir/qemu/keymaps
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_sysconfdir/qemu/target-x86_64.conf
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%_libexecdir/qemu-bridge-helper
|
||||||
|
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
|
||||||
|
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
|
||||||
|
%ifnarch %ix86 x86_64
|
||||||
|
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
|
||||||
|
%endif
|
||||||
|
%ifnarch ia64
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux
|
||||||
|
%endif
|
||||||
|
%fdupes -s $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%_bindir/qemu-alpha
|
||||||
|
%_bindir/qemu-arm
|
||||||
|
%_bindir/qemu-armeb
|
||||||
|
%_bindir/qemu-cris
|
||||||
|
%_bindir/qemu-i386
|
||||||
|
%_bindir/qemu-m68k
|
||||||
|
%_bindir/qemu-microblaze
|
||||||
|
%_bindir/qemu-microblazeel
|
||||||
|
%_bindir/qemu-mips
|
||||||
|
%_bindir/qemu-mipsel
|
||||||
|
%_bindir/qemu-mipsn32
|
||||||
|
%_bindir/qemu-mipsn32el
|
||||||
|
%_bindir/qemu-mips64
|
||||||
|
%_bindir/qemu-mips64el
|
||||||
|
%_bindir/qemu-or32
|
||||||
|
%_bindir/qemu-ppc64abi32
|
||||||
|
%_bindir/qemu-ppc64
|
||||||
|
%_bindir/qemu-ppc
|
||||||
|
%_bindir/qemu-s390x
|
||||||
|
%_bindir/qemu-sh4
|
||||||
|
%_bindir/qemu-sh4eb
|
||||||
|
%_bindir/qemu-sparc32plus
|
||||||
|
%_bindir/qemu-sparc64
|
||||||
|
%_bindir/qemu-sparc
|
||||||
|
%_bindir/qemu-unicore32
|
||||||
|
%_bindir/qemu-x86_64
|
||||||
|
%_bindir/qemu-*-binfmt
|
||||||
|
%_sbindir/qemu-binfmt-conf.sh
|
||||||
|
|
||||||
|
%changelog
|
||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 21 21:13:04 UTC 2013 - afaerber@suse.de
|
||||||
|
|
||||||
|
- Split off qemu-linux-user package into separate .spec file.
|
||||||
|
* Simplified %build and %install sections
|
||||||
|
* Dropped *-static dependencies
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon May 20 21:14:08 UTC 2013 - afaerber@suse.de
|
Mon May 20 21:14:08 UTC 2013 - afaerber@suse.de
|
||||||
|
|
||||||
|
|||||||
99
qemu.spec
99
qemu.spec
@ -99,22 +99,7 @@ BuildRequires: -post-build-checks
|
|||||||
%if 0%{?suse_version} >= 1210
|
%if 0%{?suse_version} >= 1210
|
||||||
BuildRequires: vte2-devel
|
BuildRequires: vte2-devel
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} >= 1120
|
|
||||||
BuildRequires: zlib-devel-static
|
|
||||||
%else
|
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1210
|
|
||||||
BuildRequires: glibc-devel-static
|
|
||||||
BuildRequires: libattr-devel-static
|
|
||||||
BuildRequires: libfdt1-devel
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1140
|
|
||||||
BuildRequires: glib2-devel-static
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1220
|
|
||||||
BuildRequires: pcre-devel-static
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1140
|
%if 0%{?suse_version} >= 1140
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
BuildRequires: libspice-server-devel
|
BuildRequires: libspice-server-devel
|
||||||
@ -187,22 +172,6 @@ as PC and PowerMac systems.
|
|||||||
|
|
||||||
This sub-package contains the guest agent.
|
This sub-package contains the guest agent.
|
||||||
|
|
||||||
%package linux-user
|
|
||||||
Summary: Universal CPU emulator -- Linux User binaries
|
|
||||||
Group: System/Emulators/PC
|
|
||||||
Provides: qemu:%_bindir/qemu-arm
|
|
||||||
|
|
||||||
%description linux-user
|
|
||||||
QEMU is an extremely well-performing CPU emulator that allows you to
|
|
||||||
choose between simulating an entire system and running userspace
|
|
||||||
binaries for different architectures under your native operating
|
|
||||||
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
|
|
||||||
as PC and PowerMac systems.
|
|
||||||
|
|
||||||
This sub-package contains statically linked binaries for running linux-user
|
|
||||||
emulations. This can be used together with the OBS build script to
|
|
||||||
run cross-architecture builds.
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q #-n %name-1.5.0-rc2
|
%setup -q #-n %name-1.5.0-rc2
|
||||||
%patch0001 -p1
|
%patch0001 -p1
|
||||||
@ -245,9 +214,6 @@ run cross-architecture builds.
|
|||||||
%patch0038 -p1
|
%patch0038 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# build QEMU
|
|
||||||
mkdir -p dynamic
|
|
||||||
# build qemu-system
|
|
||||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||||
--libexecdir=%_libexecdir \
|
--libexecdir=%_libexecdir \
|
||||||
--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
|
--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
|
||||||
@ -267,44 +233,10 @@ mkdir -p dynamic
|
|||||||
--disable-spice
|
--disable-spice
|
||||||
%endif
|
%endif
|
||||||
make %{?jobs:-j%jobs} V=1
|
make %{?jobs:-j%jobs} V=1
|
||||||
mv *-softmmu/qemu-system-* dynamic
|
|
||||||
mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
|
|
||||||
mv qemu-img.1 qemu-nbd.8 dynamic
|
|
||||||
mv qemu-ga dynamic
|
|
||||||
mv fsdev/virtfs-proxy-helper{,.1} dynamic
|
|
||||||
make clean
|
|
||||||
# build userland emus
|
|
||||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
|
||||||
--libexecdir=%_libexecdir \
|
|
||||||
--enable-linux-user \
|
|
||||||
--disable-system \
|
|
||||||
--static --disable-linux-aio \
|
|
||||||
--disable-strip \
|
|
||||||
--extra-cflags="$QEMU_OPT_FLAGS"
|
|
||||||
%if 0%{?suse_version} == 1140
|
|
||||||
# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime
|
|
||||||
sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak
|
|
||||||
%endif
|
|
||||||
make %{?jobs:-j%jobs} V=1
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
|
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
|
||||||
install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/virtfs-proxy-helper $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
|
|
||||||
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
|
|
||||||
install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
|
|
||||||
install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
|
|
||||||
install -m 644 dynamic/virtfs-proxy-helper.1 $RPM_BUILD_ROOT/%_mandir/man1
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
|
|
||||||
install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
|
|
||||||
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
|
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
|
||||||
%ifnarch %ix86 x86_64
|
%ifnarch %ix86 x86_64
|
||||||
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
|
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
|
||||||
@ -369,35 +301,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%attr(755,root,kvm) %_bindir/qemu-ga
|
%attr(755,root,kvm) %_bindir/qemu-ga
|
||||||
|
|
||||||
%files linux-user
|
|
||||||
%defattr(-, root, root)
|
|
||||||
%_bindir/qemu-alpha
|
|
||||||
%_bindir/qemu-arm
|
|
||||||
%_bindir/qemu-armeb
|
|
||||||
%_bindir/qemu-cris
|
|
||||||
%_bindir/qemu-i386
|
|
||||||
%_bindir/qemu-m68k
|
|
||||||
%_bindir/qemu-microblaze
|
|
||||||
%_bindir/qemu-microblazeel
|
|
||||||
%_bindir/qemu-mips
|
|
||||||
%_bindir/qemu-mipsel
|
|
||||||
%_bindir/qemu-mipsn32
|
|
||||||
%_bindir/qemu-mipsn32el
|
|
||||||
%_bindir/qemu-mips64
|
|
||||||
%_bindir/qemu-mips64el
|
|
||||||
%_bindir/qemu-or32
|
|
||||||
%_bindir/qemu-ppc64abi32
|
|
||||||
%_bindir/qemu-ppc64
|
|
||||||
%_bindir/qemu-ppc
|
|
||||||
%_bindir/qemu-s390x
|
|
||||||
%_bindir/qemu-sh4
|
|
||||||
%_bindir/qemu-sh4eb
|
|
||||||
%_bindir/qemu-sparc32plus
|
|
||||||
%_bindir/qemu-sparc64
|
|
||||||
%_bindir/qemu-sparc
|
|
||||||
%_bindir/qemu-unicore32
|
|
||||||
%_bindir/qemu-x86_64
|
|
||||||
%_bindir/qemu-*-binfmt
|
|
||||||
%_sbindir/qemu-binfmt-conf.sh
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
99
qemu.spec.in
99
qemu.spec.in
@ -62,22 +62,7 @@ BuildRequires: -post-build-checks
|
|||||||
%if 0%{?suse_version} >= 1210
|
%if 0%{?suse_version} >= 1210
|
||||||
BuildRequires: vte2-devel
|
BuildRequires: vte2-devel
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} >= 1120
|
|
||||||
BuildRequires: zlib-devel-static
|
|
||||||
%else
|
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1210
|
|
||||||
BuildRequires: glibc-devel-static
|
|
||||||
BuildRequires: libattr-devel-static
|
|
||||||
BuildRequires: libfdt1-devel
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1140
|
|
||||||
BuildRequires: glib2-devel-static
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1220
|
|
||||||
BuildRequires: pcre-devel-static
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} >= 1140
|
%if 0%{?suse_version} >= 1140
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
BuildRequires: libspice-server-devel
|
BuildRequires: libspice-server-devel
|
||||||
@ -150,30 +135,11 @@ as PC and PowerMac systems.
|
|||||||
|
|
||||||
This sub-package contains the guest agent.
|
This sub-package contains the guest agent.
|
||||||
|
|
||||||
%package linux-user
|
|
||||||
Summary: Universal CPU emulator -- Linux User binaries
|
|
||||||
Group: System/Emulators/PC
|
|
||||||
Provides: qemu:%_bindir/qemu-arm
|
|
||||||
|
|
||||||
%description linux-user
|
|
||||||
QEMU is an extremely well-performing CPU emulator that allows you to
|
|
||||||
choose between simulating an entire system and running userspace
|
|
||||||
binaries for different architectures under your native operating
|
|
||||||
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
|
|
||||||
as PC and PowerMac systems.
|
|
||||||
|
|
||||||
This sub-package contains statically linked binaries for running linux-user
|
|
||||||
emulations. This can be used together with the OBS build script to
|
|
||||||
run cross-architecture builds.
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q #-n %name-1.5.0-rc2
|
%setup -q #-n %name-1.5.0-rc2
|
||||||
PATCH_EXEC
|
PATCH_EXEC
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# build QEMU
|
|
||||||
mkdir -p dynamic
|
|
||||||
# build qemu-system
|
|
||||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||||
--libexecdir=%_libexecdir \
|
--libexecdir=%_libexecdir \
|
||||||
--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
|
--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
|
||||||
@ -193,44 +159,10 @@ mkdir -p dynamic
|
|||||||
--disable-spice
|
--disable-spice
|
||||||
%endif
|
%endif
|
||||||
make %{?jobs:-j%jobs} V=1
|
make %{?jobs:-j%jobs} V=1
|
||||||
mv *-softmmu/qemu-system-* dynamic
|
|
||||||
mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
|
|
||||||
mv qemu-img.1 qemu-nbd.8 dynamic
|
|
||||||
mv qemu-ga dynamic
|
|
||||||
mv fsdev/virtfs-proxy-helper{,.1} dynamic
|
|
||||||
make clean
|
|
||||||
# build userland emus
|
|
||||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
|
||||||
--libexecdir=%_libexecdir \
|
|
||||||
--enable-linux-user \
|
|
||||||
--disable-system \
|
|
||||||
--static --disable-linux-aio \
|
|
||||||
--disable-strip \
|
|
||||||
--extra-cflags="$QEMU_OPT_FLAGS"
|
|
||||||
%if 0%{?suse_version} == 1140
|
|
||||||
# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime
|
|
||||||
sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak
|
|
||||||
%endif
|
|
||||||
make %{?jobs:-j%jobs} V=1
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
|
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
|
||||||
install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -m 755 dynamic/virtfs-proxy-helper $RPM_BUILD_ROOT/%_bindir
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
|
|
||||||
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
|
|
||||||
install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
|
|
||||||
install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
|
|
||||||
install -m 644 dynamic/virtfs-proxy-helper.1 $RPM_BUILD_ROOT/%_mandir/man1
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
|
|
||||||
install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
|
|
||||||
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
|
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
|
||||||
%ifnarch %ix86 x86_64
|
%ifnarch %ix86 x86_64
|
||||||
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
|
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
|
||||||
@ -295,35 +227,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%attr(755,root,kvm) %_bindir/qemu-ga
|
%attr(755,root,kvm) %_bindir/qemu-ga
|
||||||
|
|
||||||
%files linux-user
|
|
||||||
%defattr(-, root, root)
|
|
||||||
%_bindir/qemu-alpha
|
|
||||||
%_bindir/qemu-arm
|
|
||||||
%_bindir/qemu-armeb
|
|
||||||
%_bindir/qemu-cris
|
|
||||||
%_bindir/qemu-i386
|
|
||||||
%_bindir/qemu-m68k
|
|
||||||
%_bindir/qemu-microblaze
|
|
||||||
%_bindir/qemu-microblazeel
|
|
||||||
%_bindir/qemu-mips
|
|
||||||
%_bindir/qemu-mipsel
|
|
||||||
%_bindir/qemu-mipsn32
|
|
||||||
%_bindir/qemu-mipsn32el
|
|
||||||
%_bindir/qemu-mips64
|
|
||||||
%_bindir/qemu-mips64el
|
|
||||||
%_bindir/qemu-or32
|
|
||||||
%_bindir/qemu-ppc64abi32
|
|
||||||
%_bindir/qemu-ppc64
|
|
||||||
%_bindir/qemu-ppc
|
|
||||||
%_bindir/qemu-s390x
|
|
||||||
%_bindir/qemu-sh4
|
|
||||||
%_bindir/qemu-sh4eb
|
|
||||||
%_bindir/qemu-sparc32plus
|
|
||||||
%_bindir/qemu-sparc64
|
|
||||||
%_bindir/qemu-sparc
|
|
||||||
%_bindir/qemu-unicore32
|
|
||||||
%_bindir/qemu-x86_64
|
|
||||||
%_bindir/qemu-*-binfmt
|
|
||||||
%_sbindir/qemu-binfmt-conf.sh
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
# when it comes.
|
# when it comes.
|
||||||
|
|
||||||
GIT_TREE=git://github.com/openSUSE/qemu.git
|
GIT_TREE=git://github.com/openSUSE/qemu.git
|
||||||
GIT_LOCAL_TREE=/suse/agraf/git/qemu
|
GIT_LOCAL_TREE=/home/andreas/QEMU/qemu-opensuse
|
||||||
GIT_BRANCH=opensuse-1.5
|
GIT_BRANCH=opensuse-1.5
|
||||||
GIT_UPSTREAM_TAG=v1.5.0
|
GIT_UPSTREAM_TAG=v1.5.0
|
||||||
QEMU_TMP=/dev/shm/qemu-tmp
|
QEMU_TMP=/dev/shm/qemu-tmp
|
||||||
@ -20,7 +20,7 @@ QEMU_TMP=/dev/shm/qemu-tmp
|
|||||||
if [ -e 0001-* ]; then
|
if [ -e 0001-* ]; then
|
||||||
osc rm --force 0*
|
osc rm --force 0*
|
||||||
fi
|
fi
|
||||||
rm -f qemu.spec
|
rm -f qemu.spec qemu-linux-user.spec
|
||||||
|
|
||||||
# fetch all patches
|
# fetch all patches
|
||||||
rm -rf $QEMU_TMP
|
rm -rf $QEMU_TMP
|
||||||
@ -49,8 +49,9 @@ for i in 0*; do
|
|||||||
mv "$PATCHNAME.tmp" "$PATCHNAME"
|
mv "$PATCHNAME.tmp" "$PATCHNAME"
|
||||||
done
|
done
|
||||||
|
|
||||||
# we have all patches as files now - generate the spec file!
|
# we have all patches as files now - generate the spec files!
|
||||||
while IFS= read -r line; do
|
for package in qemu qemu-linux-user; do
|
||||||
|
while IFS= read -r 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%%-*}
|
||||||
@ -64,6 +65,7 @@ while IFS= read -r line; do
|
|||||||
else
|
else
|
||||||
echo "$line"
|
echo "$line"
|
||||||
fi
|
fi
|
||||||
done < qemu.spec.in > qemu.spec
|
done < $package.spec.in > $package.spec
|
||||||
|
done
|
||||||
osc add 0*
|
osc add 0*
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user