rpms/kernel/devel kernel-2.6.spec,1.2867,1.2868

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Dec 13 17:16:34 UTC 2006


Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix powerpc builds


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2867
retrieving revision 1.2868
diff -u -r1.2867 -r1.2868
--- kernel-2.6.spec	13 Dec 2006 15:00:14 -0000	1.2867
+++ kernel-2.6.spec	13 Dec 2006 17:16:32 -0000	1.2868
@@ -175,7 +175,7 @@
 # Which is a BadThing(tm).
 
 # We don't build a kernel on i386 or s390x -- we only do kernel-headers there.
-%define nobuildarches i386 s390 ppc64iseries ppc ppc64
+%define nobuildarches i386 s390
 
 %ifarch %nobuildarches
 %define buildup 0
@@ -466,7 +466,7 @@
 
 # END OF PATCH DEFINITIONS
 
-BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
+BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 # Pass path of the RPM temp dir containing kabideps to find-provides script.
@@ -1374,7 +1374,7 @@
 chmod +x scripts/hdrcheck.sh
 echo -e '*****\n*****\nHEADER EXPORT WARNINGS:\n*****' > hdrwarnings.txt
 for FILE in `find $RPM_BUILD_ROOT/usr/include` ; do
-    scripts/hdrcheck.sh $RPM_BUILD_ROOT/usr/include $FILE >> hdrwarnings.txt || :
+    scripts/hdrcheck.sh $RPM_BUILD_ROOT/usr/include $FILE /dev/null >> hdrwarnings.txt || :
 done
 echo -e '*****\n*****' >> hdrwarnings.txt
 if grep -q exist hdrwarnings.txt; then
@@ -1793,6 +1793,11 @@
 #  - tux.
 # - kill off kdump
 %changelog
+* Wed Dec 13 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix and re-enable ppc, ppc64, ppciseries builds
+- Fix hdrcheck.sh invocation
+- %%_target_cpu in BuildRoot to allow parallel builds
+
 * Tue Dec 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.19-git19
 




More information about the fedora-cvs-commits mailing list