From f7625f002616faefc2e959f21c2ca9948af49840 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 27 Feb 2018 08:56:07 +0100 Subject: [PATCH 1/7] meta-digi: configure recipes to use maintenance branches Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 2 +- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 2 +- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 2 +- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 2 +- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 904ef6aac..b726aa3ba 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -11,7 +11,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" -SRCBRANCH = "v2015.04/master" +SRCBRANCH = "v2015.04/maint" SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index 029bb2121..93777cf73 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" -SRCBRANCH = "v2015.04/master" +SRCBRANCH = "v2015.04/maint" SRCREV = "${AUTOREV}" S = "${WORKDIR}" 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 37c80419d..855aed414 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 @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.2.80.63" -SRCBRANCH = "dey-2.2/master" +SRCBRANCH = "dey-2.4/maint" SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git', d)}" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 41ccf688a..50039e728 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -14,7 +14,7 @@ AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" -SRCBRANCH = "master" +SRCBRANCH = "dey-2.4/maint" SRCREV = "${AUTOREV}" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb index 73d8f2b6d..fe1ee8ee7 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" -SRCBRANCH = "master" +SRCBRANCH = "dey-2.4/maint" SRCREV = "${AUTOREV}" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb index 32ae4e863..964bbc91b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" -SRCBRANCH = "master" +SRCBRANCH = "dey-2.4/maint" SRCREV = "${AUTOREV}" LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" From fddd64edf747e6ce8172fe2a8c73b26e725c31e4 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 26 Feb 2018 13:08:24 +0100 Subject: [PATCH 2/7] README: Update dey-2.4-r1 changelog https://jira.digi.com/browse/DEL-5687 Signed-off-by: Arturo Buzarra --- README.md | 100 ++++++++---------------------------------------------- 1 file changed, 15 insertions(+), 85 deletions(-) diff --git a/README.md b/README.md index fa08b8d1d..1a9a0a970 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Digi Embedded Yocto (DEY) 2.2 -## Release 2.2-r4 +# Digi Embedded Yocto (DEY) 2.4 +## Release 2.4-r1 This document provides information about Digi Embedded Yocto, Digi International's professional embedded Yocto development environment. -Digi Embedded Yocto 2.2 is based on the Yocto Project(TM) 2.2 (Morty) release. +Digi Embedded Yocto 2.4 is based on the Yocto Project(TM) 2.4 (Rocko) release. For a full list of supported features and interfaces please refer to the online documentation. @@ -15,7 +15,6 @@ The current release has been verified and tested with the following OS versions: * Ubuntu 16.04 -* Ubuntu 14.04 # Supported Platforms @@ -65,7 +64,7 @@ hardware. # Installation Digi Embedded Yocto is composed of a set of different Yocto layers that work in -parallel. The layers are specified on a [manifest](https://github.com/digi-embedded/dey-manifest/blob/morty/default.xml) file. +parallel. The layers are specified on a [manifest](https://github.com/digi-embedded/dey-manifest/blob/rocko/default.xml) file. To install, please follow the instructions at the dey-manifest [README](https://github.com/digi-embedded/dey-manifest) @@ -80,91 +79,22 @@ Documentation is available online on the Digi documentation site: # Downloads -* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r3/images/ -* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r3/sdk/ +* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.4/r1/images/ +* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.4/r1/sdk/ # Release Changelog -## 2.2-r4 +## 2.4-r1 -* TBC - -## 2.2-r3 - -* Added support for ConnectCore 6 Plus platform -* Updated kernel version to v4.9 for ConnectCore 6UL platform -* Added Digi APIX C library to access and manage ConnectCore platforms interfaces: - * ADC - * GPIO - * I2C - * PWM - * SPI -* Updated AWS Greengrass Core software to v1.1.0 -* Updated TrustFence Code Signing Tool to v2.3.3 -* Default rootfs images are now Eclipse debug ready -* Updated documentation - -## 2.2-r2 - -* Fix for KRACK Attack vulnerability: - * [CVE-2017-13077](https://nvd.nist.gov/vuln/detail/CVE-2017-13077) - * [CVE-2017-13078](https://nvd.nist.gov/vuln/detail/CVE-2017-13078) - * [CVE-2017-13079](https://nvd.nist.gov/vuln/detail/CVE-2017-13079) - * [CVE-2017-13080](https://nvd.nist.gov/vuln/detail/CVE-2017-13080) - * [CVE-2017-13081](https://nvd.nist.gov/vuln/detail/CVE-2017-13081) - * [CVE-2017-13082](https://nvd.nist.gov/vuln/detail/CVE-2017-13082) - * [CVE-2017-13086](https://nvd.nist.gov/vuln/detail/CVE-2017-13086) - * [CVE-2017-13087](https://nvd.nist.gov/vuln/detail/CVE-2017-13087) - * [CVE-2017-13088](https://nvd.nist.gov/vuln/detail/CVE-2017-13088) -* Cloud Connector: fix connections through PPP -* Use NetworkManager for ethernet, wireless (station) and cellular network interfaces -* Updated kernel version to v4.1.41 for CC6 platform -* Added support for SPI Slave mode on CC6UL platform -* Added support for Atmel Cryptochip ATEC508A using Cryptoauthlib -* Network failover mechanism -* Raspberry Pi Sense hat Yocto support using meta-digi-maker layer for CC6UL SBC Express -* QT fonts fix -* QT software renderer for CC6UL -* Fix for CVE-2017-1000251 vulnerability (https://nvd.nist.gov/vuln/detail/CVE-2017-1000251) -* RS-485 kernel patches -* Powered by AWS certified on all supported hardware platforms including: - * AWS GreenGrass core software - * AWS IoT Device SDK for embedded C -* Updated AR6233 firmware for Radio Equipment Directive module certification -* QCA6564 WorldWide board data file available on request -* Includes MCA firmware v1.0: - * MCA analog tamper detection - * MCA ADC-based analog comparators -* Updated U-Boot to version 2015.04-r9 - * Added support for CC6UL variant 0x4 - * Added dynamic environment location and bad block handling for the environment - * TrustFence: - * Move RootFS encryption key to 'safe' partition - * Added support for four tamper interfaces - * Disable external memory boot in OTP for secure boot - * Skip initial scanning of bad blocks for faster boot on NAND - * Updated documentation - -## 2.2-r1 - -* Release based on [Yocto 2.2 (Morty)](https://www.yoctoproject.org/downloads/core/morty22) including: - * New toolchain based on GCC-6.2.0 and GLIBC-2.24 - * Updated Qt 5.7 - * Updated ModemManager with validated support for: - * Digi's XBee Cellular LTE Cat 1 (USA/Verizon), with P/N XBC-V1-UT-001 - * Digi's XBee Cellular 3G Global, with P/N XBC-M5-UT-001 - * U-Blox's TOBY L-200/L-210 - * Telit's LE910 and HE910 - * Huawei's ME909u - * Quectel's EC21 and EC25 - * Modified default networking settings: - * Defalt to dynamic IP addresses assignments - * Default station and softAP concurrent wireless mode - * TrustFence enabled - * Remote manager - * Local and remote manager firmware update +* Release based on [Yocto 2.4 (Rocko)](https://www.yoctoproject.org/downloads/core/rocko24) including: + * New toolchain based on GCC-7.2.0 and GLIBC-2.26 + * Updated Qt 5.9.4 * Package upgrades and security fixes - * U-boot support for 1GB DDR3 RAM on CC6UL +* Updated kernel version to v4.9 for ConnectCore 6 platform +* Updated U-Boot to version 2015.04-r12 +* Updated Cryptoauthlib version to v3.0 +* Added support for Goodix 10" display +* Updated documentation # Known Issues and Limitations From 42d43ff5fb558f1dcc1232bdfca4774d4071297c Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 27 Feb 2018 13:40:26 +0100 Subject: [PATCH 3/7] meta-digi: update revisions for dey-2.4-r1.1 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 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_4.9.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index b726aa3ba..54230b7f3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index 93777cf73..e1d4df4b3 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" S = "${WORKDIR}" @@ -14,7 +14,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ 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 855aed414..7b4bccaf7 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 @@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.2.80.63" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db" QCOM_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 69117b9ff..0e28a1877 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 @@ LOCALVERSION = "-dey" LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb index 284d85696..1711e6de7 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb @@ -3,6 +3,6 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v4.9/dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "60f3fd14ee838d8d5f48248d4d8b1553427404ca" COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul)" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index df5c2d21f..d52d4c8ce 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "ffdcec17192ed716a16222a0b8e14f8b344ee7e0" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 50039e728..c8ed19e1b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git/awsiot-sample" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb index fe1ee8ee7..b8d668a2b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git/cryptochip-get-random" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb index 964bbc91b..2ce1d19ff 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" LIBDIGIAPIX_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}" -SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LIBDIGIAPIX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 7d67c9075..96dffc62c 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" SRCBRANCH ?= "master" -SRCREV = "${AUTOREV}" +SRCREV = "02e9838b741b69d6cee0f5463a64e12f6112a265" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protocol=git" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protoco LIBDIGIAPIX_GIT_URI ?= "${@base_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://board.conf \ file://digiapix.sh \ From e3d086c472b84b250675a4e8f553ba42a5de3cd7 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 27 Feb 2018 16:05:38 +0100 Subject: [PATCH 4/7] meta-digi: revert revisions to AUTOREV Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 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_4.9.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 54230b7f3..b726aa3ba 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index e1d4df4b3..93777cf73 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" SRCBRANCH = "v2015.04/maint" -SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -14,7 +14,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ 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 7b4bccaf7..855aed414 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 @@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.2.80.63" SRCBRANCH = "dey-2.4/maint" -SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 0e28a1877..69117b9ff 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 @@ LOCALVERSION = "-dey" LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb index 1711e6de7..284d85696 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb @@ -3,6 +3,6 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v4.9/dey-2.4/maint" -SRCREV = "60f3fd14ee838d8d5f48248d4d8b1553427404ca" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul)" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d52d4c8ce..df5c2d21f 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "ffdcec17192ed716a16222a0b8e14f8b344ee7e0" +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=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index c8ed19e1b..50039e728 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" SRCBRANCH = "dey-2.4/maint" -SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" +SRCREV = "${AUTOREV}" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git/awsiot-sample" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb index b8d668a2b..fe1ee8ee7 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" SRCBRANCH = "dey-2.4/maint" -SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" +SRCREV = "${AUTOREV}" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git/cryptochip-get-random" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb index 2ce1d19ff..964bbc91b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" SRCBRANCH = "dey-2.4/maint" -SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" LIBDIGIAPIX_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}" -SRC_URI = "${LIBDIGIAPIX_GIT_URI};nobranch=1" +SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 96dffc62c..7d67c9075 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" SRCBRANCH ?= "master" -SRCREV = "02e9838b741b69d6cee0f5463a64e12f6112a265" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protocol=git" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protoco LIBDIGIAPIX_GIT_URI ?= "${@base_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://board.conf \ file://digiapix.sh \ From 73b3c2e255379c5b12b29c7303248ab00046e185 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 5 Mar 2018 10:40:50 +0100 Subject: [PATCH 5/7] dhcp: Add patch to avoid IP address changes during runtime Whenever there's a big time jump due to an outaded RTC being updated via NTP, detect the jump and update the DHCP lease's expiry times accordingly. https://jira.digi.com/browse/DEL-5233 Signed-off-by: Gabriel Valcazar --- ...f-the-rebind-time-has-expired-when-r.patch | 72 +++++++++++++++++++ .../dhcp/dhcp_4.3.6.bbappend | 5 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 meta-digi-dey/recipes-connectivity/dhcp/dhcp/0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch diff --git a/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch b/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch new file mode 100644 index 000000000..debc6d446 --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch @@ -0,0 +1,72 @@ +From: Gabriel Valcazar +Date: Mon, 5 Mar 2018 10:00:23 +0100 +Subject: [PATCH] dhclient: Check if the rebind time has expired when renewing + the lease + +If the system time suffers a big jump, the client will start the renewal +process but it will end prematurely due to the expiry of the lease time. By +adding this check, a time jump can be detected and the active lease can be +updated with the correct expiry dates. + +https://jira.digi.com/browse/DEL-5233 + +Signed-off-by: Gabriel Valcazar +--- + client/dhclient.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index dcf3f1a..9074373 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -101,6 +101,8 @@ char *mockup_relay = NULL; + + char *progname = NULL; + ++TIME time_of_binding; ++ + void run_stateless(int exit_mode, u_int16_t port); + + static isc_result_t write_duid(struct data_string *duid); +@@ -1440,6 +1442,9 @@ void bind_lease (client) + client->active = client->new; + client->new = NULL; + ++ /* Save the time at which the binding occurred. */ ++ time_of_binding = cur_time; ++ + /* Set up a timeout to start the renewal process. */ + tv.tv_sec = client->active->renewal; + tv.tv_usec = ((client->active->renewal - cur_tv.tv_sec) > 1) ? +@@ -1472,6 +1477,30 @@ void state_bound (cpp) + + ASSERT_STATE(state, S_BOUND); + ++ /* ++ * The T2 lease time for the active lease should never be expired when ++ * reaching this state. If so, it means there has been a time jump in ++ * the system's clock. In this case, update the lease with the correct ++ * times and create a new state_bound timeout. ++ */ ++ if (cur_time > client->active->rebind) { ++ struct timeval tv; ++ ++ TIME time_jump = cur_time - time_of_binding; ++ client->active->renewal += time_jump; ++ client->active->rebind += time_jump; ++ client->active->expiry += time_jump; ++ ++ rewrite_client_leases(); ++ ++ /* Set up a timeout to start the renewal process. */ ++ tv.tv_sec = client->active->renewal; ++ tv.tv_usec = ((client->active->renewal - cur_tv.tv_sec) > 1) ? ++ random() % 1000000 : cur_tv.tv_usec; ++ add_timeout(&tv, state_bound, client, 0, 0); ++ return; ++ } ++ + /* T1 has expired. */ + make_request (client, client -> active); + client -> xid = client -> packet.xid; + diff --git a/meta-digi-dey/recipes-connectivity/dhcp/dhcp_4.3.6.bbappend b/meta-digi-dey/recipes-connectivity/dhcp/dhcp_4.3.6.bbappend index 3e84852a1..fff60a133 100644 --- a/meta-digi-dey/recipes-connectivity/dhcp/dhcp_4.3.6.bbappend +++ b/meta-digi-dey/recipes-connectivity/dhcp/dhcp_4.3.6.bbappend @@ -2,4 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI += " file://0001-keep-resolv.conf-rights.patch" +SRC_URI += " \ + file://0001-keep-resolv.conf-rights.patch \ + file://0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch \ +" From dca3840b2ff5613c06be659585615f3192674d20 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 8 Mar 2018 13:10:38 +0100 Subject: [PATCH 6/7] bluetooth-init: remove verification to BT firmware was loaded successfully Firmware verification has a side effect in cc6ul sbc express platform that affects to the bluetooth initialization. https://jira.digi.com/browse/DEL-5802 Signed-off-by: Arturo Buzarra --- .../bluez/bluez5-5.41/ccimx6ul/bluetooth-init | 3 +-- .../bluez/bluez5-5.46/ccimx6ul/bluetooth-init | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/bluetooth-init index 47c6bb40f..e6a509279 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/bluetooth-init @@ -75,8 +75,7 @@ bluetooth_init() { if hciattach ttyBt qca ${BT_RATE:-3000000} -t30 ${BT_FLOW:-flow} unused ${BT_MACADDR} >${HCIATTACH_LOG} 2>&1; then # hciattach performs a reset to load the new firmware and needs some time to be ready sleep 1 - # Verify if firmware was loaded successfully - bdaddr >/dev/null 2>&1 && return + return fi sleep 1 diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.46/ccimx6ul/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.46/ccimx6ul/bluetooth-init index 47c6bb40f..e6a509279 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.46/ccimx6ul/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.46/ccimx6ul/bluetooth-init @@ -75,8 +75,7 @@ bluetooth_init() { if hciattach ttyBt qca ${BT_RATE:-3000000} -t30 ${BT_FLOW:-flow} unused ${BT_MACADDR} >${HCIATTACH_LOG} 2>&1; then # hciattach performs a reset to load the new firmware and needs some time to be ready sleep 1 - # Verify if firmware was loaded successfully - bdaddr >/dev/null 2>&1 && return + return fi sleep 1 From 1246ecff2cecea9247d94f36385608ac844d7abb Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 9 Mar 2018 18:38:01 +0100 Subject: [PATCH 7/7] meta-digi: update revisions for dey-2.4-r1.2 Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 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_4.9.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index b726aa3ba..54230b7f3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index 93777cf73..e1d4df4b3 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" S = "${WORKDIR}" @@ -14,7 +14,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ 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 855aed414..7b4bccaf7 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 @@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.2.80.63" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db" QCOM_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 69117b9ff..0e28a1877 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 @@ LOCALVERSION = "-dey" LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb index 284d85696..d79ed8282 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb @@ -3,6 +3,6 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v4.9/dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2c6ae4c53712b7717c70c2830e4ea4c99a59b53c" COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul)" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index df5c2d21f..d52d4c8ce 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "ffdcec17192ed716a16222a0b8e14f8b344ee7e0" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 50039e728..c8ed19e1b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git/awsiot-sample" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb index fe1ee8ee7..b8d668a2b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git/cryptochip-get-random" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb index 964bbc91b..2ce1d19ff 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2a5d119b94a6113655df026cfc4e4b41f29c008" LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" LIBDIGIAPIX_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}" -SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LIBDIGIAPIX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 7d67c9075..96dffc62c 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" SRCBRANCH ?= "master" -SRCREV = "${AUTOREV}" +SRCREV = "02e9838b741b69d6cee0f5463a64e12f6112a265" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protocol=git" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protoco LIBDIGIAPIX_GIT_URI ?= "${@base_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://board.conf \ file://digiapix.sh \