[PATCH 1/2] arm/sbsa-acs: use UPSTREAM_CHECK_URI for version checking

[PATCH 1/2] arm/sbsa-acs: use UPSTREAM_CHECK_URI for version checking

[Jon Mason]

Since sbsa-acs requires edk2-firmware, it bases its SRC_URI on that.
The first entry of SRC_URI is what is used to determine the latest
version.  So, specify an alternative URI to determine the correct
version.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
index b61658c44bba..a29c16ecb466 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
@@ -13,6 +13,8 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl
 SRCREV_acs = "be169f0008d86341e1e48cb70d524bd1518c3acc"
 SRCREV_libc = "4667a82f0d873221f8b25ea701ce57a29270e4cb"
 
+UPSTREAM_CHECK_URI = "https://github.com/ARM-software/sbsa-acs/releases"
+
 COMPATIBLE_HOST = "aarch64.*-linux"
 COMPATIBLE_MACHINE = ""
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
-- 
2.39.3 (Apple Git-146)

[PATCH 2/2] arm: use UPSTREAM_CHECK_COMMITS for git versioned recipes

[Jon Mason]

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-devtools/gn/gn_git.bb                 | 2 ++
 meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb | 3 ++-
 scripts/machine-summary.py                             | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-arm/recipes-devtools/gn/gn_git.bb b/meta-arm/recipes-devtools/gn/gn_git.bb
index 5a6f19dbab02..7ec340c9d1b8 100644
--- a/meta-arm/recipes-devtools/gn/gn_git.bb
+++ b/meta-arm/recipes-devtools/gn/gn_git.bb
@@ -4,6 +4,8 @@ DEPENDS += "ninja-native"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d"
 
+UPSTREAM_CHECK_COMMITS = "1"
+
 SRC_URI = "git://gn.googlesource.com/gn;protocol=https;branch=main \
            file://0001-Replace-lstat64-stat64-functions-on-linux.patch"
 SRCREV = "4bd1a77e67958fb7f6739bd4542641646f264e5d"
diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
index df1f3bddc8df..7996e9b36c3f 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -22,9 +22,10 @@ FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
 
 SRC_URI = "gitsm://github.com/Microsoft/ms-tpm-20-ref;branch=main;protocol=https \
            file://0001-add-enum-to-ta-flags.patch"
-
 SRCREV = "d638536d0fe01acd5e39ffa1bd100b3da82d92c7"
 
+UPSTREAM_CHECK_COMMITS = "1"
+
 S = "${WORKDIR}/git"
 
 OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
diff --git a/scripts/machine-summary.py b/scripts/machine-summary.py
index 477bdfc709ef..455a5176fe5d 100755
--- a/scripts/machine-summary.py
+++ b/scripts/machine-summary.py
@@ -146,9 +146,11 @@ recipes = ("virtual/kernel",
            "edk2-firmware",
            "u-boot",
            "optee-os",
+           "optee-ftpm",
            "hafnium",
            "boot-wrapper-aarch64",
            "gator-daemon",
+           "gn",
            "opencsd",
            "gcc-aarch64-none-elf-native",
            "gcc-arm-none-eabi-native")
-- 
2.39.3 (Apple Git-146)

Re: [PATCH 1/2] arm/sbsa-acs: use UPSTREAM_CHECK_URI for version checking

[Jon Mason]

On Thu, 28 Mar 2024 16:12:05 -0400, Jon Mason wrote:
> Since sbsa-acs requires edk2-firmware, it bases its SRC_URI on that.
> The first entry of SRC_URI is what is used to determine the latest
> version.  So, specify an alternative URI to determine the correct
> version.
> 
> 

Applied, thanks!

[1/2] arm/sbsa-acs: use UPSTREAM_CHECK_URI for version checking
      commit: 7163b472ab8a5de852508de5e60148d681f4e21e
[2/2] arm: use UPSTREAM_CHECK_COMMITS for git versioned recipes
      commit: 8d308aac029f3c5cd08100f2978d0c28bed4332d

Best regards,
-- 
Jon Mason <jon.mason@arm.com>