Author: sparky Date: Mon Nov 13 12:42:01 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %build_kernel_modules, %install_kernel_modules (not tested)
---- Files affected: SPECS: X11-driver-firegl.spec (1.133 -> 1.134) ---- Diffs: ================================================================ Index: SPECS/X11-driver-firegl.spec diff -u SPECS/X11-driver-firegl.spec:1.133 SPECS/X11-driver-firegl.spec:1.134 --- SPECS/X11-driver-firegl.spec:1.133 Thu Nov 2 14:46:16 2006 +++ SPECS/X11-driver-firegl.spec Mon Nov 13 13:41:56 2006 @@ -43,7 +43,7 @@ #BuildRequires: X11-devel >= %{_min_eq_x11} # disabled for now %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.14} %{?with_userspace:BuildRequires: qt-devel} -BuildRequires: rpmbuild(macros) >= 1.308 +BuildRequires: rpmbuild(macros) >= 1.326 Requires: X11-OpenGL-core >= %{_min_eq_x11} Requires: X11-Xserver %{?with_kernel:Requires: X11-driver-firegl(kernel)} @@ -135,24 +135,7 @@ %if %{with kernel} cd common/lib/modules/fglrx/build_mod cp -f 2.6.x/Makefile . -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} - %{__make} -C %{_kernelsrcdir} modules \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - mv fglrx{,-$cfg}.ko -done +%build_kernel_modules -m fglrx cd - %endif @@ -169,16 +152,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with kernel} -cd common/lib/modules/fglrx/build_mod -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc - -install fglrx-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/fglrx.ko -%if %{with smp} && %{with dist_kernel} -install fglrx-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/fglrx.ko -%endif -cd - +%install_kernel_modules -m common/lib/modules/fglrx/build_mod/fglrx -d misc %endif %if %{with userspace} @@ -267,6 +241,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.134 2006/11/13 12:41:56 sparky +- use %build_kernel_modules, %install_kernel_modules (not tested) + Revision 1.133 2006/11/02 13:46:16 matkor - Now builds on @2.6.18.1_4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/X11-driver-firegl.spec?r1=1.133&r2=1.134&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit