All of lore.kernel.org
 help / color / mirror / Atom feed
From: bruce.ashfield@gmail.com
To: richard.purdie@linuxfoundation.org
Cc: openembedded-core@lists.openembedded.org, raj.khem@gmail.com,
	jdmason@kudzu.us
Subject: [PATCH 07/15] kernel-yocto: allow patch author date to be commit date
Date: Thu, 28 Apr 2022 09:47:53 -0400	[thread overview]
Message-ID: <8eebf8f01d1631c7926cb9098d8e64f00a28f339.1651153370.git.bruce.ashfield@gmail.com> (raw)
In-Reply-To: <cover.1651153370.git.bruce.ashfield@gmail.com>

From: Bruce Ashfield <bruce.ashfield@gmail.com>

In situations where a buid needs to be reproducible, it is
sometimes desireable to use a patches author date, versus the
time when it is applied. This generates a consistent hash
between different patch applications.

We leverage the existing KERNEL_DEBUG_TIMESTAMPS to trigger
the use of a new option to kgit-s2q. This allows us to use
the author date in a reproducible configuration, but disable
it if we need the current time/date.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 meta/classes/kernel-yocto.bbclass                       | 6 +++++-
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 4cb638864c..fb30c7cc05 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -320,7 +320,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})"
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index a6ab9ca56d..11613ab3b6 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "\
 
 DEPENDS = "git-native"
 
-SRCREV = "90598a5fae1172e3f7782a1b02f7b7518efd32c8"
+SRCREV = "f70b1d52f4706a263ae22e2c61039ccd875e97b6"
 PV = "0.3+git${SRCPV}"
 
 inherit native
-- 
2.19.1



  parent reply	other threads:[~2022-04-28 13:48 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-28 13:47 [PATCH 00/15] kernel-yocto: consolidated pull request bruce.ashfield
2022-04-28 13:47 ` [PATCH 01/15] linux-yocto/5.15: arm: poky-tiny cleanup and fixes bruce.ashfield
2022-04-28 13:47 ` [PATCH 02/15] linux-yocto/5.15: update to v5.15.33 bruce.ashfield
2022-04-28 13:47 ` [PATCH 03/15] linux-yocto/5.10: update to v5.10.110 bruce.ashfield
2022-04-28 13:47 ` [PATCH 04/15] linux-yocto/5.10: base: enable kernel crypto userspace API bruce.ashfield
2022-04-28 13:47 ` [PATCH 05/15] linux-yocto/5.15: " bruce.ashfield
2022-04-28 13:47 ` [PATCH 06/15] linux-yocto/5.15: kasan: fix BUG: sleeping function called from invalid context bruce.ashfield
2022-04-28 13:47 ` bruce.ashfield [this message]
2022-04-28 13:47 ` [PATCH 08/15] linux-yocto/5.15: fix ppc boot bruce.ashfield
2022-04-28 13:47 ` [PATCH 09/15] linux-yocto/5.15: netfilter: conntrack: avoid useless indirection during conntrack destruction bruce.ashfield
2022-04-28 13:47 ` [PATCH 10/15] linux-yocto/5.10: update to v5.10.112 bruce.ashfield
2022-04-28 13:47 ` [PATCH 11/15] linux-yocto/5.15: update to v5.15.35 bruce.ashfield
2022-04-28 13:47 ` [PATCH 12/15] linux-yocto/5.15: Fix CVE-2022-28796 bruce.ashfield
2022-04-28 13:47 ` [PATCH 13/15] linux-yocto: enable powerpc debug fragment bruce.ashfield
2022-04-28 13:48 ` [PATCH 14/15] linux-yocto/5.15: fix -standard kernel build issue bruce.ashfield
2022-04-28 13:48 ` [PATCH 15/15] linux-yocto/5.15: update to v5.15.36 bruce.ashfield
2022-04-29 11:51 ` [PATCH 00/15] kernel-yocto: consolidated pull request Richard Purdie
2022-04-29 12:40   ` Bruce Ashfield
     [not found]   ` <16EA5E7263695663.11702@lists.openembedded.org>
2022-04-29 20:01     ` [OE-core] " Bruce Ashfield
     [not found]     ` <16EA76835C38B7CA.4798@lists.openembedded.org>
2022-04-30  4:26       ` Bruce Ashfield
     [not found]       ` <16EA920E59E6B6F1.28542@lists.openembedded.org>
2022-04-30 21:35         ` Bruce Ashfield
2022-05-01  4:59           ` Richard Purdie
2022-05-04  7:18             ` Nicolas Dechesne
2022-05-04 12:45               ` Bruce Ashfield
2022-05-04 14:07                 ` Jon Mason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8eebf8f01d1631c7926cb9098d8e64f00a28f339.1651153370.git.bruce.ashfield@gmail.com \
    --to=bruce.ashfield@gmail.com \
    --cc=jdmason@kudzu.us \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=raj.khem@gmail.com \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.