SPECS: EMCpower.spec - add up bcond - put drivers to kernel/driver...

glen glen at pld-linux.org
Wed May 31 15:17:11 CEST 2006


Author: glen                         Date: Wed May 31 13:17:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add up bcond
- put drivers to kernel/drivers/block
- hack for fixed kernel

---- Files affected:
SPECS:
   EMCpower.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/EMCpower.spec
diff -u SPECS/EMCpower.spec:1.1 SPECS/EMCpower.spec:1.2
--- SPECS/EMCpower.spec:1.1	Fri May 26 15:42:07 2006
+++ SPECS/EMCpower.spec	Wed May 31 15:17:06 2006
@@ -2,7 +2,8 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_with	smp		# don't build SMP module
+%bcond_without	up	# don't build SMP module
+%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -10,10 +11,17 @@
 %undefine	with_dist_kernel
 %endif
 
+%ifarch %{x8664}
+%undefine	with_up
+%endif
+
+%define	__kernel_ver	2.6.5-7.252
+%define	__kernel_rpmvr	%{__kernel_ver}
+
 #
 # main package.
 #
-%define		_rel	0.1
+%define		_rel	0.4
 Summary:	EMC PowerPath
 Name:		EMCpower
 Version:	4.5.1
@@ -149,23 +157,32 @@
 
 %if %{with kernel}
 cd bin/driver
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/block
+%if %{with up}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/block
 install emcplib-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block/emcplib.ko
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/block/emcplib.ko
 
 brand=sles; type=default
- for a in emcp emcphr emcpioc emcpmp emcpmpaa emcpmpap emcpmpc; do
-	install ${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block/$a.ko
-done 
+%ifarch %{x8664}
+type=${type}_x8664
+%endif
+for a in emcplib emcp emcphr emcpioc emcpmp emcpmpaa emcpmpap emcpmpc; do
+	install ${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/block/$a.ko
+done
+%endif
 
 %if %{with smp} && %{with dist_kernel}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block
 install emcplib-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/block/emcplib.ko
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block/emcplib.ko
 
 brand=sles; type=smp
- for a in emcp emcphr emcpioc emcpmp emcpmpaa emcpmpap emcpmpc; do
-	install ${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block/$a.ko
-done 
+%ifarch %{x8664}
+type=${type}_x8664
+%endif
+ for a in emcplib emcp emcphr emcpioc emcpmp emcpmpaa emcpmpap emcpmpc; do
+	install ${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block/$a.ko
+done
 %endif
 %endif
 
@@ -185,14 +202,16 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up}
 %files -n kernel-block-emc
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/block/*.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/block/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-block-emc
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/block/*.ko*
+/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block/*.ko*
 %endif
 %endif
 
@@ -231,6 +250,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/05/31 13:17:06  glen
+- add up bcond
+- put drivers to kernel/drivers/block
+- hack for fixed kernel
+
 Revision 1.1  2006/05/26 13:42:07  glen
 - new, not yet tested
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/EMCpower.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list