Author: wolvverine Date: Wed Dec 5 13:27:07 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - modules macros
---- Files affected: SPECS: unicorn.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/unicorn.spec diff -u SPECS/unicorn.spec:1.7 SPECS/unicorn.spec:1.8 --- SPECS/unicorn.spec:1.7 Fri Apr 27 12:57:38 2007 +++ SPECS/unicorn.spec Wed Dec 5 14:27:02 2007 @@ -24,6 +24,8 @@ Source0: http://www.bewan.com/bewan/drivers/A1012-A1006-A904-A888-A983-%{version}.tgz # Source0-md5: ff9829f03168279a079d05aea780ee99 URL: http://www.bewan.com/ +%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.22} +BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: gtk+-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -33,34 +35,22 @@ %description -l pl.UTF-8 Narzędzia do modemów ADSL Unicorn. -%package -n kernel-net-%{name} +%package -n kernel%{_alt_kernel}-net-%{name} Summary: Unicorn ADSL modem drivers for Linux kernel Summary(pl.UTF-8): Sterowniki do modemów ADSL Unicorn dla jądra Linuksa Release: [EMAIL PROTECTED] +Provides: %{name} +%{?with_dist_kernel:%requires_releq_kernel} Group: Base/Kernel Requires(post,postun): /sbin/depmod -Requires: %{name} = %{version}-%{_rel} +Requires: module-init-tools >= 3.2.2-2 -%description -n kernel-net-%{name} +%description -n kernel%{_alt_kernel}-net-%{name} Unicorn ADSL modem drivers for Linux kernel. -%description -n kernel-net-%{name} -l pl.UTF-8 +%description -n kernel%{_alt_kernel}-net-%{name} -l pl.UTF-8 Sterowniki do modemów ADSL Unicorn dla jądra Linuksa. -%package -n kernel-smp-net-%{name} -Summary: Unicorn ADSL modem drivers for Linux SMP kernel -Summary(pl.UTF-8): Sterowniki do modemów ADSL Unicorn dla jądra Linuksa SMP -Release: [EMAIL PROTECTED] -Group: Base/Kernel -Requires(post,postun): /sbin/depmod -Requires: %{name}-devel = %{version}-%{_rel} - -%description -n kernel-smp-net-%{name} -Unicorn ADSL modem drivers for Linux SMP kernel. - -%description -n kernel-smp-net-%{name} -l pl.UTF-8 -Sterowniki do modemów ADSL Unicorn dla jądra Linuksa SMP. - %prep %setup -q -n %{name} @@ -70,76 +60,14 @@ %endif %if %{with kernel} -%{__make} -C libm - -cd unicorn_pci -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} -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 - %{__make} -C %{_kernelsrcdir} clean \ - KERNEL_SOURCES="$PWD/o" \ - RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - %{__make} -C %{_kernelsrcdir} modules \ - KERNEL_SOURCES="$PWD/o" \ - CC="%{__cc}" CPP="%{__cpp}" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - - mv unicorn_pci_atm{,-$cfg}.ko - mv unicorn_pci_eth{,-$cfg}.ko -done - -%if %{with usb} -cd ../unicorn_usb -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} -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 - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - %{__make} -C %{_kernelsrcdir} modules \ - CC="%{__cc}" CPP="%{__cpp}" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - mv unicorn_usb_atm{,-$cfg}.ko - mv unicorn_usb_eth{,-$cfg}.ko -done -%endif +#mv include/linux/autoconf.h include/linux/autoconf-smp.h +cp config-dist config-smp +%build_kernel_modules -m unicorn_{pci_atm,pci_eth,usb_atm,usb_eth} cfgs=dist + +# mv unicorn_pci_atm{,-$cfg}.ko +# mv unicorn_pci_eth{,-$cfg}.ko +# mv unicorn_usb_atm{,-$cfg}.ko +# mv unicorn_usb_eth{,-$cfg}.ko %endif %install @@ -154,40 +82,18 @@ %endif %if %{with kernel} -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc -for mods in atm eth ; do -install unicorn_pci/unicorn_pci_$mods-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/unicorn_pci_$mods.ko -%if %{with usb} -install unicorn_usb/unicorn_usb_$mods-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/unicorn_usb_$mods.ko -%endif -%if %{with smp} && %{with dist_kernel} -install unicorn_pci/unicorn_pci_$mods-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/unicorn_pci_$mods.ko -%if %{with usb} -install unicorn_usb/unicorn_usb_$mods-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/unicorn_usb_$mods.ko -%endif -%endif -done +%install_kernel_modules -s %{_mod_suffix} -n %{name} -m unicorn_{pci_atm,pci_eth,usb_atm,usb_eth} -d net %endif %clean rm -rf $RPM_BUILD_ROOT -%post -n kernel-net-%{name} +%post -n kernel%{_alt_kernel}-net-%{name} %depmod %{_kernel_ver} -%postun -n kernel-net-%{name} +%postun -n kernel%{_alt_kernel}-net-%{name} %depmod %{_kernel_ver} -%post -n kernel-smp-net-%{name} -%depmod %{_kernel_ver}smp - -%postun -n kernel-smp-net-%{name} -%depmod %{_kernel_ver}smp - %if %{with userspace} %files -f bewan_adsl_status.lang %defattr(644,root,root,755) @@ -197,15 +103,9 @@ %endif %if %{with kernel} -%files -n kernel-net-%{name} +%files -n kernel%{_alt_kernel}-net-%{name} %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/* - -%if %{with smp} && %{with dist_kernel} -%files -n kernel-smp-net-%{name} -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}smp/misc/* -%endif %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -214,7 +114,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.7 2007-04-27 10:57:38 qboosh +Revision 1.8 2007-12-05 13:27:02 wolvverine +- modules macros + +Revision 1.7 2007/04/27 10:57:38 qboosh - merged update to 0.9.3 by Irek Slonina Revision 1.6 2007/02/12 22:09:18 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/unicorn.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
