Author: thomas
Date: Tue Sep 5 17:56:28 2006
New Revision: 60111
Modified:
packages/cooker/kernel-2.6-linus/current/SPECS/kernel-2.6-linus.spec
Log:
fix autoconf UTS_RELEASE
Modified: packages/cooker/kernel-2.6-linus/current/SPECS/kernel-2.6-linus.spec
==============================================================================
--- packages/cooker/kernel-2.6-linus/current/SPECS/kernel-2.6-linus.spec
(original)
+++ packages/cooker/kernel-2.6-linus/current/SPECS/kernel-2.6-linus.spec
Tue Sep 5 17:56:28 2006
@@ -18,7 +18,7 @@
# if you try to understand kernel numbering, read docs/kernel_naming
%define sublevel 18
-%define mdvrelease 1
+%define mdvrelease 2
%define use_patch rc6
#define patchlevel 1
%define klinus_notice NOTE: This kernel has no Mandriva patches and no
third-party drivers.
@@ -733,16 +733,16 @@
pushd %{target_source}/include/linux ; {
install -m 644 %{SOURCE15} rhconfig.h
-rm -rf autoconf.h version.h
+rm -rf autoconf.h version.h utsrelease.h
# Create autoconf.h file
echo '#include <linux/rhconfig.h>' > autoconf.h
sed 's,$,autoconf.h,' %{_savedheaders}list | awk -f %{SOURCE16} >> autoconf.h
-# from 2.6.18-rcX onward autoconf setup is being reworked,
+# From 2.6.18-rcX onward autoconf setup is being reworked,
# /include/linux/autoconf.h is replaced with
# /include/config/auto.conf and several other changes...
-# For now use autoconf.h to create auto.conf
+# FIXME: For now use autoconf.h to create auto.conf
grep '#' autoconf.h >>../config/auto.conf
# Create version.h
@@ -772,6 +772,12 @@
echo '#define UTS_RELEASE "'%{KVERREL}custom'"' >> version.h
echo "#endif" >> version.h
+# From 2.6.18-rcX onward autoconf setup is being reworked,
+# UTS_RELEASE defines in /include/linux/version.h
+# has been moved to /include/linux/utsrelease.h
+# FIXME: For now we simply duplicate the code
+cp version.h utsrelease.h
+
# Any of the version.h are ok, as they only differ in the first line
ls %{_savedheaders}%{target_cpu}/*/version.h | head -n 1 | xargs grep -v
UTS_RELEASE >> version.h
rm -rf %{_savedheaders}
@@ -1155,6 +1161,10 @@
%changelog
### REMOVE THE PATCHLEVEL DEFINITION ABOVE ###
+* Tue Sep 5 2006 Thomas Backlund <[EMAIL PROTECTED]> 2.6.18-rc6-2mdv
+- fix autoconf UTS_RELEASE relocation from version.h to
+ utsrelease.h (#24889)
+
* Mon Sep 4 2006 Thomas Backlund <[EMAIL PROTECTED]> 2.6.18-rc6-1mdv
- update to 2.6.18-rc6
- fix rpmlint warnings
