Author: sparky Date: Mon Nov 13 12:38:15 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - %{_alt_kernel} support - use %build_kernel_modules, %install_kernel_modules (not tested)
---- Files affected: SPECS: qemu.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/qemu.spec diff -u SPECS/qemu.spec:1.61 SPECS/qemu.spec:1.62 --- SPECS/qemu.spec:1.61 Mon Nov 13 00:35:03 2006 +++ SPECS/qemu.spec Mon Nov 13 13:38:10 2006 @@ -42,10 +42,10 @@ BuildRequires: alsa-lib-devel %{!?with_gcc4:BuildRequires: gcc < 5:4.0} %if %{with kqemu} && %{with dist_kernel} -BuildRequires: kernel-module-build >= 3:2.6.7 +BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7 %endif BuildRequires: perl-tools-pod -BuildRequires: rpmbuild(macros) >= 1.217 +BuildRequires: rpmbuild(macros) >= 1.326 BuildRequires: tetex BuildRequires: sed >= 4.0 Requires: SDL >= 1.2.1 @@ -87,7 +87,7 @@ używane do wirtualnego hostowania kilku wirtualnych pecetów na pojedynczym serwerze. -%package -n kernel-misc-kqemu +%package -n kernel%{_alt_kernel}-misc-kqemu Summary: kqemu - kernel module Summary(pl): kqemu - moduł jądra Version: %{_kqemu_version} @@ -98,13 +98,13 @@ Requires(post,postun): /sbin/depmod Requires: module-init-tools >= 3.2.2-2 -%description -n kernel-misc-kqemu +%description -n kernel%{_alt_kernel}-misc-kqemu kqemu - kernel module. -%description -n kernel-misc-kqemu -l pl +%description -n kernel%{_alt_kernel}-misc-kqemu -l pl kqemu - moduł jądra. -%package -n kernel-smp-misc-kqemu +%package -n kernel%{_alt_kernel}-smp-misc-kqemu Summary: kqemu - SMP kernel module Summary(pl): kqemu - moduł jądra SMP Version: %{_kqemu_version} @@ -115,10 +115,10 @@ Requires(post,postun): /sbin/depmod Requires: module-init-tools >= 3.2.2-2 -%description -n kernel-smp-misc-kqemu +%description -n kernel%{_alt_kernel}-smp-misc-kqemu kqemu - SMP kernel module. -%description -n kernel-smp-misc-kqemu -l pl +%description -n kernel%{_alt_kernel}-smp-misc-kqemu -l pl kqemu - moduł jądra SMP. %prep @@ -163,34 +163,14 @@ %if %{with kernel} cd kqemu-%{_kqemu_version} mv -f kqemu-linux.c{,.orig} -for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do - if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then - exit 1 - fi - install -d o/include/linux - ln -sf %{_kernelsrcdir}/config-$cfg o/.config - ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers - ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h -%if %{with dist_kernel} - %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts -%else - install -d o/include/config - touch o/include/config/MARKER - ln -sf %{_kernelsrcdir}/scripts o/scripts -%endif - if grep -q "^CONFIG_PREEMPT_RT=y$" o/.config; then - sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(kqemu_lock)/' \ - kqemu-linux.c.orig > kqemu-linux.c - else - cat kqemu-linux.c.orig > kqemu-linux.c - fi - - %{__make} -C %{_kernelsrcdir} modules \ - CC="%{__cc}" CPP="%{__cpp}" \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - mv kqemu.ko kqemu-mod-$cfg.ko -done +%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)/' \ + kqemu-linux.c.orig > kqemu-linux.c +else + cat kqemu-linux.c.orig > kqemu-linux.c +fi +EOF cd - %endif @@ -232,12 +212,10 @@ %endif %if %{with kernel} -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc +%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 kqemu-%{_kqemu_version}/kqemu-mod-up.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/kqemu.ko install modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/kqemu.conf %if %{with smp} && %{with dist_kernel} -install kqemu-%{_kqemu_version}/kqemu-mod-smp.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/kqemu.ko 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 @@ -257,16 +235,16 @@ EOF %endif -%post -n kernel-misc-kqemu +%post -n kernel%{_alt_kernel}-misc-kqemu %depmod %{_kernel_ver} -%postun -n kernel-misc-kqemu +%postun -n kernel%{_alt_kernel}-misc-kqemu %depmod %{_kernel_ver} -%post -n kernel-smp-misc-kqemu +%post -n kernel%{_alt_kernel}-smp-misc-kqemu %depmod %{_kernel_ver}smp -%postun -n kernel-smp-misc-kqemu +%postun -n kernel%{_alt_kernel}-smp-misc-kqemu %depmod %{_kernel_ver}smp %if %{with userspace} @@ -281,7 +259,7 @@ %endif %if %{with kernel} -%files -n kernel-misc-kqemu +%files -n kernel%{_alt_kernel}-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 @@ -289,7 +267,7 @@ /lib/modules/%{_kernel_ver}/misc/kqemu.ko* %if %{with smp} && %{with dist_kernel} -%files -n kernel-smp-misc-kqemu +%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 @@ -304,6 +282,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.62 2006/11/13 12:38:10 sparky +- %{_alt_kernel} support +- use %build_kernel_modules, %install_kernel_modules (not tested) + Revision 1.61 2006/11/12 23:35:03 undefine - smp ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.61&r2=1.62&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit