SPECS: drbd.spec - rel 3; should build fine even of ppc (seems tha...

arekm arekm at pld-linux.org
Sat Nov 12 01:48:40 CET 2005


Author: arekm                        Date: Sat Nov 12 00:48:40 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; should build fine even of ppc (seems that 2.4.14 contains parts of ppc32+ppc64 merge -> asm dir is splitted on ppc)

---- Files affected:
SPECS:
   drbd.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.58 SPECS/drbd.spec:1.59
--- SPECS/drbd.spec:1.58	Sat Nov 12 01:04:06 2005
+++ SPECS/drbd.spec	Sat Nov 12 01:48:35 2005
@@ -11,7 +11,7 @@
 Summary(pl):	drbd jest urządzeniem blokowym dla klastrów o wysokiej niezawodności
 Name:		drbd
 Version:	0.7.14
-%define	rel	2
+%define	rel	3
 Release:	%{rel}
 License:	GPL
 Group:		Base/Kernel
@@ -124,7 +124,17 @@
 	install -d include/{linux,config}
 	ln -sf %{_kernelsrcdir}/config-$cfg .config
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%ifarch ppc
+        if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
+                install -d include/asm
+                cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+                cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+        else
+                ln -sf %{_kernelsrcdir}/include/asm-powerpc include/asm
+        fi
+%else
+        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%endif
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
 	touch include/config/MARKER
 	%{__make} -C %{_kernelsrcdir} clean \
@@ -231,6 +241,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2005/11/12 00:48:35  arekm
+- rel 3; should build fine even of ppc (seems that 2.4.14 contains parts of ppc32+ppc64 merge -> asm dir is splitted on ppc)
+
 Revision 1.58  2005/11/12 00:04:06  arekm
 - fix cross-build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/drbd.spec?r1=1.58&r2=1.59&f=u




More information about the pld-cvs-commit mailing list