rpms/kernel/F-8 kernel.spec,1.542,1.543

Chuck Ebbert cebbert at fedoraproject.org
Wed Oct 8 22:36:09 UTC 2008


Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
Copy dwmw2's build fixes from rawhide


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- kernel.spec	8 Oct 2008 22:00:21 -0000	1.542
+++ kernel.spec	8 Oct 2008 22:35:38 -0000	1.543
@@ -1480,6 +1480,9 @@
     fi
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
+%ifarch ppc
+    cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+%endif
     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
@@ -1497,6 +1500,9 @@
     cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
 %endif
 
+    if [ -d arch/%{_arch}/include ]; then
+      cp -a --parents arch/%{_arch}/include  $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+    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
@@ -1884,6 +1890,11 @@
 
 
 %changelog
+* Wed Oct 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-33
+- Copy dwmw2's build fixes from rawhide:
+    Include arch/$ARCH/include/ directories in kernel-devel (F10#465486)
+    Include arch/powerpc/lib/crtsavres.[So] too (F9#464613)
+
 * Wed Oct 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-32
 - Fix build ID fiddling magic. (F9#465873)
 - Move build-nonintconfig patch so it gets included in -vanilla.




More information about the scm-commits mailing list