SPECS (AC-branch): qemu.spec - merge from LINUX_2_6_22 branch, old one in L...
glen
glen at pld-linux.org
Thu Jul 3 12:32:00 CEST 2008
Author: glen Date: Thu Jul 3 10:32:00 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
---- Files affected:
SPECS:
qemu.spec (1.85.2.37 -> 1.85.2.38)
---- Diffs:
================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.85.2.37 SPECS/qemu.spec:1.85.2.38
--- SPECS/qemu.spec:1.85.2.37 Sat May 24 01:23:56 2008
+++ SPECS/qemu.spec Thu Jul 3 12:31:54 2008
@@ -2,6 +2,7 @@
#
# TODO:
# - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed.
+# - update or drop gcc4 bcond patches
#
# Conditional build:
%bcond_without kqemu # disable KQEMU ACCELERATOR support in QEMU
@@ -12,8 +13,6 @@
%bcond_with gcc4 # use gcc4 patches (broke build on gcc33)
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # build kqemu KERNEL MODULES
-%bcond_without up # don't build up module
-%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace utilities
%if %{without kernel}
@@ -34,7 +33,7 @@
%define qemu_version 0.9.1
%define pname qemu
-%define rel 7
+%define rel 8
Summary: QEMU CPU Emulator
Summary(pl.UTF-8): QEMU - emulator procesora
Name: %{pname}%{_alt_kernel}
@@ -53,7 +52,6 @@
Patch4: %{pname}-gcc4_x86.patch
Patch5: %{pname}-gcc4_ppc.patch
Patch6: %{pname}-nosdlgui.patch
-Patch7: %{pname}-ifup.patch
# Proof of concept, for reference, do not remove
Patch8: %{pname}-kde_virtual_workspaces_hack.patch
# http://gwenole.beauchesne.info/en/projects/qemu
@@ -69,9 +67,9 @@
Patch17: %{pname}-CVE-2008-0928.patch
Patch18: %{pname}-CVE-2008-2004.patch
URL: http://fabrice.bellard.free.fr/qemu/
-%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.330
+%if %{with kernel} && %{with dist_kernel}
+BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7
+BuildRequires: rpmbuild(macros) >= 1.452
%endif
%if %{with userspace}
BuildRequires: SDL-devel >= 1.2.1
@@ -125,12 +123,13 @@
Summary: kqemu - kernel module
Summary(pl.UTF-8): kqemu - moduł jądra
Version: %{kqemu_version}
-Release: %{rel}
+Release: %{rel}@%{_kernel_vermagic}
Group: Base/Kernel
License: GPL v2
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires(post,postun): /sbin/depmod
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires: module-init-tools >= 3.2.2-2
+Obsoletes: kernel%{_alt_kernel}-smp-misc-kqemu
%description -n kernel%{_alt_kernel}-misc-kqemu
kqemu - kernel module.
@@ -138,31 +137,7 @@
%description -n kernel%{_alt_kernel}-misc-kqemu -l pl.UTF-8
kqemu - moduł jądra.
-%package -n kernel%{_alt_kernel}-smp-misc-kqemu
-Summary: kqemu - SMP kernel module
-Summary(pl.UTF-8): kqemu - moduł jądra SMP
-Version: %{kqemu_version}
-Release: %{rel}
-Group: Base/Kernel
-License: GPL v2
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
-Requires(post,postun): /sbin/depmod
-Requires: module-init-tools >= 3.2.2-2
-
-%description -n kernel%{_alt_kernel}-smp-misc-kqemu
-kqemu - SMP kernel module.
-
-%description -n kernel%{_alt_kernel}-smp-misc-kqemu -l pl.UTF-8
-kqemu - moduł jądra SMP.
-
%prep
-%if %{with kernel}
-%if %{with dist_kernel} && %{without up} && %{without smp}
-%{error:%{pname}: If building kernel module You need to enable at least one of up or smp}
-exit 1
-%endif
-%endif
-
%setup -q -n %{pname}-%{qemu_version} %{?with_kernel:-a1}
%patch0 -p1
%patch1 -p1
@@ -175,7 +150,6 @@
%patch5 -p1
%endif
%{?with_nosdlgui:%patch6 -p1}
-%patch7 -p1
#%patch8 -p1
%{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure
@@ -201,7 +175,6 @@
cat <<'EOF' > udev.conf
KERNEL=="kqemu", NAME="%k", MODE="0666"
EOF
-%endif
%if %{with dosguest}
%patch13 -p1
@@ -212,10 +185,7 @@
%patch17 -p2
%patch18 -p0
-%build
-%if %{with kernel}
cd kqemu-%{kqemu_version}
-
%{__sed} -i 's#include ../config-host.mak##' ./common/Makefile
%ifarch %{x8664}
%{__sed} -i 's/^#ARCH=x86_64/ARCH=x86_64/' ./common/Makefile
@@ -235,7 +205,12 @@
$(obj)/kqemu-mod.o: $(src)/kqemu-mod-$(ARCH).o.bin
cp $< $@
EOF
+cd -
+%endif
+%build
+%if %{with kernel}
+cd kqemu-%{kqemu_version}
%build_kernel_modules -m kqemu <<'EOF'
if grep -q "CONFIG_PREEMPT_RT" o/.config; then
sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(kqemu_lock)/' \
@@ -271,14 +246,10 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/sbin
-cat <<'EOF' > $RPM_BUILD_ROOT/sbin/qemu-ifup
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/qemu-ifup
#!/bin/sh
-if [ -f /etc/sysconfig/qemu ]; then
- . /etc/sysconfig/qemu
-fi
-# of course this will work only for one interface. a lot possible to involve
-sudo /sbin/ifconfig $1 ${INTERFACE_ADDR:-172.20.0.1}
+
EOF
%endif
@@ -286,9 +257,6 @@
%install_kernel_modules -m kqemu-%{kqemu_version}/kqemu -d misc
install -d $RPM_BUILD_ROOT/etc/{modprobe.d/%{_kernel_ver}{,smp},udev/rules.d}
install modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/kqemu.conf
-%if %{with smp} && %{with dist_kernel}
-install modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}smp/kqemu.conf
-%endif
install udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/kqemu.rules
%endif
@@ -312,17 +280,11 @@
%postun -n kernel%{_alt_kernel}-misc-kqemu
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-misc-kqemu
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-misc-kqemu
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
%doc README qemu-doc.html qemu-tech.html
-%attr(755,root,root) /sbin/qemu-ifup
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
%attr(755,root,root) %{_bindir}/*
%{_datadir}/qemu
%{_mandir}/man1/qemu.1*
@@ -330,7 +292,6 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-misc-kqemu
%defattr(644,root,root,755)
%doc kqemu-%{kqemu_version}/LICENSE
@@ -339,137 +300,93 @@
/lib/modules/%{_kernel_ver}/misc/kqemu.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-misc-kqemu
-%defattr(644,root,root,755)
-%doc kqemu-%{kqemu_version}/LICENSE
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/kqemu.rules
-%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/%{_kernel_ver}smp/kqemu.conf
-/lib/modules/%{_kernel_ver}smp/misc/kqemu.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.85.2.37 2008/05/23 23:23:56 glen
-- add -CVE-2008-0928.patch, -CVE-2008-2004.patch from gentoo; rel 7
-
-Revision 1.85.2.36 2008-02-19 23:26:25 glen
-- release 6
+Revision 1.85.2.38 2008/07/03 10:31:54 glen
+- merge from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
-Revision 1.85.2.35 2008-02-15 01:29:33 glen
-- use kernel vermagic in deps
+Revision 1.109.2.1 2008-04-04 21:38:18 glen
+- ac deps
-Revision 1.85.2.34 2008-02-12 11:01:04 glen
-- release 4 (kernel-2.6.16.60-4)
+Revision 1.109 2008-04-04 21:19:33 glen
+- userspace build fix merge from AC-branch
-Revision 1.85.2.33 2008-02-06 23:54:09 glen
-- convert to utf8
+Revision 1.108 2008-04-04 21:13:16 glen
+- fixes from AC-branch
-Revision 1.85.2.32 2008-01-30 20:46:55 agaran
-- patches to allow coreboot load and qemu report correct memory size to bios
+Revision 1.107 2008-02-13 00:01:20 wolvverine
+- rel.8
-Revision 1.85.2.31 2008-01-29 12:27:38 glen
-- rel 3
+Revision 1.106 2008-02-11 20:04:24 glen
+- revert
-Revision 1.85.2.30 2008-01-29 11:51:17 glen
-- without kernel dist kernel can't be enabled
+Revision 1.104 2008-02-11 14:16:17 glen
+- gcc4 patches not updated, try without
-Revision 1.85.2.29 2008-01-29 11:26:31 glen
-- undefine kernel and kqemu later, allowing userspace being disabled if alt kernel was wanted
+Revision 1.103 2008-02-11 14:10:09 glen
+- merge with AC-branch
-Revision 1.85.2.28 2008-01-29 09:38:09 glen
-- build ppc only if userspace is wanted
+Revision 1.102 2008-02-11 11:32:48 arekm
+- rel 6
-Revision 1.85.2.27 2008-01-28 09:33:07 glen
-- rel 2 (kernel-2.6.16.60-1)
+Revision 1.101 2008-02-10 22:51:37 wolvverine
+- rel.5
-Revision 1.85.2.26 2008-01-22 23:19:35 glen
-- cosmetics
+Revision 1.100 2008-02-07 00:15:57 glen
+- md5 fix
-Revision 1.85.2.25 2008-01-21 23:44:34 undefine
-- add qemu-ppc_old_binutils.patch to fix build on ppc with our AnCientic
- binutils (don't use function from binutils 2.17, when we use 2.15 on ac
-- release 1 - works fine.
+Revision 1.99 2008-02-07 00:00:01 glen
+- merge qemu 0.9.1 from AC-branch
-Revision 1.85.2.24 2008-01-19 20:57:33 undefine
-- up to 0.9.1
+Revision 1.98 2008-01-21 07:11:35 wolvverine
+- rel.60 for 2.6.22.16-4
-Revision 1.85.2.23 2008-01-18 12:26:08 glen
-- rel 58 (2.6.16.58-1)
+Revision 1.97 2007-12-28 22:00:20 arvenil
+- BR: which
+- sort BRs
-Revision 1.85.2.22 2007/11/06 18:28:31 glen
-- rel 57 (2.6.16.57-1)
+Revision 1.96 2007-12-25 22:17:38 glen
+- rel 59
-Revision 1.85.2.21 2007/11/04 20:22:05 glen
-- prefix src package with alt kernel if present
+Revision 1.95 2007-12-24 05:41:28 wolvverine
+- up rel.5
-Revision 1.85.2.20 2007/11/01 08:24:18 adamg
-- release 56 (rebuild against 2.6.16.56-1)
+Revision 1.94 2007-12-15 22:59:19 glen
+- alt kernel build support
+- move sources alter to prep
-Revision 1.85.2.19 2007/10/22 20:41:53 glen
-- disable userspace for alt kernel
+Revision 1.93 2007-12-14 09:04:53 wolvverine
+- rel.4 for 2.6.22.14-6
-Revision 1.85.2.18 2007/10/22 20:24:59 glen
-- unify kernel macros
+Revision 1.92 2007-12-05 20:54:44 wolvverine
+- rel.3
-Revision 1.85.2.17 2007/10/22 19:48:29 glen
-- allow build without up kernel
+Revision 1.91 2007/10/16 02:38:12 glen
+- there's only one kernel pkg
-Revision 1.85.2.16 2007/10/22 09:00:15 glen
-- allow building without up
-
-Revision 1.85.2.15 2007/10/16 02:30:08 glen
+Revision 1.90 2007/10/16 02:33:49 glen
- add grsec_kernel bcond
-- make -j1 for common dir
-
-Revision 1.85.2.14 2007/10/15 08:26:44 glen
-- rel 55 (kernel 2.6.16.55)
-
-Revision 1.85.2.13 2007/10/15 08:21:38 glen
-- rel drbd.spec (2.6.16.55)
-
-Revision 1.85.2.12 2007/10/01 21:25:45 glen
-- rel 54
-
-Revision 1.85.2.11 2007/09/30 22:17:50 adamg
-- release 53.1 (rebuild against 2.6.16.53-2)
-
-Revision 1.85.2.10 2007/09/05 19:30:12 glen
-- rel 53 (kernel 2.6.16.53)
-
-Revision 1.85.2.9 2007/06/04 08:09:08 glen
-- rel 52 (2.6.16.52)
-
-Revision 1.85.2.8 2007/05/11 06:38:50 glen
-- rel 51 (2.6.16.51)
-
-Revision 1.85.2.7 2007/05/08 12:10:09 glen
-- rel 50 (kernel 2.6.16.50)
-
-Revision 1.85.2.6 2007/04/25 22:11:32 glen
-- rel 5 (kernel 2.6.16.49)
-
-Revision 1.85.2.5 2007/04/18 21:50:14 heretyk
-- added patch to fix crash when using qemu with NICs connected via socket
-- release 4
-
-Revision 1.85.2.4 2007/03/31 22:43:01 hawk
-- don't drop ppc, build w/o kqemu kernel module instead
-- release 3
-Revision 1.85.2.3 2007/03/28 19:40:17 glen
-- rel 2 (kernel 2.6.16.45)
+Revision 1.89 2007/08/05 05:13:24 wolvverine
+- rel.2
-Revision 1.85.2.2 2007/03/20 08:56:37 undefine
-- on AC-branch is still iso, so back to iso from UTF
+Revision 1.88 2007/04/19 21:51:17 twittner
+- qemu-ifup backs to standard location (from /sbin to /etc dir)
+- don't put any content in /etc/qemu-ifup but shebang.
+ What I need and have in qemu-ifup is completely different what
+ was provided by /sbin/qemu-ifup
+
+Revision 1.87 2007/04/17 17:47:51 adamg
+- only one kernel subpackage
+- userspace bcond
+- fixed build (make -j2 broke build)
-Revision 1.85.2.1 2007/03/19 23:05:23 undefine
-- gcc4 disables by default on AC-branch
+Revision 1.86 2007/04/04 18:55:06 qboosh
+- support ppc, just with kqemu disabled
Revision 1.85 2007/03/14 12:05:25 pascalek
- use gcc4 by default (HEAD if for Th)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.85.2.37&r2=1.85.2.38&f=u
More information about the pld-cvs-commit
mailing list