Author: gb
Date: Sat Feb 3 07:26:53 2007
New Revision: 116047
Modified:
packages/cooker/qemu/current/SPECS/qemu.spec
Log:
- remove qvm86 (obsolete)
- SILENT shuffle patches
Modified: packages/cooker/qemu/current/SPECS/qemu.spec
==============================================================================
--- packages/cooker/qemu/current/SPECS/qemu.spec (original)
+++ packages/cooker/qemu/current/SPECS/qemu.spec Sat Feb 3 07:26:53 2007
@@ -3,7 +3,6 @@
%define rel 1
%define release %mkrel %{?cvsdate:0.%{cvsdate}.}%{rel}
%define cvsdate 20070203
-%define qvmdate 20051010
%define targets i386-linux-user arm-linux-user armeb-linux-user
arm-softmmu sparc-linux-user ppc-linux-user i386-softmmu ppc-softmmu
sparc-softmmu x86_64-softmmu mips-softmmu
%define __find_requires %{_builddir}/%{name}-%{version}/find_requires.sh
@@ -21,18 +20,16 @@
Version: %{version}
Release: %{release}
Source0: %{name}-%{version}%{?cvsdate:-%{cvsdate}}.tar.bz2
-Source1: qvm86-%{qvmdate}.tar.bz2
-Source2: kqemu.h
-Patch4: qemu-0.7.0-cross64-mingw32-fixes.patch
-Patch6: qemu-0.8.3-gcc4.patch
-Patch7: qemu-0.7.0-gcc4-dot-syms.patch
-Patch9: qemu-0.7.0-x86_64-direct-jump.patch
-Patch10: qemu-0.8.3-enforce-16byte-boundaries.patch
-Patch15: qemu-0.7.2-no-nptl.patch
-Patch16: qemu-0.8.0-gcc4-hacks.patch
-Patch18: qemu-0.7.2-dyngen-check-stack-clobbers.patch
-Patch20: qemu-0.8.3-osx-intel-port.patch
-Patch21: qemu-0.8.1-fix-errno-tls.patch
+Patch1: qemu-0.8.3-gcc4.patch
+Patch2: qemu-0.7.0-gcc4-dot-syms.patch
+Patch3: qemu-0.8.0-gcc4-hacks.patch
+Patch4: qemu-0.7.2-dyngen-check-stack-clobbers.patch
+Patch5: qemu-0.8.3-enforce-16byte-boundaries.patch
+Patch6: qemu-0.8.3-osx-intel-port.patch
+Patch10: qemu-0.7.0-cross64-mingw32-fixes.patch
+Patch11: qemu-0.7.0-x86_64-direct-jump.patch
+Patch12: qemu-0.7.2-no-nptl.patch
+Patch13: qemu-0.8.1-fix-errno-tls.patch
License: GPL
URL: http://fabrice.bellard.free.fr/qemu/
@@ -59,42 +56,18 @@
used to provide virtual hosting of several virtual PC on a single
server.
-%ifarch %{ix86}
-%define module_name qvm86
-%define module_version 0.0.0.%{qvmdate}
-%package -n dkms-%{module_name}
-License: GPL
-Summary: DKMS-ready kernel-source for QEmu x86 virtualization module
-Url: https://savannah.nongnu.org/projects/qvm86/
-Group: Emulators
-Requires: qemu
-Requires(pre): dkms
-Requires(post): dkms
-
-%description -n dkms-%{module_name}
-qvm86 is a kernel module to provide x86 virtualisation capabilities for the
-qemu emulator. Virtualisation allows "emulated" code to be run natively on
-the host cpu, using the CPU protection mechanisms to intercept and emulate
-priveleged events.
-%endif
-
%prep
-%setup -q -a1
-%patch4 -p1 -b .cross64-mingw32-fixes
-%patch6 -p1 -b .gcc4
-%patch7 -p1 -b .gcc4-dot-syms
-%patch9 -p1 -b .x86_64-direct-jump
-%patch10 -p1 -b .enforce-16byte-boundaries
-%patch15 -p1 -b .no-nptl
-%patch16 -p1 -b .gcc4-hacks
-%patch18 -p1 -b .dyngen-check-stack-clobbers
-%patch20 -p1 -b .osx-intel-port
-%patch21 -p1 -b .fix-errno-tls
-
-mv -f qvm86/Makefile qvm86/Makefile.sav
-echo "clean:" > qvm86/Makefile
-echo "#!/bin/true" > qvm86/install.sh
-cat %{SOURCE2} > qvm86/kqemu.h
+%setup -q
+%patch1 -p1 -b .gcc4
+%patch2 -p1 -b .gcc4-dot-syms
+%patch3 -p1 -b .gcc4-hacks
+%patch4 -p1 -b .dyngen-check-stack-clobbers
+%patch5 -p1 -b .enforce-16byte-boundaries
+%patch6 -p1 -b .osx-intel-port
+%patch10 -p1 -b .cross64-mingw32-fixes
+%patch11 -p1 -b .x86_64-direct-jump
+%patch12 -p1 -b .no-nptl
+%patch13 -p1 -b .fix-errno-tls
%build
# don't use -mtune=generic if it is not supported
@@ -119,47 +92,6 @@
# remove unpackaged files
rm -rf $RPM_BUILD_ROOT%{_docdir}/qemu
-#qvm86
-%ifarch %{ix86}
-mkdir -p %{buildroot}/usr/src/%{module_name}-%{module_version}
-cp -a qvm86/* %{buildroot}/usr/src/%{module_name}-%{module_version}
-mv -f %{buildroot}/usr/src/%{module_name}-%{module_version}/Makefile.sav
%{buildroot}/usr/src/%{module_name}-%{module_version}/Makefile
-cat > %{buildroot}/usr/src/%{module_name}-%{module_version}/dkms.conf <<EOF
-
-PACKAGE_VERSION="%{module_version}"
-
-# Items below here should not have to change with each driver version
-PACKAGE_NAME="%{module_name}"
-MAKE[0]="cd \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build ; make
KERNEL_PATH=\${kernel_source_dir}"
-CLEAN="cd \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build ; make
KERNEL_PATH=\${kernel_source_dir} clean"
-
-BUILT_MODULE_NAME[0]="\$PACKAGE_NAME"
-DEST_MODULE_LOCATION[0]="/kernel/3rdparty/%{module_name}/"
-
-REMAKE_INITRD="no"
-AUTOINSTALL=yes
-
-EOF
-
-mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
-cat > %{buildroot}%{_sysconfdir}/udev/rules.d/qvm86.rules <<EOF
-KERNEL="%{module_name}", MODE="0666"
-EOF
-
-%post -n dkms-%{module_name}
-dkms add -m %{module_name} -v %{module_version} --rpm_safe_upgrade
-dkms build -m %{module_name} -v %{module_version} --rpm_safe_upgrade
-dkms install -m %{module_name} -v %{module_version} --rpm_safe_upgrade
-grep '[^#]*%{module_name}' %{_sysconfdir}/modprobe.preload || echo
%{module_name}>>%{_sysconfdir}/modprobe.preload
-#Load it now so that we don't need to wait until next reboot (except if we
already had one loaded...)
-modprobe %{module_name}
-
-%preun -n dkms-%{module_name}
-sed -i '/.*%{module_name}.*/d' /etc/modprobe.preload
-dkms remove -m %{module_name} -v %{module_version} --rpm_safe_upgrade --all ||:
-
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -186,9 +118,3 @@
%{_datadir}/qemu/keymaps
%{_datadir}/qemu/video.x
%{_datadir}/qemu/openbios-sparc32
-
-%ifarch %{ix86}
-%files -n dkms-%{module_name}
-%_prefix/src/%{module_name}-%{module_version}
-%config(noreplace) %{_sysconfdir}/udev/rules.d/qvm86.rules
-%endif
