From 29124cd33ffc8e56921ed02964453877583af2f2 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 21 Jul 2022 15:08:39 +0200 Subject: [PATCH] meta-digi: update revisions for dey-4.0-r1.alpha1 Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 6 +++--- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index fedfee68c..60613e3b1 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -23,7 +23,7 @@ UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \ '${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI:append = " \ 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 2b3f9a8f7..12fc28c64 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/master" -SRCREV = "${AUTOREV}" +SRCREV = "fa41e784a000da90c75f9d7d078a7bda668daea5" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 5bdd58f16..3beece80b 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -8,7 +8,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2020.04/master" -SRCREV = "${AUTOREV}" +SRCREV = "fa41e784a000da90c75f9d7d078a7bda668daea5" S = "${WORKDIR}" @@ -21,7 +21,7 @@ UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \ '${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 23172f3b6..2c0f4a719 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -1,7 +1,7 @@ # Copyright (C) 2018-2022 Digi International LOCALVERSION = "-dey" -SRCREV = "${AUTOREV}" +SRCREV = "5ed8aa9a3de7fe71d715b1faecba557cddd72c5d" # Select internal or Github Linux repo DIGI_LOG_REPO = "linux-2.6.git" @@ -11,8 +11,8 @@ LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \ oe.utils.conditional('DIGI_GIT', '${DIGI_LOG_GIT}', '${DIGI_GIT}/${DIGI_LOG_REPO}', '${DIGI_GIT}/${DIGI_MTK_REPO};protocol=ssh', d), \ '${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" -SRC_URI_stmp32mpcommon = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI_stmp32mpcommon = "${LINUX_GIT_URI};nobranch=1" # A user can provide his own kernel 'defconfig' file by: # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index 6d3960582..98496ab84 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse libdigiapix openssl recovery-utils swupdate zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "c9e337098a6c719e24a94c7d6ec05584125f24d4" 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" @@ -16,7 +16,7 @@ CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" SRC_URI = " \ - ${CC_GIT_URI};branch=${SRCBRANCH} \ + ${CC_GIT_URI};nobranch=1 \ file://cloud-connector-init \ file://cloud-connector.service \ " 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 1117c0537..4f0c29cf2 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-2021 Digi International Inc. SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "3c6caabcdfff3b6948f7d2fe7befa35dd5508ac6" 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 5843474e1..f3bb5dc65 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "master" -SRCREV = "${AUTOREV}" +SRCREV = "1309d16f702e1f9222f6d0742c72ceae15e0e2ce" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,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 \