rpms/kernel/FC-3 kernel-2.6.spec,1.884,1.885

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Sep 26 22:17:43 UTC 2005


Author: davej

Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv19506

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix asm-x86_64 dependancy on asm-i386. (#150266)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -r1.884 -r1.885
--- kernel-2.6.spec	24 Sep 2005 05:53:26 -0000	1.884
+++ kernel-2.6.spec	26 Sep 2005 22:17:40 -0000	1.885
@@ -851,6 +851,9 @@
     cd include
     cp -a acpi config linux math-emu media net pcmcia 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
+	if [ "$Arch" = "x86_64" ]; then
+		cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+	fi
     # 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
@@ -1009,6 +1012,9 @@
 %endif
 
 %changelog
+* Mon Sep 26 2005 Dave Jones <davej at redhat.com>
+- Fix asm-x86_64 dependancy on asm-i386. (#150266)
+
 * Sat Sep 24 2005 Dave Jones <davej at redhat.com>
 - Remove bogus BUG_ON() in fs/exec.c (#160121)
 - Power up pwc cameras by default. (#140258)




More information about the fedora-cvs-commits mailing list