Author: shadzik Date: Sun Nov 19 03:37:48 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use new kernel_build macros - BR: rpmbuild(macros) >= 1.330
---- Files affected: SPECS: slmodem.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/slmodem.spec diff -u SPECS/slmodem.spec:1.30 SPECS/slmodem.spec:1.31 --- SPECS/slmodem.spec:1.30 Sun Nov 19 04:10:31 2006 +++ SPECS/slmodem.spec Sun Nov 19 04:37:43 2006 @@ -32,7 +32,7 @@ URL: http://www.smlink.com/ BuildRequires: %{kgcc_package} %{?with_dist_kernel:BuildRequires: kernel-module-build} -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.330 Requires(post,preun): /sbin/chkconfig Requires: rc-scripts ExclusiveArch: %{ix86} @@ -143,37 +143,11 @@ %build cd drivers -cp amrlibs.o .. +mv amrlibs.o .. +ln -s ../amrlibs.o amrlibs.o %if %{with kernel} -# kernel module(s) -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 - %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -o" \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} -cp ../amrlibs.o . - %{__make} -C %{_kernelsrcdir} modules \ -%if "%{_target_base_arch}" != "%{_arch}" - ARCH=%{_target_base_arch} \ - CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \ -%endif - HOSTCC="%{__cc}" \ - CPP="%{__cpp}" \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - mv slamr{,-$cfg}.ko - mv slusb{,-$cfg}.ko - -done +%build_kernel_modules -m slamr,slusb %endif %if %{with userspace} @@ -194,17 +168,7 @@ %endif %if %{with kernel} -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc -install drivers/slamr-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/slamr.ko -install drivers/slusb-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/slusb.ko -%if %{with smp} && %{with dist_kernel} -install drivers/slamr-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/slamr.ko -install drivers/slusb-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/slusb.ko -%endif +%install_kernel_modules -m drivers/slamr,drivers/slusb -d misc %endif %clean @@ -280,6 +244,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.31 2006/11/19 03:37:43 shadzik +- use new kernel_build macros +- BR: rpmbuild(macros) >= 1.330 + Revision 1.30 2006/11/19 03:10:31 shadzik - snap 20061021 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/slmodem.spec?r1=1.30&r2=1.31&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
