From d9ef21b3d0df7ff1afd6c50739c8a86604831588 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Mon, 30 Sep 2024 15:00:48 +0200 Subject: [PATCH] meta-digi: revert revisions to AUTOREV Signed-off-by: Francisco Gil --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.19.0.bb | 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_2022.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.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 | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.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 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend index 0e8b9a463..6c9041b1d 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.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 = "9283dc9f1985a8a697ff4c8c9dfa494e85ea950b" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " 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-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb index 5d7c4618f..b604ec605 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb @@ -13,10 +13,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.8/stm32mp/maint_ccmp2-beta" -SRCREV = "779078679e4714addd14e58efb2564e050a0f016" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " TF_A_VERSION = "v2.8.12" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb index ebe52e451..d6e1a3294 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb @@ -10,10 +10,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.8/stm32mp/maint_ccmp2-beta" -SRCREV = "779078679e4714addd14e58efb2564e050a0f016" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " # Configure settings diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend index 643c2b4e8..3a1aba0b5 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend @@ -8,10 +8,10 @@ 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 = "25128a1706f59e84e47212be7e878e0a3e4d6d61" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${OPTEE_GIT_URI};nobranch=1;name=os \ + ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb index adb07c323..1b94870a2 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb @@ -8,10 +8,10 @@ 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.19.0/stm/maint_ccmp2-beta" -SRCREV = "be32a34d4c2b6c916a17afc956289630992c68e0" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${OPTEE_GIT_URI};nobranch=1;name=os \ + ${OPTEE_GIT_URI};branch=${SRCBRANCH};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 6b9061cb5..83edbcf49 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};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ 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 cf8695b52..ab6c1ce34 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 = "1ef810133fcecacf14e09155bee10aa66fc6ade7" +SRCREV = "${AUTOREV}" # 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 1ddc32b06..e8020ae16 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 = "d509efc3c1d1c591f6d155171c084c84594993ad" +SRCREV = "${AUTOREV}" 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 537524cfe..82c0ed42d 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 = "93ad20a55d98d278ffbd3eeafcc2e30ab806f0d4" +SRCREV = "${AUTOREV}" 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_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb index 629cbeffb..c23632bdc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2022.10/maint_ccmp2-beta" -SRCREV = "e6e98d7437984824219b8515f9a5ca902d12953d" +SRCREV = "${AUTOREV}" 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 94e4005b6..e7876a683 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 = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index 37ff8b2fe..b81dfdda6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2024.04/maint" -SRCREV = "14c81ab20282fb7faacf8a25205c62d49ec00677" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx91)" 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 bc803afc4..0ff254752 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 = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" +SRCREV = "${AUTOREV}" 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 f1431f1e0..955934262 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 = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" +SRCREV = "${AUTOREV}" 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 6053bf373..676122560 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 = "d509efc3c1d1c591f6d155171c084c84594993ad" +SRCREV = "${AUTOREV}" 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};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ 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 0dbb911c7..c4b3fcaa7 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 = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" +SRCREV = "${AUTOREV}" 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};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # 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 9948bf0c1..cce001bf3 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};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@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 1c639e174..a4ba1aa21 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 = "85ab27e1eba8252b78dcf36293c20e49f1d141c6" -SRCREV:stm32mpcommon = "35bde2fa4824c3fc87971a94b188e1f063d7cdf6" +SRCREV = "${AUTOREV}" +SRCREV:stm32mpcommon = "${AUTOREV}" 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 525b62d22..bacbf6737 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 @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" SRCBRANCH:stm32mp2common = "v6.1/stm/dey-4.0/maint_ccmp2-beta" -SRCREV = "740c551407b63f39a6f2261407eb1b7e2eda40e2" -SRCREV:stm32mp2common = "459438b270fd3576bdf3d4841dc5316b462f9ff2" +SRCREV = "${AUTOREV}" +SRCREV:stm32mp2common = "${AUTOREV}" # Patch series for RT Kernel NXP_RT_PATCHES = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb index 0b869db59..241772dea 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.6/nxp/dey-4.0/maint" -SRCREV = "8c33aa89e6ede40ded265de37a9e671562e9ed63" +SRCREV = "${AUTOREV}" # 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 48d67ce6d..997ea2ad2 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 = "a9908413e2389009a10fd4f33366d694f55a59d3" +SRCREV = "${AUTOREV}" 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};nobranch=1 \ + ${CC_GIT_URI};branch=${SRCBRANCH} \ 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 fab2926cb..5447ceb6a 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 = "47e0ac1d7a091452cb831cc970fae2c1a279112a" +SRCREV = "${AUTOREV}" 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};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 9f569e15f..6dbaeae9f 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 = "305fabdf3dbb7efd5630c40519dd18ce28ec7108" +SRCREV = "${AUTOREV}" 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};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \