From 35cf4d61bcb45b64d4aceb3f28e66dfc7b0252ea Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Mon, 1 Jul 2024 17:36:16 +0200 Subject: [PATCH] meta-digi: update revisions for dey-4.0-r6.1 Signed-off-by: Francisco Gil --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_%.bbappend | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend index 7f1acace1..7c89d3056 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend @@ -8,10 +8,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.6/stm32mp/maint" -SRCREV = "${AUTOREV}" +SRCREV = "ed19ce45f72ec7fb0f1bd752ecdf46041d581ccb" SRC_URI = " \ - ${TFA_GIT_URI};branch=${SRCBRANCH} \ + ${TFA_GIT_URI};nobranch=1 \ " TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend index d3367b5ec..1fe0af5c3 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend @@ -8,9 +8,9 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "${AUTOREV}" +SRCREV = "084bea4f5aed10b1c0d9204cbaeea631335ca6ce" SRC_URI = " \ - ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ + ${OPTEE_GIT_URI};nobranch=1;name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 6ccfd5c15..2e9e79c70 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 1a3fa59a3..ff3de034b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 4f845bdd2..d946385f5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d6e1da4a6b0a5407b39e5705ed4e845737c38536" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 22ee05f7d..57e7ffd62 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8b6b6d30aff53b926fad3c038dba398b15d3ca6a" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index ca022b584..8332bfa38 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e4793a0c54e04af31498443a21f74a5add55fa52" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 0ff254752..4f239cd7d 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e4793a0c54e04af31498443a21f74a5add55fa52" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index 955934262..6fe495704 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e4793a0c54e04af31498443a21f74a5add55fa52" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 676122560..0e4d9a184 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d6e1da4a6b0a5407b39e5705ed4e845737c38536" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 29213a4a1..b229c413a 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 3aa8c98d7..04da853ee 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \ ${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://fscrypt.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index 799c39143..5e3e485c9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "${AUTOREV}" -SRCREV:stm32mpcommon = "${AUTOREV}" +SRCREV = "479d8256f51cc583e386ea910f35d4a1eed6339b" +SRCREV:stm32mpcommon = "9d17bc8271e7ba53d8d2b6aee7c4e70d924402db" STM_RT_PATCHES = " \ file://patch-5.15.119-rt65.patch \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index cecbac7ce..915f271b7 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -23,7 +23,7 @@ SRC_URI:append = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'file://tsn_conf.cfg', '', d)} \ " -SRCREV = "${AUTOREV}" +SRCREV = "0f687b135fed7694e0a2007fe2ab73cd4a6ef81c" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 997ea2ad2..48d67ce6d 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a9908413e2389009a10fd4f33366d694f55a59d3" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};branch=${SRCBRANCH} \ + ${CC_GIT_URI};nobranch=1 \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 97a2d77b4..f7c3be174 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019-2022 Digi International Inc. SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "78402f0e3e138023f70d9577faa11212a9dc3f61" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index f0f12c259..f44742e78 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -7,7 +7,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" SRCBRANCH ?= "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "305fabdf3dbb7efd5630c40519dd18ce28ec7108" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -15,7 +15,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \