From b99467f16976b9590ceb41612a344f184182d5776efb4a4977826305a08be816 Mon Sep 17 00:00:00 2001
From: Michal Marek <michal.lkml@markovi.net>
Date: Tue, 17 May 2011 05:02:24 +0000
Subject: [PATCH] GIT Revision: 5cdd91c909da97ae32edac33fd660590ee7fcacd

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6971
---
 kernel-binary.spec.in  | 16 +++++-----------
 kernel-debug.changes   |  6 ++++++
 kernel-debug.spec      | 19 ++++++++-----------
 kernel-default.changes |  6 ++++++
 kernel-default.spec    | 19 ++++++++-----------
 kernel-desktop.changes |  6 ++++++
 kernel-desktop.spec    | 19 ++++++++-----------
 kernel-docs.changes    |  6 ++++++
 kernel-docs.spec       |  3 +++
 kernel-ec2.changes     |  6 ++++++
 kernel-ec2.spec        | 19 ++++++++-----------
 kernel-pae.changes     |  6 ++++++
 kernel-pae.spec        | 19 ++++++++-----------
 kernel-ppc64.changes   |  6 ++++++
 kernel-ppc64.spec      | 19 ++++++++-----------
 kernel-ps3.changes     |  6 ++++++
 kernel-ps3.spec        | 19 ++++++++-----------
 kernel-s390.changes    |  6 ++++++
 kernel-s390.spec       | 19 ++++++++-----------
 kernel-source.changes  |  6 ++++++
 kernel-source.spec     |  3 +++
 kernel-syms.changes    |  6 ++++++
 kernel-syms.spec       |  3 +++
 kernel-trace.changes   |  6 ++++++
 kernel-trace.spec      | 19 ++++++++-----------
 kernel-vanilla.changes |  6 ++++++
 kernel-vanilla.spec    | 19 ++++++++-----------
 kernel-xen.changes     |  6 ++++++
 kernel-xen.spec        | 19 ++++++++-----------
 source-timestamp       |  4 ++--
 30 files changed, 188 insertions(+), 134 deletions(-)

diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in
index f6a61a22..e1e09b0d 100644
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@@ -266,18 +266,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
diff --git a/kernel-debug.changes b/kernel-debug.changes
index 00fcc864..359f57f0 100644
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-debug.spec b/kernel-debug.spec
index a499e381..8b75af7f 100644
--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@@ -343,18 +343,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -883,6 +877,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-default.changes b/kernel-default.changes
index 00fcc864..359f57f0 100644
--- a/kernel-default.changes
+++ b/kernel-default.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-default.spec b/kernel-default.spec
index c388747e..913e844c 100644
--- a/kernel-default.spec
+++ b/kernel-default.spec
@@ -358,18 +358,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -896,6 +890,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-desktop.changes b/kernel-desktop.changes
index 00fcc864..359f57f0 100644
--- a/kernel-desktop.changes
+++ b/kernel-desktop.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-desktop.spec b/kernel-desktop.spec
index bb37ed94..991c6ad5 100644
--- a/kernel-desktop.spec
+++ b/kernel-desktop.spec
@@ -352,18 +352,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -916,6 +910,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-docs.changes b/kernel-docs.changes
index 00fcc864..359f57f0 100644
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-docs.spec b/kernel-docs.spec
index 7de28453..75701a85 100644
--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/kernel
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-ec2.changes b/kernel-ec2.changes
index 00fcc864..359f57f0 100644
--- a/kernel-ec2.changes
+++ b/kernel-ec2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-ec2.spec b/kernel-ec2.spec
index dccbad25..b75538d3 100644
--- a/kernel-ec2.spec
+++ b/kernel-ec2.spec
@@ -342,18 +342,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -886,6 +880,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-pae.changes b/kernel-pae.changes
index 00fcc864..359f57f0 100644
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-pae.spec b/kernel-pae.spec
index 673efb7d..984261bc 100644
--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@@ -349,18 +349,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -901,6 +895,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes
index 00fcc864..359f57f0 100644
--- a/kernel-ppc64.changes
+++ b/kernel-ppc64.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec
index 9cc6c61b..0964e6e1 100644
--- a/kernel-ppc64.spec
+++ b/kernel-ppc64.spec
@@ -353,18 +353,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -905,6 +899,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-ps3.changes b/kernel-ps3.changes
index 00fcc864..359f57f0 100644
--- a/kernel-ps3.changes
+++ b/kernel-ps3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-ps3.spec b/kernel-ps3.spec
index 27b97ad7..62693928 100644
--- a/kernel-ps3.spec
+++ b/kernel-ps3.spec
@@ -342,18 +342,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -886,6 +880,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-s390.changes b/kernel-s390.changes
index 00fcc864..359f57f0 100644
--- a/kernel-s390.changes
+++ b/kernel-s390.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-s390.spec b/kernel-s390.spec
index 088cefb5..78ac9b1e 100644
--- a/kernel-s390.spec
+++ b/kernel-s390.spec
@@ -342,18 +342,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -880,6 +874,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-source.changes b/kernel-source.changes
index 00fcc864..359f57f0 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-source.spec b/kernel-source.spec
index fd81f584..545eb322 100644
--- a/kernel-source.spec
+++ b/kernel-source.spec
@@ -255,6 +255,9 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
 %endif
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-syms.changes b/kernel-syms.changes
index 00fcc864..359f57f0 100644
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-syms.spec b/kernel-syms.spec
index 640f9984..0faeb419 100644
--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@@ -81,6 +81,9 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 %_docdir/%name/README.SUSE
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-trace.changes b/kernel-trace.changes
index 00fcc864..359f57f0 100644
--- a/kernel-trace.changes
+++ b/kernel-trace.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-trace.spec b/kernel-trace.spec
index c98f92ae..e240de45 100644
--- a/kernel-trace.spec
+++ b/kernel-trace.spec
@@ -350,18 +350,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -888,6 +882,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes
index 00fcc864..359f57f0 100644
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index accc93f0..af929020 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -346,18 +346,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -884,6 +878,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/kernel-xen.changes b/kernel-xen.changes
index 00fcc864..359f57f0 100644
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:34:33 CEST 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
+
 -------------------------------------------------------------------
 Fri May 13 15:45:04 CEST 2011 - jeffm@suse.com
 
diff --git a/kernel-xen.spec b/kernel-xen.spec
index 7addac77..66933616 100644
--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@@ -342,18 +342,12 @@ make clean $MAKE_ARGS
 rm -f source
 find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
 
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
 cat > .kernel-binary.spec.buildenv <<EOF
-# Override the timestamp 'uname -v' reports with the build
-# timestamp.
-export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
-
-# The following branch/timestamp will end up in Oopses.
-export OOPS_TIMESTAMP="$(
-    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
-		  %_sourcedir/source-timestamp)
-    head -n 1 %_sourcedir/source-timestamp \
-	| tr -dc 0-9)"
-
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
 export KBUILD_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1
@@ -886,6 +880,9 @@ Debug information for package %name-devel
 %files devel-debuginfo -f vmlinux.debug.files
 
 %changelog
+* Mon May 16 2011 mmarek@suse.cz
+- rpm/kernel-binary.spec.in: Add the commit hash to uname -v, cleanup.
+- commit f3bdb4c
 * Fri May 13 2011 jeffm@suse.com
 - Update to 2.6.39-rc7.
     - Eliminated 5 patches.
diff --git a/source-timestamp b/source-timestamp
index 676a5233..f0d876bd 100644
--- a/source-timestamp
+++ b/source-timestamp
@@ -1,3 +1,3 @@
-2011-05-13 15:45:37 +0200
-GIT Revision: 7f37bd6a499a9154b636c763a75a06d6a7680750
+2011-05-16 14:56:20 +0200
+GIT Revision: 5cdd91c909da97ae32edac33fd660590ee7fcacd
 GIT Branch: master