SPECS: em8300.spec - build system updated.

[pluto]

Author: pluto                        Date: Sun Mar 12 10:22:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build system updated.

---- Files affected:
SPECS:
   em8300.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.38 SPECS/em8300.spec:1.39
--- SPECS/em8300.spec:1.38	Sun Feb 26 18:06:30 2006
+++ SPECS/em8300.spec	Sun Mar 12 11:22:20 2006
@@ -1,11 +1,16 @@
 # $Revision$, $Date$
+#
 # Conditional build:
-%bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
-#
+
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+
 Summary:	DXR3 and H+ driver
 Summary(pl):	Sterowniki dla DXR3 i H+
 Name:		em8300
@@ -24,9 +29,9 @@
 BuildRequires:	automake
 BuildRequires:	gtk+-devel >= 1.2.0
 %endif
-%if %{with kernel} && %{with dist_kernel}
-BuildRequires:	kernel-headers 
-BuildRequires:	rpmbuild(macros) >= 1.118
+%if %{with kernel}
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
+BuildRequires:	rpmbuild(macros) >= 1.286
 %endif
 Requires(post,preun):	/sbin/chkconfig
 Provides:	dxr3
@@ -76,8 +81,11 @@
 Summary:	em8300 Linux kernel modules
 Summary(pl):	Moduły jądra Linuksa em8300
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
 
 %description -n kernel-video-em8300
 em8300 Linux kernel modules.
@@ -89,8 +97,11 @@
 Summary:	em8300 Linux SMP kernel modules
 Summary(pl):	Moduły jądra Linuksa SMP em8300
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
 
 %description -n kernel-smp-video-em8300
 em8300 Linux SMP kernel modules.
@@ -115,35 +126,38 @@
 %if %{with kernel}
 cd modules
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-    if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-	exit 1
-    fi
-    rm -rf include/{linux,config,asm}
-    install -d include/{linux,config}
-    ln -sf %{_kernelsrcdir}/config-$cfg .config
-    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 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
-%else
-ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
-    ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-    touch include/config/MARKER
-    cp ../include/linux/em8300.h include/linux/em8300.h
-
-    %{__make} -C %{_kernelsrcdir} clean \
-	    RCS_FIND_IGNORE="-name '*.ko' -o" \
-	    M=$PWD O=$PWD \
-	    %{?with_verbose:V=1}
-    %{__make} -C %{_kernelsrcdir} modules \
-	    CC="%{__cc}" CPP="%{__cpp}" \
-	    M=$PWD O=$PWD \
-	    %{?with_verbose:V=1}
-    for i in em8300 adv717x bt865; do
-	    mv $i{,-$cfg}.ko
-    done
+	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
+%endif
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+
+	cp ../include/linux/em8300.h o/include/linux/em8300.h
+
+	%{__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}
+
+	for i in em8300 adv717x bt865; do
+		mv $i{,-$cfg}.ko
+	done
 done
 %endif
 
@@ -161,12 +175,12 @@
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/video
 for i in adv717x bt865 em8300; do
-    install modules/$i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+	install modules/$i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/video/$i.ko
 done
 %if %{with smp} && %{with dist_kernel}
 for i in adv717x bt865 em8300; do
-    install modules/$i-smp.ko \
+	install modules/$i-smp.ko \
 		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/video/$i.ko
 done
 %endif
@@ -245,6 +259,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/03/12 10:22:20  pluto
+- build system updated.
+
 Revision 1.38  2006/02/26 17:06:30  matowy
 - TODO done
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.38&r2=1.39&f=u