SPECS: kernel-video-viafb.spec - use new kernel macros - use new k...

Mon Apr 9 02:13:14 CEST 2007

Author: shadzik                      Date: Mon Apr  9 00:13:14 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new kernel macros
- use new kernel modules build system
- remove whole smp stuff

---- Files affected:
SPECS:
   kernel-video-viafb.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/kernel-video-viafb.spec
diff -u SPECS/kernel-video-viafb.spec:1.7 SPECS/kernel-video-viafb.spec:1.8

--- SPECS/kernel-video-viafb.spec:1.7	Fri Mar  2 19:08:22 2007
+++ SPECS/kernel-video-viafb.spec	Mon Apr  9 02:13:09 2007
@@ -3,18 +3,12 @@
 # Conditional build:
 %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_with	verbose		# verbose build (V=1)
 
 %if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
-# see kernel.spec
-%ifarch sparc
-%undefine	with_smp
-%endif
-
 %define		_rel	1
 Summary:	VIA Unichrome framebuffer driver for Linux
 Summary(pl.UTF-8):	Sterownik framebuffera dla kart VIA Unichrome dla Linuksa
@@ -28,14 +22,14 @@
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-bool.patch
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.217
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRequires:	sed >= 4.0
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,31 +47,6 @@
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel-smp-video-viafb
-Summary:	VIA Unichrome framebuffer driver for Linux SMP
-Summary(pl.UTF-8):	Sterownik framebuffera dla kart VIA Unichrome dla Linuksa SMP
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-
-%description -n kernel-smp-video-viafb
-This is the console framebuffer driver for Graphics chips of VIA
-UniChrome Family (CLE266, KM400, KN400, KM800, KN800, PM800, PN800,
-CN400, CN700, CX700).
-
-This package contains Linux SMP kernel module.
-
-%description -n kernel-smp-video-viafb -l pl.UTF-8
-To jest sterownik do obsługi framebuffera dla kart graficznych z
-rodziny VIA Unichrome (CLE266, KM400, KN400, KM800, KN800, PM800,
-PN800, CN400, CN700, CX700).
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 %setup -q -n Linux-FBDev-kernel-src_%{version}
 %patch0 -p1
@@ -86,53 +55,14 @@
 
 %build
 %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
-	rm -rf include
-	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
-#
-#	patching/creating makefile(s) (optional)
-#
-	%{__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 viafb{,-$cfg}.ko
-done
+%build_kernel_modules -m viafb
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/video
-install viafb-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/video/viafb.ko
-%if %{with smp} && %{with dist_kernel}
-install viafb-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/video/viafb.ko
-%endif
+%install_kernel_modules -m viafb -d kernel/drivers/video
 %endif
 
 %clean
@@ -144,24 +74,11 @@
 %postun
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-video-viafb
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel-smp-video-viafb
-%depmod %{_kernel_ver}smp
-
 %if %{with kernel}
 %files
 %defattr(644,root,root,755)
 %doc readme.txt viafb.modes
 /lib/modules/%{_kernel_ver}/kernel/drivers/video/*.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-video-viafb
-%defattr(644,root,root,755)
-%doc readme.txt viafb.modes
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/video/*.ko*
-%endif
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -170,6 +87,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/04/09 00:13:09  shadzik
+- use new kernel macros
+- use new kernel modules build system
+- remove whole smp stuff
+
 Revision 1.7  2007/03/02 18:08:22  witekfl
 - added a patch
 - install the module in kernel/drivers/video
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-video-viafb.spec?r1=1.7&r2=1.8&f=u

