From ba017736e5e228882c4f4d0e3434e5a40219327123665d8b845eace8548ed6f3 Mon Sep 17 00:00:00 2001
From: Michal Marek <michal.lkml@markovi.net>
Date: Thu, 24 Feb 2011 06:03:29 +0000
Subject: [PATCH] GIT Revision: 11af311e308e2a030ed4b490cf9f9c2d4ec46975

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6923
---
 kernel-binary.spec.in  |  1 -
 kernel-debug.changes   | 12 ++++++++++++
 kernel-debug.spec      |  7 ++++++-
 kernel-default.changes | 12 ++++++++++++
 kernel-default.spec    |  7 ++++++-
 kernel-desktop.changes | 12 ++++++++++++
 kernel-desktop.spec    |  7 ++++++-
 kernel-docs.changes    | 12 ++++++++++++
 kernel-docs.spec       |  6 ++++++
 kernel-ec2.changes     | 12 ++++++++++++
 kernel-ec2.spec        |  7 ++++++-
 kernel-net.changes     | 12 ++++++++++++
 kernel-net.spec        |  7 ++++++-
 kernel-pae.changes     | 12 ++++++++++++
 kernel-pae.spec        |  7 ++++++-
 kernel-ppc64.changes   | 12 ++++++++++++
 kernel-ppc64.spec      |  7 ++++++-
 kernel-ps3.changes     | 12 ++++++++++++
 kernel-ps3.spec        |  7 ++++++-
 kernel-s390.changes    | 12 ++++++++++++
 kernel-s390.spec       |  7 ++++++-
 kernel-source.changes  | 12 ++++++++++++
 kernel-source.spec     |  6 ++++++
 kernel-syms.changes    | 12 ++++++++++++
 kernel-syms.spec       |  6 ++++++
 kernel-trace.changes   | 12 ++++++++++++
 kernel-trace.spec      |  7 ++++++-
 kernel-vanilla.changes | 12 ++++++++++++
 kernel-vanilla.spec    |  7 ++++++-
 kernel-vmi.changes     | 12 ++++++++++++
 kernel-vmi.spec        |  7 ++++++-
 kernel-xen.changes     | 12 ++++++++++++
 kernel-xen.spec        |  7 ++++++-
 mkspec                 |  8 +++++---
 source-timestamp       |  4 ++--
 35 files changed, 295 insertions(+), 19 deletions(-)

diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in
index a2900b4e..7a32dbd1 100644
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@@ -264,7 +264,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
diff --git a/kernel-debug.changes b/kernel-debug.changes
index b200a9b5..f7773d45 100644
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-debug.spec b/kernel-debug.spec
index 20d89d38..6707646d 100644
--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@@ -339,7 +339,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -865,10 +864,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-default.changes b/kernel-default.changes
index b200a9b5..f7773d45 100644
--- a/kernel-default.changes
+++ b/kernel-default.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-default.spec b/kernel-default.spec
index a2a78369..e1ac3e90 100644
--- a/kernel-default.spec
+++ b/kernel-default.spec
@@ -354,7 +354,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -878,10 +877,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-desktop.changes b/kernel-desktop.changes
index b200a9b5..f7773d45 100644
--- a/kernel-desktop.changes
+++ b/kernel-desktop.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-desktop.spec b/kernel-desktop.spec
index 0f067fe5..2b36ce9e 100644
--- a/kernel-desktop.spec
+++ b/kernel-desktop.spec
@@ -348,7 +348,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -898,10 +897,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-docs.changes b/kernel-docs.changes
index b200a9b5..f7773d45 100644
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-docs.spec b/kernel-docs.spec
index f84b0668..2c4e74f4 100644
--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@@ -99,10 +99,16 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/kernel
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-ec2.changes b/kernel-ec2.changes
index b200a9b5..f7773d45 100644
--- a/kernel-ec2.changes
+++ b/kernel-ec2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-ec2.spec b/kernel-ec2.spec
index 3246740a..29117987 100644
--- a/kernel-ec2.spec
+++ b/kernel-ec2.spec
@@ -338,7 +338,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -868,10 +867,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-net.changes b/kernel-net.changes
index b200a9b5..f7773d45 100644
--- a/kernel-net.changes
+++ b/kernel-net.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-net.spec b/kernel-net.spec
index e4c4392a..d90f8f92 100644
--- a/kernel-net.spec
+++ b/kernel-net.spec
@@ -337,7 +337,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -865,10 +864,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-pae.changes b/kernel-pae.changes
index b200a9b5..f7773d45 100644
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-pae.spec b/kernel-pae.spec
index 1df36270..9e5a2d5a 100644
--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@@ -345,7 +345,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -883,10 +882,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes
index b200a9b5..f7773d45 100644
--- a/kernel-ppc64.changes
+++ b/kernel-ppc64.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec
index 9a09e095..c064acc4 100644
--- a/kernel-ppc64.spec
+++ b/kernel-ppc64.spec
@@ -349,7 +349,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -887,10 +886,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-ps3.changes b/kernel-ps3.changes
index b200a9b5..f7773d45 100644
--- a/kernel-ps3.changes
+++ b/kernel-ps3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-ps3.spec b/kernel-ps3.spec
index bcaa1c85..3729e217 100644
--- a/kernel-ps3.spec
+++ b/kernel-ps3.spec
@@ -338,7 +338,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -868,10 +867,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-s390.changes b/kernel-s390.changes
index b200a9b5..f7773d45 100644
--- a/kernel-s390.changes
+++ b/kernel-s390.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-s390.spec b/kernel-s390.spec
index 51e47218..cbcb47b8 100644
--- a/kernel-s390.spec
+++ b/kernel-s390.spec
@@ -338,7 +338,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -862,10 +861,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-source.changes b/kernel-source.changes
index b200a9b5..f7773d45 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-source.spec b/kernel-source.spec
index c9405fc2..180b54b2 100644
--- a/kernel-source.spec
+++ b/kernel-source.spec
@@ -254,10 +254,16 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
 %endif
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-syms.changes b/kernel-syms.changes
index b200a9b5..f7773d45 100644
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-syms.spec b/kernel-syms.spec
index 1eb9fe75..f6b50e1a 100644
--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@@ -81,10 +81,16 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 %_docdir/%name/README.SUSE
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-trace.changes b/kernel-trace.changes
index b200a9b5..f7773d45 100644
--- a/kernel-trace.changes
+++ b/kernel-trace.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-trace.spec b/kernel-trace.spec
index 18282178..46cfaabd 100644
--- a/kernel-trace.spec
+++ b/kernel-trace.spec
@@ -346,7 +346,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -870,10 +869,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes
index b200a9b5..f7773d45 100644
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 5a2b3a79..40b8e1f6 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -342,7 +342,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -866,10 +865,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-vmi.changes b/kernel-vmi.changes
index b200a9b5..f7773d45 100644
--- a/kernel-vmi.changes
+++ b/kernel-vmi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-vmi.spec b/kernel-vmi.spec
index d98d05e6..a106ceab 100644
--- a/kernel-vmi.spec
+++ b/kernel-vmi.spec
@@ -336,7 +336,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -862,10 +861,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/kernel-xen.changes b/kernel-xen.changes
index b200a9b5..f7773d45 100644
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 23 23:03:41 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
+
 -------------------------------------------------------------------
 Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
 
@@ -5,6 +11,12 @@ Tue Feb 22 21:49:18 CET 2011 - jeffm@suse.com
     - Eliminated 1 patch.
 - commit 6cce7bb
 
+-------------------------------------------------------------------
+Tue Feb 22 10:00:42 CET 2011 - mmarek@suse.cz
+
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
+
 -------------------------------------------------------------------
 Mon Feb 21 10:31:05 CET 2011 - tiwai@suse.de
 
diff --git a/kernel-xen.spec b/kernel-xen.spec
index f39354e9..7b31fd2f 100644
--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@@ -338,7 +338,6 @@ find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 cat > .kernel-binary.spec.buildenv <<EOF
 # Override the timestamp 'uname -v' reports with the build
 # timestamp.
-export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
 export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
 
 # The following branch/timestamp will end up in Oopses.
@@ -868,10 +867,16 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Wed Feb 23 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Remove unused code.
+- commit dacbc44
 * Tue Feb 22 2011 jeffm@suse.com
 - Update to 2.6.38-rc6.
     - Eliminated 1 patch.
 - commit 6cce7bb
+* Tue Feb 22 2011 mmarek@suse.cz
+- rpm/mkspec: Do not create kernel-syms.spec on vanilla-only branches
+- commit eb17bba
 * Mon Feb 21 2011 tiwai@suse.de
 - ALSA: caiaq - Fix possible string-buffer overflow (bnc#672499,
   CVE-2011-0712).
diff --git a/mkspec b/mkspec
index c6c93934..54f2d76f 100644
--- a/mkspec
+++ b/mkspec
@@ -117,9 +117,11 @@ do_spec('docs', "kernel-docs$variant.spec", %macros);
 		$requires .= "%endif\n";
 	}
 	chomp $requires;
-	do_spec('syms', "kernel-syms$variant.spec", %macros,
-		REQUIRES => $requires,
-		ARCHS => join(" ", sort(keys(%all_archs))));
+	if (keys(%all_archs)) {
+		do_spec('syms', "kernel-syms$variant.spec", %macros,
+			REQUIRES => $requires,
+			ARCHS => join(" ", sort(keys(%all_archs))));
+	}
 }
 
 exit 0;
diff --git a/source-timestamp b/source-timestamp
index e1567b93..b5085b18 100644
--- a/source-timestamp
+++ b/source-timestamp
@@ -1,3 +1,3 @@
-2011-02-22 21:49:18 +0100
-GIT Revision: 6cce7bb68a08bf8caf90b4b38f251a82002e09b5
+2011-02-23 23:04:32 +0100
+GIT Revision: 11af311e308e2a030ed4b490cf9f9c2d4ec46975
 GIT Branch: master