rpms/kernel/devel kernel.spec,1.892,1.893

Dave Jones (davej) fedora-extras-commits at redhat.com
Wed Aug 20 20:14:10 UTC 2008


Author: davej

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

Modified Files:
	kernel.spec 
Log Message:
include/asm needs to be a symlink, not a dir.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -r1.892 -r1.893
--- kernel.spec	20 Aug 2008 20:11:09 -0000	1.892
+++ kernel.spec	20 Aug 2008 20:13:40 -0000	1.893
@@ -1358,9 +1358,11 @@
     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 drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    if [ -s asm ]; then
-      cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/asm
-    fi
+    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
 
     # Make sure the Makefile and version.h have a matching timestamp so that
     # external modules can be built
@@ -1737,6 +1739,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Aug 20 2008 Dave Jones <davej at redhat.com>
+- include/asm needs to be a symlink, not a dir.
+
 * Tue Aug 19 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc3-git6
 




More information about the scm-commits mailing list