rpms/kernel/F-9 kernel.spec,1.830,1.831

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10763

Modified Files:
	kernel.spec 
Log Message:
hopefully fix build on ppc


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- kernel.spec	30 Oct 2008 21:06:39 -0000	1.830
+++ kernel.spec	30 Oct 2008 21:57:52 -0000	1.831
@@ -159,6 +159,7 @@
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}.%{_target_cpu}
 %define hdrarch %_target_cpu
+%define asmarch %_target_cpu
 
 %if 0%{!?nopatches:1}
 %define nopatches 0
@@ -299,12 +300,14 @@
 %define all_arch_configs kernel-%{version}-i?86*.config
 %define image_install_path boot
 %define hdrarch i386
+%define asmarch x86
 # we build always xen i686 HV with pae
 %define xen_flags verbose=y crash_debug=y pae=y
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
 %ifarch x86_64
+%define asmarch x86
 %define all_arch_configs kernel-%{version}-x86_64*.config
 %define image_install_path boot
 %define kernel_image arch/x86/boot/bzImage
@@ -1483,21 +1486,16 @@
     cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
 %endif
     if [ -d arch/$Arch/include ]; then
-      cp -a --parents arch/$Arch/include  $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+      cp -a --parents arch/$Arch/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     fi
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
-    cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    # While arch/powerpc/include/asm is still a symlink to the old
-    # include/asm-ppc{64,} directory, include that in kernel-devel too.
-    if [ "$Arch" = "powerpc" -a -r ../arch/powerpc/include/asm ]; then
-      cp -a `readlink ../arch/powerpc/include/asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-      mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include
-      pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include
-      ln -sf ../../../include/asm-ppc* asm
-      popd
-    fi
+    cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    asmdir=$(readlink asm)
+    cp -a $asmdir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/
+    pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    ln -s $asmdir asm
+    popd
 %if %{includexen}
     cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
 %endif