Author: tiwek Date: Fri Jan 5 20:30:39 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - use %build_kernel_modules, %install_kernel_modules - added patch for build with kernel >= 2.6.16 - STBR ????
---- Files affected: SPECS: nozomi.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/nozomi.spec diff -u SPECS/nozomi.spec:1.3 SPECS/nozomi.spec:1.4 --- SPECS/nozomi.spec:1.3 Sat Oct 7 16:25:37 2006 +++ SPECS/nozomi.spec Fri Jan 5 21:30:33 2007 @@ -20,6 +20,7 @@ Source0: http://www.pharscape.org/3G/%{name}_%{version}_060703.tar.gz # Source0-md5: 56c822da9fbd95eca422873bafff8cd3 URL: http://www.pharscape.org/ +Patch0: %{name}-tty_dont_flip.patch %{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.14} BuildRequires: rpmbuild(macros) >= 1.286 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -76,51 +77,18 @@ %prep %setup -q -c +%patch0 -p1 echo 'obj-m += nozomi.o' > Makefile %build -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 - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -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 nozomi{,-$cfg}.ko -done +%build_kernel_modules -m nozomi %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/char -install nozomi-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/char/nozomi.ko -%if %{with smp} && %{with dist_kernel} -install nozomi-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/char/nozomi.ko -%endif +%install_kernel_modules -m nozomi -d kernel/drivers/char %clean rm -rf $RPM_BUILD_ROOT @@ -155,6 +123,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2007/01/05 20:30:33 tiwek +- use %build_kernel_modules, %install_kernel_modules +- added patch for build with kernel >= 2.6.16 +- STBR ???? + Revision 1.3 2006/10/07 14:25:37 qboosh - updated to 2.1 (060703) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nozomi.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
