Author: adamg Date: Fri Apr 14 15:32:58 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - up packages shouldn't require smp kernel (noticed by Enleth) - fix build on 2.6.16
---- Files affected: SPECS: rt2x00.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/rt2x00.spec diff -u SPECS/rt2x00.spec:1.5 SPECS/rt2x00.spec:1.6 --- SPECS/rt2x00.spec:1.5 Wed Apr 12 14:15:40 2006 +++ SPECS/rt2x00.spec Fri Apr 14 17:32:53 2006 @@ -20,6 +20,7 @@ Group: Base/Kernel Source0: http://rt2x00.serialmonkey.com/%{name}-%{version}-%{_subver}.tar.gz # Source0-md5: 4881d742ee49d3ea12c435a91deacd41 +Patch0: %{name}-build.patch URL: http://rt2x00.serialmonkey.com/ %{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7} BuildRequires: rpmbuild(macros) >= 1.217 @@ -43,8 +44,8 @@ Group: Base/Kernel Requires(post,postun): /sbin/depmod %if %{with dist_kernel} -%requires_releq_kernel_smp -Requires(postun): %releq_kernel_smp +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up %endif %description -n kernel-net-rt2x00 @@ -76,6 +77,7 @@ %prep %setup -q -n %{name}-%{version}-%{_subver} +%patch0 -p1 %build # kernel module(s) @@ -84,19 +86,19 @@ exit 1 fi rm -rf include - install -d include/{linux,config} - ln -sf %{_kernelsrcdir}/config-$cfg .config - ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h + install -d o/include/{linux,config} + ln -sf %{_kernelsrcdir}/config-$cfg o/.config + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h %ifarch ppc ppc64 - install -d include/asm - [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm - [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm + install -d o/include/asm + [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm + [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm %else - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm + ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm %endif - ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers - touch include/config/MARKER - %{__make} -C %{_kernelsrcdir} O=$PWD scripts + ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers + touch o/include/config/MARKER + %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts %{__make} clean %{__make} -C %{_kernelsrcdir} modules \ %if "%{_target_base_arch}" != "%{_arch}" @@ -104,7 +106,7 @@ CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \ %endif HOSTCC="%{__cc}" \ - M=$PWD O=$PWD \ + M=$PWD O=$PWD/o \ %{?with_verbose:V=1} mkdir o-$cfg mv *.ko o-$cfg/ @@ -156,6 +158,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2006/04/14 15:32:53 adamg +- up packages shouldn't require smp kernel (noticed by Enleth) +- fix build on 2.6.16 + Revision 1.5 2006/04/12 12:15:40 glen - add kernel epoch, adapterized ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rt2x00.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
