From 3086738d4ee1ce507333f89fbdfdc8bd056b8ade Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Thu, 17 Oct 2024 16:09:02 -0500 Subject: [PATCH] linux: Consolidate the SRC_URI variables It was suggested to move the reproducibility patches out of ti-kernel.inc and into the respective recipes. Taking this time to also rework all of the pieces that go into the SRC_URI and create a standardization for how all of the kernel recipes are done. Create KERNEL_GIT_URI, KERNEL_GIT_PROTOCOL, KERNEL_GIT_BRANCH, KERNEL_DEFCONFIG, and KERNEL_REPRODUCIBILITY_PATCHES. The default for the above new variables is to the git.ti.com repository and how we manage the kernel settings. The other kernel recipes that do something other than how TI does it can simply override the variables. This change will make it easier to perform the upstream testing that we do on a nightly basis. Additionally, it will simplify the auto generation of the patches to move the mainline (stable kernel) recipes since the required patches will be all done in the same recipe. Signed-off-by: Ryan Eatmon --- .../recipes-kernel/linux/linux-bb.org_git.bb | 5 +--- .../linux/linux-ti-mainline_git.bb | 9 ++++++- .../recipes-kernel/linux/linux-ti-next_git.bb | 4 ++- .../linux/linux-ti-staging_6.1.bb | 5 ---- .../linux/linux-ti-staging_6.12.bb | 5 ---- .../linux/linux-ti-staging_6.6.bb | 7 +++--- .../recipes-kernel/linux/ti-kernel.inc | 25 ++++++++----------- 7 files changed, 26 insertions(+), 34 deletions(-) diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb index cee9c7cb..ef79bfb7 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb @@ -62,7 +62,4 @@ SRCREV:aarch64 = "977c75e082620f15c06c72bcced30f787c14b390" PV:aarch64 = "6.1.80+git" BRANCH:aarch64 = "v6.1.80-ti-arm64-r49" -SRC_URI = " \ - git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \ - file://defconfig \ -" +KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index a9048f16..765375b0 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -17,7 +17,14 @@ S = "${WORKDIR}/git" SRCREV = "fa7818b3a6dd56c7956f515d287ed9f80c7bf59a" PV = "6.11" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=https;branch=master" +KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" +BRANCH = "master" + +KERNEL_DEFCONFIG = "" + +KERNEL_REPRODUCIBILITY_PATCHES = " \ + file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \ +" DEFCONFIG_NAME = "multi_v7_defconfig" DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb index 3c206754..1feb7564 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb @@ -8,4 +8,6 @@ include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar(' SRCREV = "6465e260f48790807eef06b583b38ca9789b6072" PV = "6.6.0-rc3+git" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" +KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" + +KERNEL_REPRODUCIBILITY_PATCHES = "" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index 66f0b562..86851278 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -26,11 +26,6 @@ BRANCH ?= "ti-linux-6.1.y" SRCREV ?= "92ce8d7d2ab679e10c1dda309a0fb2ceae78b908" PV = "6.1.105+git" -KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "https" -SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ - file://defconfig" - # Special configuration for remoteproc/rpmsg IPC modules module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb index 6d746b59..8c2fca78 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb @@ -28,11 +28,6 @@ BRANCH ?= "ti-linux-6.12.y" SRCREV ?= "1cdb5a3691bfa5171a265ae931f0912656936a4b" PV = "6.12.0+git" -KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "https" -SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ - file://defconfig" - # Special configuration for remoteproc/rpmsg IPC modules module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb index 73ff52df..3a853493 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb @@ -26,10 +26,9 @@ BRANCH ?= "ti-linux-6.6.y" SRCREV ?= "617526782e268112606ca6c5d501e5540b22a56c" PV = "6.6.44+git" -KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "https" -SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ - file://defconfig" +KERNEL_REPRODUCIBILITY_PATCHES = " \ + file://0001-vt-conmakehash-improve-reproducibility.patch \ +" # Special configuration for remoteproc/rpmsg IPC modules module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc index 09cfdb12..8c14446a 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc @@ -13,19 +13,16 @@ EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}" KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" KERNEL_DTBVENDORED = "1" -KERNEL_PATCHES = "" +KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" +KERNEL_GIT_PROTOCOL ?= "https" +KERNEL_GIT_BRANCH ?= "branch=${BRANCH}" -KERNEL_PATCHES:bsp-mainline = " \ - file://0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch \ - file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \ +KERNEL_DEFCONFIG ?= "file://defconfig" + +KERNEL_REPRODUCIBILITY_PATCHES ?= "" + +SRC_URI = " \ + ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};${KERNEL_GIT_BRANCH} \ + ${KERNEL_DEFCONFIG} \ + ${KERNEL_REPRODUCIBILITY_PATCHES} \ " - -KERNEL_PATCHES:bsp-ti-6_12 = " \ - file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \ -" - -KERNEL_PATCHES:bsp-ti-6_6 = " \ - file://0001-vt-conmakehash-improve-reproducibility.patch \ -" - -SRC_URI:append = " ${KERNEL_PATCHES} "