GIT Revision: 138eeaadb9ccb73aa3f4df3f6df79d804d4e32f8

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6903
2011-01-15 06:01:21 +00:00 · 2011-01-15 06:01:21 +00:00 · 0fe7875a75
commit 0fe7875a75
parent 63e8da99f9
36 changed files with 225 additions and 116 deletions
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion @SRCVERSION@
-%define kernelrelease @PATCHVERSION@
+%define patchversion @PATCHVERSION@
 %define variant @VARIANT@%{nil}

 %include %_sourcedir/kernel-spec-macros
@ -227,14 +227,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -243,6 +237,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -303,14 +303,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -319,6 +313,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -870,6 +865,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-default.changes
+++ b/kernel-default.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-default.spec
+++ b/kernel-default.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -318,14 +318,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -334,6 +328,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -883,6 +878,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-desktop.changes
+++ b/kernel-desktop.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-desktop.spec
+++ b/kernel-desktop.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -312,14 +312,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -328,6 +322,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -903,6 +898,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@ -99,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/kernel

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-ec2.changes
+++ b/kernel-ec2.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-ec2.spec
+++ b/kernel-ec2.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -302,14 +302,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -318,6 +312,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -873,6 +868,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-net.changes
+++ b/kernel-net.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-net.spec
+++ b/kernel-net.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -301,14 +301,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -317,6 +311,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -870,6 +865,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -309,14 +309,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -325,6 +319,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -888,6 +883,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-ppc64.changes
+++ b/kernel-ppc64.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-ppc64.spec
+++ b/kernel-ppc64.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -313,14 +313,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -329,6 +323,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -892,6 +887,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-ps3.changes
+++ b/kernel-ps3.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-ps3.spec
+++ b/kernel-ps3.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -302,14 +302,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -318,6 +312,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -873,6 +868,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-s390.changes
+++ b/kernel-s390.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-s390.spec
+++ b/kernel-s390.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -302,14 +302,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -318,6 +312,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -867,6 +862,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-source.changes
+++ b/kernel-source.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-source.spec
+++ b/kernel-source.spec
@ -19,7 +19,7 @@
 # icecream 0

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -245,6 +245,10 @@ popd
 %endif

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-source.spec.in
+++ b/kernel-source.spec.in
@ -19,7 +19,7 @@
 # icecream 0

 %define srcversion @SRCVERSION@
-%define kernelrelease @PATCHVERSION@
+%define patchversion @PATCHVERSION@
 %define variant @VARIANT@%{nil}

 %include %_sourcedir/kernel-spec-macros
--- a/3
+++ b/3
@ -11,6 +11,9 @@
 %define source_rel %(release=%release; echo ${release%.*})
 %endif

+%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
+%define kernelrelease %patchversion-%release_major
+
 %define my_builddir %_builddir/%{name}-%{version}

 # macro to add the source timestamp to package descriptions
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@ -81,6 +81,10 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 %_docdir/%name/README.SUSE

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-trace.changes
+++ b/kernel-trace.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-trace.spec
+++ b/kernel-trace.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -310,14 +310,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -326,6 +320,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -875,6 +870,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -306,14 +306,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -322,6 +316,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -871,6 +866,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-vmi.changes
+++ b/kernel-vmi.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-vmi.spec
+++ b/kernel-vmi.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -300,14 +300,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -316,6 +310,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -867,6 +862,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 14 16:29:03 CET 2011 - mmarek@suse.cz
+
+- Revert %kernelrelease changes originally made on the vanilla branch,
+    they break on master and must be done differently.
+- commit b610327
+
 -------------------------------------------------------------------
 Thu Jan 13 21:29:19 CET 2011 - jkosina@suse.cz

--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@ -18,7 +18,7 @@
 # norootforbuild

 %define srcversion 2.6.37
-%define kernelrelease 2.6.37
+%define patchversion 2.6.37
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@ -302,14 +302,8 @@ if test -e ../config.addon/%cpu_arch_flavor; then
 else
 	cp ../config/%cpu_arch_flavor .config
 fi
-
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
-
-krel=%kernelrelease-%build_flavor
-kver=$(make -s kernelversion $MAKE_ARGS)
-# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
 %build_src_dir/scripts/config \
-	--set-str CONFIG_LOCALVERSION ${krel#$kver} \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 %if 0%{?__debug_package:1}
 	--enable  CONFIG_DEBUG_INFO \
@ -318,6 +312,7 @@ kver=$(make -s kernelversion $MAKE_ARGS)
 	--disable CONFIG_DEBUG_INFO
 %endif

+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
    yes '' | make oldconfig $MAKE_ARGS
 else
@ -873,6 +868,10 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files

 %changelog
+* Fri Jan 14 2011 mmarek@suse.cz
+- Revert %%kernelrelease changes originally made on the vanilla branch,
+  they break on master and must be done differently.
+- commit b610327
 * Thu Jan 13 2011 jkosina@suse.cz
 - Input: introduce 'notimeout' blacklist for Dell Vostro V13
  (bnc#641105).
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-2011-01-13 21:29:19 +0100
-GIT Revision: cb76856db0aa2385d9a9e8ce595467bd3ac30fce
+2011-01-14 16:30:38 +0100
+GIT Revision: 138eeaadb9ccb73aa3f4df3f6df79d804d4e32f8
 GIT Branch: master