rpms/kernel/devel kernel.spec,1.812,1.813

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19381

Modified Files:
	kernel.spec 
Log Message:
Fix up .spec for headers check.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -r1.812 -r1.813
--- kernel.spec	28 Jul 2008 02:08:36 -0000	1.812
+++ kernel.spec	28 Jul 2008 02:45:28 -0000	1.813
@@ -128,6 +128,7 @@
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}.%{_target_cpu}
 %define hdrarch %_target_cpu
+%define asmarch %_target_cpu
 
 %if 0%{!?nopatches:1}
 %define nopatches 0
@@ -248,10 +249,12 @@
 %define all_arch_configs kernel-%{version}-i?86*.config
 %define image_install_path boot
 %define hdrarch i386
+%define asmarch x86
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
 %ifarch x86_64
+%define asmarch x86
 %define all_arch_configs kernel-%{version}-x86_64*.config
 %define image_install_path boot
 %define kernel_image arch/x86/boot/bzImage
@@ -1471,20 +1474,19 @@
 # Install kernel headers
 make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
 
-# Manually go through the 'headers_check' process for every file, but
-# don't die if it fails
-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 /dev/null >> hdrwarnings.txt || :
-done
-echo -e '*****\n*****' >> hdrwarnings.txt
+# Do headers_check but don't die if it fails.
+make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_check \
+     > hdrwarnings.txt || :
 if grep -q exist hdrwarnings.txt; then
    sed s:^$RPM_BUILD_ROOT/usr/include/:: hdrwarnings.txt
    # Temporarily cause a build failure if header inconsistencies.
    # exit 1
 fi
 
+find $RPM_BUILD_ROOT/usr/include \
+     \( -name .install -o -name .check -o \
+     	-name ..install.cmd -o -name ..check.cmd \) | xargs rm -f
+
 # glibc provides scsi headers for itself, for now
 rm -rf $RPM_BUILD_ROOT/usr/include/scsi
 rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h
@@ -1695,6 +1697,7 @@
 * Sun Jul 27 2008 Roland McGrath <roland at redhat.com>
 - 2.6.26-git16
 - Fix up linux-2.6-build-nonintconfig.patch after kconfig changes.
+- Fix up .spec for headers check.
 - Reenable sfc module.
 
 * Sun Jul 27 2008 Roland McGrath <roland at redhat.com>