rpms/kernel/devel kernel.spec,1.1906,1.1907

[roland]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21309

Modified Files:
	kernel.spec 
Log Message:
Fix include/ copying for kernel-devel.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1906
retrieving revision 1.1907
diff -u -p -r1.1906 -r1.1907
--- kernel.spec	25 Jan 2010 21:50:02 -0000	1.1906
+++ kernel.spec	27 Jan 2010 20:50:01 -0000	1.1907
@@ -1525,19 +1525,14 @@ hwcap 0 nosegneg"
     if [ -d arch/%{asmarch}/include ]; then
       cp -a --parents arch/%{asmarch}/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 crypto keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound trace video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    ln -s arch/%{asmarch}/include/asm asm
-    popd
+    cp -a include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+
     # Make sure the Makefile and version.h have a matching timestamp so that
     # external modules can be built
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h
     # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
     cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
-    cd ..
 
     if test -s vmlinux.id; then
       cp vmlinux.id $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/vmlinux.id
@@ -1971,6 +1966,9 @@ fi
 # and build.
 
 %changelog
+* Wed Jan 27 2010 Roland McGrath <roland at redhat.com> 2.6.33-0.24.rc5.git1
+- Fix include/ copying for kernel-devel.
+
 * Mon Jan 25 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.23.rc5.git1
 - 2.6.33-rc5-git1
 - arm: MTD_PISMO is not set