From a8e51bf13bebbe57f7ac292e7643accfd1a2c0be Mon Sep 17 00:00:00 2001 From: Rogerio Guerra Borin Date: Tue, 11 Feb 2025 14:27:32 -0300 Subject: [PATCH] linux-torizon.inc: move RT commits amendment to postfunc Move RT commits amendment to a postfunc of the do_patch task to avoid depending on the base implementation of that task being necessarily a shell function. Related-to: TOR-3755 Signed-off-by: Rogerio Guerra Borin --- recipes-kernel/linux/linux-torizon.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-torizon.inc b/recipes-kernel/linux/linux-torizon.inc index 763bf171..e6a101cf 100644 --- a/recipes-kernel/linux/linux-torizon.inc +++ b/recipes-kernel/linux/linux-torizon.inc @@ -10,7 +10,7 @@ SRC_URI:append:cfs-signed = "\ KBUILD_BUILD_VERSION .= "-Torizon" -do_patch:append:preempt-rt() { +do_amend_preempt_rt_commits() { # When the RT patches are applied via "git apply" by the kgit-s2q tool # (part of yocto-kernel-tools) the author is set to "invalid_git config" # which we validate here to ensure we'll amend the proper commit. @@ -43,6 +43,9 @@ do_patch:append:preempt-rt() { --amend --no-edit -m 'RT patches' \ --date='1970-01-01T00:00:00 +0000' } +PREEMPT_RT_PATCH_FUNCS = "" +PREEMPT_RT_PATCH_FUNCS:preempt-rt = "do_amend_preempt_rt_commits" +do_patch[postfuncs] += "${PREEMPT_RT_PATCH_FUNCS}" # Print kernel URL and BRANCH to files to be used by ostree commit as metadata kernel_do_deploy:append() {