SPECS: dazuko.spec - up to 2.3.4 - new style build kernel modules, ...

zbyniu zbyniu at pld-linux.org
Tue Nov 6 02:20:33 CET 2007 

Author: zbyniu                       Date: Tue Nov  6 01:20:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.3.4
- new style build kernel modules, kbuild.patch not needed, smp packge removed

---- Files affected:
SPECS:
   dazuko.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/dazuko.spec
diff -u SPECS/dazuko.spec:1.23 SPECS/dazuko.spec:1.24
--- SPECS/dazuko.spec:1.23	Wed Mar 14 01:16:22 2007
+++ SPECS/dazuko.spec	Tue Nov  6 02:20:27 2007
@@ -3,8 +3,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 #
@@ -12,23 +10,22 @@
 %undefine	with_dist_kernel
 %endif
 #
-%define		_rel	1
+%define		_rel	0.7
 Summary:	Linux Dazuko driver
 Summary(pl.UTF-8):	Sterownik Dazuko dla Linuksa
 Name:		dazuko
-Version:	2.3.2
+Version:	2.3.4
 Release:	%{_rel}
 Epoch:		0
 License:	BSD (library), GPL (Linux kernel module)
 Group:		Base/Kernel
 Source0:	http://www.dazuko.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	bb32e24ad60a31dbfc419d3341287f68
-Patch0:		%{name}-kbuild.patch
-Patch1:		%{name}-caps.patch
+# Source0-md5:	14ae194714584944b983845793daf2a4
+Patch0:		%{name}-caps.patch
 URL:		http://www.dazuko.org/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.286
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,8 +38,7 @@
 needs, it is hoped that this driver will become a common component of
 most systems.
 
-To install the dazuko kernel module install kernel-misc-dazuko or
-kernel-smp-misc-dazuko.
+To install the dazuko kernel module install kernel-misc-dazuko.
 
 %description -l pl.UTF-8
 Dazuko ma być wieloplatformowym sterownikiem urządzenia pozwalającym
@@ -53,9 +49,8 @@
 popularnym elementem większości systemów.
 
 Aby zainstalować moduł jądra należy zainstalować pakiet
-kernel-misc-dazuko lub kernel-smp-misc-dazuko.
+kernel-misc-dazuko.
 
-# kernel subpackages.
 %package -n kernel%{_alt_kernel}-misc-%{name}
 Summary:	Linux driver for dazuko
 Summary(pl.UTF-8):	Linuksowy sterownik dazuko
@@ -63,8 +58,8 @@
 Group:		Base/Kernel
 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
 
 %description -n kernel%{_alt_kernel}-misc-%{name}
@@ -75,25 +70,6 @@
 %description -n kernel%{_alt_kernel}-misc-%{name} -l pl.UTF-8
 Ten pakiet zawiera sterownik dazuko dla Linuksa.
 
-%package -n kernel%{_alt_kernel}-smp-misc-%{name}
-Summary:	Linux SMP driver for dazuko
-Summary(pl.UTF-8):	Sterownik dazuko 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%{_alt_kernel}-smp-misc-%{name}
-This is driver for dazuko for Linux.
-
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-misc-%{name} -l pl.UTF-8
-Ten pakiet zawiera sterownik dazuko dla Linuksa SMP.
-
 %package examples
 Summary:	Example code for Dazuko
 Summary(pl.UTF-8):	Przykładowy kod dla Dazuko
@@ -135,50 +111,22 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
-%build
-%if %{with kernel}
-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
-#
-#	patching/creating makefile(s) (optional)
+cat > Makefile << EOF
+obj-m += dazuko.o
 
-	# NOTE: It's not autoconf configure.
-	./configure \
-		--kernelsrcdir=%{_kernelsrcdir} \
-		%{?debug:--enable-debug} \
-		--disable-compat1 \
-		--without-library
-
-	%{__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}
+dazuko-objs := dazuko_core.o dazuko_transport.o dazuko_linux26_lsm.o dazuko_linux26.o
 
-	mv dazuko{,-$cfg}.ko
-done
+CFLAGS += -DLINUX26_SUPPORT -DTRUSTED_APPLICATION_SUPPORT
+CFLAGS += -DUSE_CLASS -DUSE_TRYTOFREEZEVOID -DLINUX_USE_FREEZER_H
+CFLAGS += -DTASKSTRUCT_USES_PARENT -DUSE_CONFIG_H -DON_OPEN_SUPPORT -DON_EXEC_SUPPORT
+EOF
+
+%build
+./linux_dev_conf %{_kernelsrcdir}/include/linux/device.h
+./linux_lsm_conf %{_kernelsrcdir}/include/linux/security.h
+%if %{with kernel}
+%build_kernel_modules -m dazuko
 %endif
 
 %if %{with userspace}
@@ -186,7 +134,8 @@
 ./configure \
 	%{?debug:--enable-debug} \
 	--disable-compat1 \
-	--without-module
+	--without-module \
+	--disable-rsbac
 
 cd library
 %{__make} \
@@ -211,13 +160,7 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install dazuko-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/dazuko.ko
-%if %{with smp} && %{with dist_kernel}
-install dazuko-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/dazuko.ko
-%endif
+%install_kernel_modules -m dazuko -d misc
 %endif
 
 %clean
@@ -232,26 +175,12 @@
 %postun	-n kernel%{_alt_kernel}-misc-dazuko
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-misc-dazuko
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-misc-dazuko
-%depmod %{_kernel_ver}smp
-
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-dazuko
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-misc-dazuko
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-%endif
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -278,6 +207,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2007/11/06 01:20:27  zbyniu
+- up to 2.3.4
+- new style build kernel modules, kbuild.patch not needed, smp packge removed
+
 Revision 1.23  2007/03/14 00:16:22  glen
 - up bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dazuko.spec?r1=1.23&r2=1.24&f=u

More information about the pld-cvs-commit mailing list