SOURCES: rpm.macros - dropped creating asm-* symlinks, let kernel ...

hawk hawk at pld-linux.org
Wed Jan 30 10:46:56 CET 2008


Author: hawk                         Date: Wed Jan 30 09:46:56 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- dropped creating asm-* symlinks, let kernel Makefile do that, fixes
  building modules for 2.6.24 kernels on x86/x86_64, tested with
  2.6.{16,22,23,24} on alpha, ppc, sparc32, i686, athlon, amd64, x86_64

---- Files affected:
SOURCES:
   rpm.macros (1.419 -> 1.420) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.419 SOURCES/rpm.macros:1.420
--- SOURCES/rpm.macros:1.419	Wed Jan 30 01:27:32 2008
+++ SOURCES/rpm.macros	Wed Jan 30 10:46:50 2008
@@ -1233,13 +1233,6 @@
 	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 \
-%ifarch ppc ppc64													\
-	install -d o/include/asm										\
-	[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \
-	[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm \
-%else																\
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm \
-%endif																\
 																	\
 	set +x															\
 	[ -z "$PATCH_SH" ] || echo "$PATCH_SH" | %__spec_build_shell	\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.419&r2=1.420&f=u



More information about the pld-cvs-commit mailing list