Josh,
Here's a possible cleanup of kernel.spec. It also addresses one of my
pet peeves: headers_check is run twice when building the kernel rpms.
See, CONFIG_HEADERS_CHECK is already set to "y" in config-generic. But
there are also a few lines in kernel.spec where headers_check is invoked
again. And, as far as I can see
grep -q exist hdrwarnings.txt
will never match. Perhaps it made sense to grep for exist in the past, I
don't know. Or was it intended to grep for an error message? But errors
are not directed to hdrwarnings.txt.
Entirely untested patch, by the way.
Paul Bolle
-------->8-------
kernel.spec | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/kernel.spec b/kernel.spec
index a83abb0..09967a0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1844,15 +1844,6 @@ cd linux-%{KVERREL}
# Install kernel headers
make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
-# 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
--
1.8.4.2
_______________________________________________
kernel mailing list
kernel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/kernel
