Message ID | 20250922144016.4131-1-reatmon@ti.com |
---|---|
State | Accepted |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | [meta-ti,master] u-boot: Moved to named git repo | expand |
meta-ti / na / 20250922144016.4131-1-reatmon PRC Results: FAIL ========================================================= check-yocto-patches: PASS ========================================================= Patches ---------------------------------------- WARN - [meta-ti][master][PATCH] u-boot: Moved to named git repo WARN: Commit message does not include file/recipe name: u-boot: Moved to named git repo. (COMMIT-MESSAGE-2) patch WARN: Commit message should not include directory path to recipe: u-boot: Moved to named git repo. u-boot: (COMMIT-MESSAGE-3) patch ========================================================= apply-yocto-patch: FAIL ========================================================= master ===================== Summary: - Patch Series: [meta-ti][master][PATCH] u-boot: Moved to named git repo - Submitter: From: Ryan Eatmon <reatmon@ti.com> - Date: Date: Mon, 22 Sep 2025 09:40:16 -0500 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: 5b9d50c689045d1561478d31b261927aa8e36132 Applied to: - Repository: lcpd-prc-meta-ti - Base Branch: master - Commit Author: Ryan Eatmon <reatmon@ti.com> - Commit Subject: mesa-pvr: add PROVIDES for Vulkan and OpenCL ICDs - Commit SHA: 1d5ec7bb9e0da9c5715839192d73fedcbd706bf4 Patches ---------------------------------------- FAIL - [meta-ti][master][PATCH] u-boot: Moved to named git repo error: patch failed: meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc:5 error: meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc: patch does not apply Applying: u-boot: Moved to named git repo Patch failed at 0001 u-boot: Moved to named git repo
On 9/22/2025 9:45 AM, PRC Automation wrote: > meta-ti / na / 20250922144016.4131-1-reatmon > > PRC Results: FAIL > > ========================================================= > check-yocto-patches: PASS > ========================================================= > Patches > ---------------------------------------- > WARN - [meta-ti][master][PATCH] u-boot: Moved to named git repo > WARN: Commit message does not include file/recipe name: u-boot: Moved to named git repo. (COMMIT-MESSAGE-2) > patch > > WARN: Commit message should not include directory path to recipe: u-boot: Moved to named git repo. > u-boot: (COMMIT-MESSAGE-3) > patch > > > > ========================================================= > apply-yocto-patch: FAIL > ========================================================= > master > ===================== > Summary: > - Patch Series: [meta-ti][master][PATCH] u-boot: Moved to named git repo > - Submitter: From: Ryan Eatmon <reatmon@ti.com> > - Date: Date: Mon, 22 Sep 2025 09:40:16 -0500 > - Num Patches: 1 > - Mailing List (public inbox) Commit SHA: 5b9d50c689045d1561478d31b261927aa8e36132 > > Applied to: > - Repository: lcpd-prc-meta-ti > - Base Branch: master > - Commit Author: Ryan Eatmon <reatmon@ti.com> > - Commit Subject: mesa-pvr: add PROVIDES for Vulkan and OpenCL ICDs > - Commit SHA: 1d5ec7bb9e0da9c5715839192d73fedcbd706bf4 > > Patches > ---------------------------------------- > FAIL - [meta-ti][master][PATCH] u-boot: Moved to named git repo > error: patch failed: meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc:5 > error: meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc: patch does not apply > Applying: u-boot: Moved to named git repo > Patch failed at 0001 u-boot: Moved to named git repo > This (and the scarthgap version) requires the previous patch. I should have sent this as a series. My bad.
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc index b1802e27..ed95f483 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc @@ -5,6 +5,6 @@ COMPATIBLE_MACHINE:tie-jailhouse = "am62xx|am62pxx|am62lxx" BRANCH:tie-jailhouse:bsp-ti-6_12 = "ti-u-boot-2025.01-jailhouse" -SRCREV:tie-jailhouse:bsp-ti-6_12 = "e718bbcec3ebf663c021839753034a224be4cc53" +SRCREV_uboot:tie-jailhouse:bsp-ti-6_12 = "e718bbcec3ebf663c021839753034a224be4cc53" UBOOT_GIT_URI:tie-jailhouse = "git://git.ti.com/git/processor-sdk/u-boot.git" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb index d27ca9e5..bb51dca4 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb @@ -6,4 +6,4 @@ PV = "2025.07" UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git" -SRCREV = "e37de002fac3895e8d0b60ae2015e17bb33e2b5b" +SRCREV_uboot = "e37de002fac3895e8d0b60ae2015e17bb33e2b5b" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb index e0371bfa..83179aee 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb @@ -8,4 +8,4 @@ BRANCH = "ti-u-boot-2024.04" SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" -SRCREV = "29d0c23d67ee7b88e46fe1753cd020e2b04c2ef6" +SRCREV_uboot = "29d0c23d67ee7b88e46fe1753cd020e2b04c2ef6" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb index ab19988d..c1c0640d 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb @@ -6,4 +6,4 @@ PR = "r0" BRANCH = "ti-u-boot-2025.01" -SRCREV = "f3f8c664b3001e40cbdf46687732b2c37e1b6b33" +SRCREV_uboot = "f3f8c664b3001e40cbdf46687732b2c37e1b6b33" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 669db413..27b0855b 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -25,7 +25,9 @@ BRANCH ?= "master" UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git" UBOOT_GIT_PROTOCOL ?= "https" UBOOT_GIT_BRANCH ?= "branch=${BRANCH}" -SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH}" +SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH};name=uboot" + +SRCREV_FORMAT = "uboot" PV:append = "+git"
An upcoming patch series will optionally add in a second repository that will optionally be needed as part of the builds. To facilitate that, we need to name the uboot checkout so that the SRCREV can be tracked correctly in the recipe. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-)