1 files changed, 5 insertions, 1 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index afccffcf17..e8046bb8f6 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -322,7 +322,11 @@ do_patch() {
         meta_dir=$(kgit --meta)
         (cd ${meta_dir}; ln -sf patch.queue series)
         if [ -f "${meta_dir}/series" ]; then
-                kgit-s2q --gen -v --patches .kernel-meta/
+                kgit_extra_args=""
+                if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
+                    kgit_extra_args="--commit-sha author"
+                fi
+                kgit-s2q --gen -v $kgit_extra_args --patches .kernel-meta/
                 if [ $? -ne 0 ]; then
                         bberror "Could not apply patches for ${KMACHINE}."
                         bbfatal_log "Patch failures can be resolved in the linux source directory ${S})"