GIT Revision: 5cdd91c909da97ae32edac33fd660590ee7fcacd

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6971

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_VERBOSE=0
 export KBUILD_SYMTYPES=1
 export KBUILD_OVERRIDE=1

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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.

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
 

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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

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
 

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
+export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
-# 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_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.

source-timestamp

@@ -1,3 +1,3 @@
-2011-05-13 15:45:37 +0200
+2011-05-16 14:56:20 +0200
-GIT Revision: 7f37bd6a499a9154b636c763a75a06d6a7680750
+GIT Revision: 5cdd91c909da97ae32edac33fd660590ee7fcacd
 GIT Branch: master