From dd21bd7870b7ac48bc8e00db61caf8ec3fc264a1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 27 Jul 2017 18:11:45 +0200 Subject: [PATCH 01/35] meta-digi: revert revisions to AUTOREV Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- 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_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 67263505d..03d459756 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" +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" +SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" 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 bcb89ee96..8c99a86e0 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" +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 55df3c7ab..f70e0e122 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -11,7 +11,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 67462434b..40c72fcdf 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.2/maint" -SRCREV = "a5a4a50693639c2bb7478f7f15fdd318feb705ee" +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 43d0f3201..1f7eb809e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index d6215f7f9..6d7e0ec69 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "8a6a9230dfe407e1764b5db8ef5b15601d85cfd2" +SRCREV = "${AUTOREV}" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 40c8a1533..6819a65b9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "eaa1199a097217aa619817654e022f2605c45be6" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 8c7128789..3718a6da4 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "f1a146c22d8c4e82ab8f3c51bf7efffa7653c458" +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 9f7e98759..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 = "5c79d1ddde37c18f4f311fb0046f85c1e2f6a38a" +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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index a6efe3998..b837549f7 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" +SRCREV = "${AUTOREV}" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};nobranch=1" +SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 abbdd0b8c..107243991 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,14 +14,14 @@ AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" SRCBRANCH = "dey-2.2/maint" -SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" +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 fe7bcd22f..00b24ac1f 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.2/maint" -SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" +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" From 86000bb0bb013c52547dd4ff2290c4eb5fde2dcc Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 28 Aug 2017 13:56:38 +0200 Subject: [PATCH 02/35] DIGI_EULA: Update Digi EULA file. Signed-off-by: Mike Engel https://jira.digi.com/browse/DEL-4859 --- meta-digi-arm/DIGI_EULA | 25 ++++++++----------- .../firmware-atheros/firmware-atheros.bb | 2 +- .../firmware-qualcomm/firmware-qualcomm.bb | 2 +- meta-digi-dey/DIGI_EULA | 25 ++++++++----------- 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/meta-digi-arm/DIGI_EULA b/meta-digi-arm/DIGI_EULA index 6b71da0ad..746d55223 100644 --- a/meta-digi-arm/DIGI_EULA +++ b/meta-digi-arm/DIGI_EULA @@ -1,13 +1,12 @@ END-USER LICENSE AGREEMENT - DIGI DEVELOPMENT KIT - (PN 90002118) This end-user license agreement is a legal agreement between you (either an individual or a single entity) and Digi International, Inc. ("Digi") for use of Digi Technology. This license applies to the -product with which it was shipped, which may be a Development Kit or a -unit of Digi Hardware. By using Digi product, you are consenting to be -bound by and are becoming a party to this end-user license agreement. +product with which it was provided, which may be a Development Kit, +Digi Software, or a unit of Digi Hardware. By using the product, +you are consenting to be bound by and are becoming a party to this +end-user license agreement. DEFINITIONS @@ -42,6 +41,13 @@ may only be used in conjunction with Digi Hardware. Copies of Digi Software may not be redistributed on a standalone basis or as part of any product not incorporating Digi Hardware. +DEVELOPMENT KITS + +Development Kits may include Digi Hardware. ALL DIGI HARDWARE PROVIDED IN +DEVELOPMENT KITS IS INTENDED FOR PRODUCT EVALUATION, DEVELOPMENT, AND +PROTOTYPING PURPOSES ONLY, AND MAY NOT BE USED IN OR IS WARRANTED FOR +PRODUCTION ENVIRONMENTS. + THIRD-PARTY COMPONENTS A Development Kit may contain third-party components. THE LICENSE TO USE @@ -79,12 +85,3 @@ and regulations concerning export and re-export of products, technology and documentation, including without limitation, the laws and regulations administered by the United States Department of Commerce and the United States Department of State. - -------------------------------------------------------------------------- - U-BOOT LICENSE NOTICE - -THE U-BOOT SOFTWARE THAT IS PROVIDED WITH DIGI SOFTWARE AND DIGI HARDWARE -IS COVERED BY THE GNU GENERAL PUBLIC LICENSE (VERSION 2 OR LATER) AS -PUBLISHED BY THE FREE SOFTWARE FOUNDATION. - -Please visit http://www.denx.de for current U-Boot license information. diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb index c039dc191..9cc5843fd 100644 --- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb +++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb @@ -3,7 +3,7 @@ SUMMARY = "Firmware files for Digi's platforms, such as Atheros bluetooth." SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=4c0991cfde5c8a92338cbfe0f4f9a5c6" +LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=8c0ad592dd48ace3d25eed5bbb26ba78" FW_ATH6KL = " \ file://athtcmd_ram.bin \ diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb index 5522fd5fe..b12bc2b14 100644 --- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb +++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb @@ -3,7 +3,7 @@ SUMMARY = "Qualcomm firmware files for Digi's platforms." SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=4c0991cfde5c8a92338cbfe0f4f9a5c6" +LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=8c0ad592dd48ace3d25eed5bbb26ba78" FW_QCA6564-BT = " \ file://qca/nvm_tlv_3.0.bin \ diff --git a/meta-digi-dey/DIGI_EULA b/meta-digi-dey/DIGI_EULA index 6b71da0ad..746d55223 100644 --- a/meta-digi-dey/DIGI_EULA +++ b/meta-digi-dey/DIGI_EULA @@ -1,13 +1,12 @@ END-USER LICENSE AGREEMENT - DIGI DEVELOPMENT KIT - (PN 90002118) This end-user license agreement is a legal agreement between you (either an individual or a single entity) and Digi International, Inc. ("Digi") for use of Digi Technology. This license applies to the -product with which it was shipped, which may be a Development Kit or a -unit of Digi Hardware. By using Digi product, you are consenting to be -bound by and are becoming a party to this end-user license agreement. +product with which it was provided, which may be a Development Kit, +Digi Software, or a unit of Digi Hardware. By using the product, +you are consenting to be bound by and are becoming a party to this +end-user license agreement. DEFINITIONS @@ -42,6 +41,13 @@ may only be used in conjunction with Digi Hardware. Copies of Digi Software may not be redistributed on a standalone basis or as part of any product not incorporating Digi Hardware. +DEVELOPMENT KITS + +Development Kits may include Digi Hardware. ALL DIGI HARDWARE PROVIDED IN +DEVELOPMENT KITS IS INTENDED FOR PRODUCT EVALUATION, DEVELOPMENT, AND +PROTOTYPING PURPOSES ONLY, AND MAY NOT BE USED IN OR IS WARRANTED FOR +PRODUCTION ENVIRONMENTS. + THIRD-PARTY COMPONENTS A Development Kit may contain third-party components. THE LICENSE TO USE @@ -79,12 +85,3 @@ and regulations concerning export and re-export of products, technology and documentation, including without limitation, the laws and regulations administered by the United States Department of Commerce and the United States Department of State. - -------------------------------------------------------------------------- - U-BOOT LICENSE NOTICE - -THE U-BOOT SOFTWARE THAT IS PROVIDED WITH DIGI SOFTWARE AND DIGI HARDWARE -IS COVERED BY THE GNU GENERAL PUBLIC LICENSE (VERSION 2 OR LATER) AS -PUBLISHED BY THE FREE SOFTWARE FOUNDATION. - -Please visit http://www.denx.de for current U-Boot license information. From 8b6559f54d4fd2d653b31b8af208f7e494268ccf Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Fri, 22 Sep 2017 14:43:53 +0200 Subject: [PATCH 03/35] README: Add installation instructions Signed-off-by: Alex Gonzalez --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 379a9e32e..e04f1c4ae 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 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 2.2 (Morty) Yocto release. +Digi Embedded Yocto 2.2 is based on the Yocto Project(TM) 2.2 (Morty) release. For a full list of supported features and interfaces please refer to the online documentation. @@ -49,6 +49,13 @@ Software for the following hardware platforms is in production support: Previous versions of Digi Embedded Yocto include support for additional Digi 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. + +To install, please follow the instructions at the dey-manifest [README](https://github.com/digi-embedded/dey-manifest) + # Documentation Documentation is available online on the Digi documentation site: From 76cca1e0e2fd632a7a48e9a67ecc153779de1638 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 3 Aug 2017 17:56:29 +0200 Subject: [PATCH 04/35] qtbase: optimize libraries for size on CC6UL This patch makes smaller libQt libraries saving some space in the CC6UL rootfs. Libraries size before the patch: root@ccimx6ulsbc:~# ls -l /usr/lib/libQt*5.7.1 22448 Aug /usr/lib/libQt5Concurrent.so.5.7.1 5347036 Aug /usr/lib/libQt5Core.so.5.7.1 508464 Aug /usr/lib/libQt5DBus.so.5.7.1 4419712 Aug /usr/lib/libQt5Gui.so.5.7.1 1367776 Aug /usr/lib/libQt5Network.so.5.7.1 275900 Aug /usr/lib/libQt5OpenGL.so.5.7.1 341688 Aug /usr/lib/libQt5PrintSupport.so.5.7.1 88628 Aug /usr/lib/libQt5SerialPort.so.5.7.1 290960 Aug /usr/lib/libQt5Sql.so.5.7.1 212432 Aug /usr/lib/libQt5Test.so.5.7.1 5306588 Aug /usr/lib/libQt5Widgets.so.5.7.1 894928 Aug /usr/lib/libQt5XcbQpa.so.5.7.1 191404 Aug /usr/lib/libQt5Xml.so.5.7.1 Libraries size after the patch: root@ccimx6ulsbc:~# ls -l /usr/lib/libQt*5.7.1 18352 Aug /usr/lib/libQt5Concurrent.so.5.7.1 4032380 Aug /usr/lib/libQt5Core.so.5.7.1 303684 Aug /usr/lib/libQt5DBus.so.5.7.1 2867436 Aug /usr/lib/libQt5Gui.so.5.7.1 839428 Aug /usr/lib/libQt5Network.so.5.7.1 239044 Aug /usr/lib/libQt5OpenGL.so.5.7.1 267976 Aug /usr/lib/libQt5PrintSupport.so.5.7.1 59960 Aug /usr/lib/libQt5SerialPort.so.5.7.1 172192 Aug /usr/lib/libQt5Sql.so.5.7.1 171500 Aug /usr/lib/libQt5Test.so.5.7.1 4282740 Aug /usr/lib/libQt5Widgets.so.5.7.1 616420 Aug /usr/lib/libQt5XcbQpa.so.5.7.1 154556 Aug /usr/lib/libQt5Xml.so.5.7.1 https://jira.digi.com/browse/DEL-4644 Signed-off-by: Javier Viguera (cherry picked from commit c62d5e1e42b774712bd54a267ffe6024065fd5ce) --- ...0001-gcc-base.conf-optimize-for-size.patch | 24 +++++++++++++++++++ .../recipes-qt/qt5/qtbase_%.bbappend | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch new file mode 100644 index 000000000..7ad545e8a --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch @@ -0,0 +1,24 @@ +From: Javier Viguera +Date: Thu, 3 Aug 2017 15:21:21 +0200 +Subject: [PATCH] gcc-base.conf: optimize for size + +Signed-off-by: Javier Viguera +--- + mkspecs/common/gcc-base.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf +index 6e043f558f1c..e77fb93326d4 100644 +--- a/mkspecs/common/gcc-base.conf ++++ b/mkspecs/common/gcc-base.conf +@@ -31,8 +31,8 @@ + # you can use the manual test in tests/manual/mkspecs. + # + +-QMAKE_CFLAGS_OPTIMIZE = -O2 +-QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 ++QMAKE_CFLAGS_OPTIMIZE = -Os ++QMAKE_CFLAGS_OPTIMIZE_FULL = -Os + + QMAKE_CFLAGS += -pipe + QMAKE_CFLAGS_DEPS += -M diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index b4012bc2b..58da3e060 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -3,6 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_append = " file://qt5.sh" +SRC_URI_append_ccimx6ul = " file://0001-gcc-base.conf-optimize-for-size.patch" PACKAGECONFIG_append = " accessibility examples fontconfig sql-sqlite" PACKAGECONFIG_append_ccimx6 = " icu" From efb7812262377ed43b67ca46cf3538ada15d88bb Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 3 Aug 2017 18:48:58 +0200 Subject: [PATCH 05/35] packagegroup-dey-qt: add fonts package In the past QT package did include some fonts, but not anymore. New versions of QT do rely on an external font package being installed in the rootfs. Without fonts the QT applications just show up in the screen but obviously with no text at all. https://jira.digi.com/browse/DEL-4724 Signed-off-by: Javier Viguera (cherry picked from commit 02547c653061383e9e612b4560788d3f5904567b) --- .../recipes-graphics/packagegroups/packagegroup-dey-qt.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb index bb4c9ef47..2e975d56c 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb @@ -30,6 +30,7 @@ QT5_DEMOS_append_ccimx6 = " \ " RDEPENDS_${PN} += " \ + liberation-fonts \ ${QT5_PKS} \ ${QT5_DEMOS} \ ${QT5_EXAMPLES} \ From 20afd0ab6f180496a6cafbee99645df00a4599ba Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Fri, 4 Aug 2017 08:39:35 +0200 Subject: [PATCH 06/35] bluez5: port test-discovery and bluezutils.py to work with python3 https://jira.digi.com/browse/DEL-4039 Signed-off-by: Isaac Hermida (cherry picked from commit 4bc9e7cbd54128c9844adabdda0dcd1281c1e4d5) --- .../0025-port-test-discovery-to-python3.patch | 99 +++++++++++++++++++ .../bluez/bluez5_5.41.bbappend | 3 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0025-port-test-discovery-to-python3.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0025-port-test-discovery-to-python3.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0025-port-test-discovery-to-python3.patch new file mode 100644 index 000000000..25cc37ccf --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0025-port-test-discovery-to-python3.patch @@ -0,0 +1,99 @@ +From: Isaac Hermida +Date: Thu, 3 Aug 2017 14:10:43 +0200 +Subject: [PATCH] port test-discovery to python3 + +Signed-off-by: Isaac Hermida +--- + test/bluezutils.py | 4 ++-- + test/test-discovery | 16 +++++++++------- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/test/bluezutils.py b/test/bluezutils.py +index de08cbdcb712..cd8964082450 100644 +--- a/test/bluezutils.py ++++ b/test/bluezutils.py +@@ -15,7 +15,7 @@ def find_adapter(pattern=None): + + def find_adapter_in_objects(objects, pattern=None): + bus = dbus.SystemBus() +- for path, ifaces in objects.iteritems(): ++ for path, ifaces in objects.items(): + adapter = ifaces.get(ADAPTER_INTERFACE) + if adapter is None: + continue +@@ -35,7 +35,7 @@ def find_device_in_objects(objects, device_address, adapter_pattern=None): + if adapter_pattern: + adapter = find_adapter_in_objects(objects, adapter_pattern) + path_prefix = adapter.object_path +- for path, ifaces in objects.iteritems(): ++ for path, ifaces in objects.items(): + device = ifaces.get(DEVICE_INTERFACE) + if device is None: + continue +diff --git a/test/test-discovery b/test/test-discovery +index cea77683d726..852611c862ea 100755 +--- a/test/test-discovery ++++ b/test/test-discovery +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + from __future__ import absolute_import, print_function, unicode_literals + +@@ -18,9 +18,9 @@ def print_compact(address, properties): + name = "" + address = "" + +- for key, value in properties.iteritems(): ++ for key, value in properties.items(): + if type(value) is dbus.String: +- value = unicode(value).encode('ascii', 'replace') ++ value = str(value) + if (key == "Name"): + name = value + elif (key == "Address"): +@@ -41,7 +41,7 @@ def print_normal(address, properties): + for key in properties.keys(): + value = properties[key] + if type(value) is dbus.String: +- value = unicode(value).encode('ascii', 'replace') ++ value = str(value) + if (key == "Class"): + print(" %s = 0x%06x" % (key, value)) + else: +@@ -61,6 +61,8 @@ def skip_dev(old_dev, new_dev): + return False + + def interfaces_added(path, interfaces): ++ if "org.bluez.Device1" not in interfaces.keys(): ++ return + properties = interfaces["org.bluez.Device1"] + if not properties: + return +@@ -70,7 +72,7 @@ def interfaces_added(path, interfaces): + + if compact and skip_dev(dev, properties): + return +- devices[path] = dict(devices[path].items() + properties.items()) ++ devices[path] = dict(list(devices[path].items()) + list(properties.items())) + else: + devices[path] = properties + +@@ -93,7 +95,7 @@ def properties_changed(interface, changed, invalidated, path): + + if compact and skip_dev(dev, changed): + return +- devices[path] = dict(devices[path].items() + changed.items()) ++ devices[path] = dict(list(devices[path].items()) + list(changed.items())) + else: + devices[path] = changed + +@@ -152,7 +154,7 @@ if __name__ == '__main__': + om = dbus.Interface(bus.get_object("org.bluez", "/"), + "org.freedesktop.DBus.ObjectManager") + objects = om.GetManagedObjects() +- for path, interfaces in objects.iteritems(): ++ for path, interfaces in objects.items(): + if "org.bluez.Device1" in interfaces: + devices[path] = interfaces["org.bluez.Device1"] + diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend index 2e7c7e210..7e54c309c 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2015 Digi International. +# Copyright (C) 2015-2017 Digi International. FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" @@ -7,6 +7,7 @@ SRC_URI += " \ file://main.conf \ file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \ file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \ + file://0025-port-test-discovery-to-python3.patch \ " SRC_URI_append_ccimx6ul = " \ From 5b252350f1636b496d44c0931b0479f0a5e8c714 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 3 Aug 2017 12:00:33 +0200 Subject: [PATCH 07/35] bridgeifupdown: fix script to create a bridge with a wireless interface The supplicant support for a bridge was not being managed, then the bridge was failing when the softap was configured with an encryption. With this change we launch a supplicant instance with the bridge support after checking that the /etc/network/interfaces contains the required parameters. https://jira.digi.com/browse/DEL-4454 Signed-off-by: Arturo Buzarra (cherry picked from commit 9c5774ed62b84d113b43c9be3e9a2013b3cc240e) --- .../busybox/busybox-1.24.1/bridgeifupdown | 56 +++++++++++++++++-- .../ccimx6/interfaces.br0.example | 9 +++ .../{ => ccimx6ul}/interfaces.br0.example | 0 3 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6/interfaces.br0.example rename meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/{ => ccimx6ul}/interfaces.br0.example (100%) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/bridgeifupdown b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/bridgeifupdown index 9191224f8..cbf5e3acb 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/bridgeifupdown +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/bridgeifupdown @@ -1,4 +1,43 @@ #!/bin/sh + +VERBOSITY=0 + +start_stop_wpa_supplicant() { + BRIDGE_WPA_IFACE="${1}" + WPA_SUP_BIN="/usr/sbin/wpa_supplicant" + WPA_SUP_PNAME="wpa_supplicant" + WPA_SUP_PIDFILE="/var/run/wpa_supplicant.${BRIDGE_WPA_IFACE}.pid" + WPA_SUP_OPTIONS="-B -P ${WPA_SUP_PIDFILE} -i ${BRIDGE_WPA_IFACE}" + + if [ -z "${IF_BRIDGE_WPA_DRIVER}" ]; then + echo "${WPA_SUP_PNAME}: missing bridge_wpa_driver property for bridge interface ${IFACE}" + exit 1 + fi + + case "${MODE}" in + start) + if [ "${VERBOSITY}" = "1" ]; then + echo "${WPA_SUP_PNAME}: ${WPA_SUP_BIN} ${WPA_SUP_OPTIONS} -c ${IF_BRIDGE_WPA_CONF} -D ${IF_BRIDGE_WPA_DRIVER}" + fi + + start-stop-daemon --start --quiet \ + --name ${WPA_SUP_PNAME} --startas ${WPA_SUP_BIN} --pidfile ${WPA_SUP_PIDFILE} \ + -- ${WPA_SUP_OPTIONS} -c ${IF_BRIDGE_WPA_CONF} -D ${IF_BRIDGE_WPA_DRIVER} -b ${IFACE} + + # Wait for wireless to be ready + sleep 0.5 + ;; + stop) + if [ "${VERBOSITY}" = "1" ]; then + echo "${WPA_SUP_PNAME}: terminating ${WPA_SUP_PNAME} daemon" + fi + + start-stop-daemon --stop --quiet \ + --name ${WPA_SUP_PNAME} --pidfile ${WPA_SUP_PIDFILE} + ;; + esac +} + # Execute only if the interface has a bridge_ports property (this characterizes bridge interfaces) case "$IF_BRIDGE_PORTS" in "") @@ -16,16 +55,19 @@ if [ "$MODE" = "start" ] && [ ! -d /sys/class/net/$IFACE ]; then # Create the bridge interface using brctl brctl addbr $IFACE || exit 1 - # Wait for wlan0 to be ready - sleep 0.5 - # For all the interfaces in bridge ports, attach to the bridge and remove ip for port in $INTERFACES; do + if [ -d "/sys/class/net/${port}/wireless" ] && [ -n "${IF_BRIDGE_WPA_CONF}" ]; then + # Launch wpa_supplicant with bridge support + start_stop_wpa_supplicant ${port} + fi + + # Turn up the interface and include in the bridge brctl addif $IFACE $port && ifconfig $port 0.0.0.0 up done # Setup the bridge (only options supported by busybox) - [ -n "$IF_BRIDEG_AGEING" ] && brctl setageing $IFACE $IF_BRIDGE_AGEING + [ -n "$IF_BRIDGE_AGEING" ] && brctl setageing $IFACE $IF_BRIDGE_AGEING [ -n "$IF_BRIDGE_BRIDGEPRIO" ] && brctl setbridgeprio $IFACE $IF_BRIDGE_BRIDGEPRIO [ -n "$IF_BRIDGE_FD" ] && brctl setfd $IFACE $IF_BRIDGE_FD [ -n "$IF_BRIDGE_HELLO" ] && brctl sethello $IFACE $IF_BRIDGE_HELLO @@ -43,10 +85,14 @@ elif [ "$MODE" = "stop" ]; then # Remove port interfaces from the bridge for port in $INTERFACES; do + if [ -d "/sys/class/net/${port}/wireless" ] && [ -n "${IF_BRIDGE_WPA_CONF}" ]; then + # Stop the wpa_supplicant instance for the bridge + start_stop_wpa_supplicant ${port} + fi + ifconfig $port down && brctl delif $IFACE $port done # Destroy the interface brctl delbr $IFACE fi - diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6/interfaces.br0.example b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6/interfaces.br0.example new file mode 100644 index 000000000..6244da561 --- /dev/null +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6/interfaces.br0.example @@ -0,0 +1,9 @@ + +## Example bridge between eth0 and wlan0 +#auto br0 +#iface br0 inet static +# bridge_ports eth0 wlan0 +# address 192.168.42.50 +# netmask 255.255.255.0 +# bridge_wpa_driver nl80211 +# bridge_wpa_conf /etc/wpa_supplicant.conf diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces.br0.example b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/interfaces.br0.example similarity index 100% rename from meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces.br0.example rename to meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/interfaces.br0.example From d28fa6e87a0f0a7dd0ef9ed0bcba53e09f68053f Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 8 Aug 2017 13:06:50 +0200 Subject: [PATCH 08/35] mca_tool: update checksums for build 1.10 Signed-off-by: Hector Palacios (cherry picked from commit bbe77432559401700aa3ebc8f52e8f9e16027a1b) --- .../recipes-digi/mca/{mca-tool_1.9.bb => mca-tool_1.10.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.9.bb => mca-tool_1.10.bb} (70%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.9.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.10.bb similarity index 70% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.9.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.10.bb index f0371a72b..206e0abe2 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.9.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.10.bb @@ -7,8 +7,8 @@ LICENSE = "CLOSED" PKGNAME = "mca_tool" SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "3d954ceb361efa8325c9fae280c95775" -SRC_URI[sha256sum] = "874f02bc1ad7d1768879cff563888666c70691b12404a986af2e5743b3e3e628" +SRC_URI[md5sum] = "e739879489b2d0f0ab2fa61f60af80f6" +SRC_URI[sha256sum] = "af2eb7abebfbabe228c574b887d166d2ef5ad5b3a9308ccd07778d0ccbed1e8b" S = "${WORKDIR}/${PKGNAME}-${PV}" From c5553d17fa95fdfcf9404de4ef610e2f31aa3e4f Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 9 Aug 2017 18:31:12 +0200 Subject: [PATCH 09/35] qt: add support for Qt Quick 2D Renderer in the CC6UL This is an alternative software based renderer for QtQuick2 applications for hardware that doesn't have a GPU. This is the case of the CC6UL. It does not have a GPU, so the only way to run QML applications is using this software renderer. https://jira.digi.com/browse/DEL-3912 Signed-off-by: Javier Viguera (cherry picked from commit e623c365ff553df5b2b172d85b548f28f1c2f9a1) --- .../recipes-graphics/packagegroups/packagegroup-dey-qt.bb | 1 + meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb index 2e975d56c..fc792f1ad 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb @@ -11,6 +11,7 @@ MACHINE_QT5_EXTRA_INSTALL_ccimx6 ?= "qtwebengine-examples" QT5_PKS = "qtserialport" QT5_PKS_append_ccimx6 = " qtdeclarative-tools" +QT5_PKS_append_ccimx6ul = " qtdeclarative-render2d-plugins" QT5_EXAMPLES = "qtbase-examples" QT5_EXAMPLES_append_ccimx6 = " \ diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh index e64709644..68dcf6f85 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh @@ -1,2 +1,5 @@ # Use LINUXFB platform plugin for images without X11 [ -f "/etc/init.d/xserver-nodm" ] || export QT_QPA_PLATFORM="linuxfb" + +# Use Qt Quick 2D Renderer +export QMLSCENE_DEVICE="softwarecontext" From aaaeef29193778b3b4729e41e85ff0c7b450eee1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 9 Aug 2017 18:31:44 +0200 Subject: [PATCH 10/35] qtsmarthome: fix missing runtime dependence The demo application uses 'svg' images, so at runtime it depends on 'qtsvg-plugins' package. Also add a patch to fix a runtime warning: Both point size and pixel size set. Using pixel size https://jira.digi.com/browse/DEL-3912 Signed-off-by: Javier Viguera (cherry picked from commit 48ff14dc78c67df11e454645b32abc39625d531f) --- ...0001-qtsmarthome-fix-runtime-warning.patch | 24 +++++++++++++++++++ .../examples/qtsmarthome_1.0.bbappend | 7 ++++++ 2 files changed, 31 insertions(+) create mode 100644 meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch create mode 100644 meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend diff --git a/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch b/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch new file mode 100644 index 000000000..4ed074e69 --- /dev/null +++ b/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch @@ -0,0 +1,24 @@ +From: Javier Viguera +Date: Tue, 8 Aug 2017 18:17:46 +0200 +Subject: [PATCH] qtsmarthome: fix runtime warning + +Both point size and pixel size set. Using pixel size. + +Signed-off-by: Javier Viguera +--- + components/qml/components/timepicker/PickerPathView.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/components/qml/components/timepicker/PickerPathView.qml b/components/qml/components/timepicker/PickerPathView.qml +index 7038331e3aae..1987d72e32b9 100644 +--- a/components/qml/components/timepicker/PickerPathView.qml ++++ b/components/qml/components/timepicker/PickerPathView.qml +@@ -74,7 +74,7 @@ PathView { + verticalAlignment: Text.AlignVCenter + text: modelData + Component.onCompleted: { +- font.pointSize = font.pointSize * 0.8 ++ font.pixelSize = font.pixelSize * 0.8 + } + } + diff --git a/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend b/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend new file mode 100644 index 000000000..b6f12c13a --- /dev/null +++ b/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend @@ -0,0 +1,7 @@ +# Copyright (C) 2017, Digi International Inc. + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" + +SRC_URI += "file://0001-qtsmarthome-fix-runtime-warning.patch" + +RDEPENDS_${PN} += "qtsvg-plugins" From 0c36e0ad56b87362ae9d435c3b3e5a201adca137 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 9 Aug 2017 18:32:17 +0200 Subject: [PATCH 11/35] qtsmarthome: move desktop launcher from qt5-demo-extrafiles recipe Instead of having a recipe to add launchers for a bunch of applications (most of them are not available anymore) move the qtsmarthome launcher to the recipe that installs the package. https://jira.digi.com/browse/DEL-3912 Signed-off-by: Javier Viguera (cherry picked from commit 64010754d07bd7c392436987963a83013496d3f6) --- .../qt5-demo-extrafiles.bbappend | 3 +++ .../qtsmarthome-1.0/qtsmarthome.desktop | 9 +++++++++ .../examples/qtsmarthome-1.0/qtsmarthome.png | Bin 0 -> 19986 bytes .../examples/qtsmarthome_1.0.bbappend | 12 +++++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/qtsmarthome.desktop create mode 100644 meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/qtsmarthome.png diff --git a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend index 508a98fdc..481ffc15d 100644 --- a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend +++ b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend @@ -15,6 +15,9 @@ do_install_append () { install -m 0644 ${WORKDIR}/qmlvideo.desktop ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/qmlvideo.png ${D}${datadir}/pixmaps/ + # Remove the desktop launchers that have been moved along with its package + rm -f ${D}${datadir}/applications/qtsmarthome.desktop ${D}${datadir}/pixmaps/qtsmarthome.png + # Remove the desktop launchers of the demo/example applications we do not provide. rm -f ${D}${datadir}/applications/hellogl_es2.desktop ${D}${datadir}/pixmaps/hellogl_es2.png rm -f ${D}${datadir}/applications/qt5basket.desktop ${D}${datadir}/pixmaps/qt5basket.png diff --git a/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/qtsmarthome.desktop b/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/qtsmarthome.desktop new file mode 100644 index 000000000..fef8057a8 --- /dev/null +++ b/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/qtsmarthome.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt5 Smart Home +Exec=/bin/sh -c "cd /usr/share/qtsmarthome-1.0/; ./smarthome" +Icon=qtsmarthome +Terminal=false +Type=Application +X-MB-SingleInstance=true +Comment=Qt5 Smart Home +StartupNotify=false diff --git a/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/qtsmarthome.png b/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/qtsmarthome.png new file mode 100644 index 0000000000000000000000000000000000000000..d364da8ca348d1200e1880c848ce247eeb575213 GIT binary patch literal 19986 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 Date: Wed, 9 Aug 2017 18:32:49 +0200 Subject: [PATCH 12/35] packagegroup-dey-qt: rework default installed packages This only affects the CC6UL, where by default now 'qtsmarthome' is installed instead of 'qtbase-examples'. This serves two purposes: * Remove the 'qtbase-examples' package from the CC6UL to save space. * Use 'qtsmarthome' as a demo of a QML application running on the CC6UL using Qt Quick 2D Renderer. https://jira.digi.com/browse/DEL-3912 Signed-off-by: Javier Viguera (cherry picked from commit 4c5a7fd3f8bccce0edaf1802e6f89f7dd991dfcd) --- .../recipes-graphics/packagegroups/packagegroup-dey-qt.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb index fc792f1ad..209438c87 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb @@ -13,21 +13,21 @@ QT5_PKS = "qtserialport" QT5_PKS_append_ccimx6 = " qtdeclarative-tools" QT5_PKS_append_ccimx6ul = " qtdeclarative-render2d-plugins" -QT5_EXAMPLES = "qtbase-examples" +QT5_EXAMPLES = "" QT5_EXAMPLES_append_ccimx6 = " \ qt3d-examples \ + qtbase-examples \ qtconnectivity-examples \ qtdeclarative-examples \ qtmultimedia-examples \ qtsvg-examples \ " -QT5_DEMOS = "" +QT5_DEMOS = "qtsmarthome" QT5_DEMOS_append_ccimx6 = " \ cinematicexperience \ qt5-demo-extrafiles \ qt5everywheredemo \ - qtsmarthome \ " RDEPENDS_${PN} += " \ From 47ece15f5dc67339efedb0630982d53738c5aefb Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Mon, 28 Aug 2017 17:26:17 +0200 Subject: [PATCH 13/35] imx6ul: ubifs: increase max leb count for linux The current value only allows partitions of up to 8 MiB, which is not enough for the 0x04 variant (which uses a linux partition of 24 MiB by default). This new value allows for up to 32 MiB (assuming 128 KiB erase block size). Also add comments explaining the -c value and maximum partition sizes supported. https://jira.digi.com/browse/DEL-4971 Signed-off-by: Jose Diaz de Grenu (cherry picked from commit 608b001036081ea01301ed517dea60cf674c48a4) --- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 6c1d679fd..302bf54d9 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -39,7 +39,9 @@ MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qual KERNEL_IMAGETYPE = "zImage" # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files) -MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 127" +# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size. +MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255" # mkfs.ubifs parameters for rootfs partition +# Max LEB count (-c 8191) calculated for a partition of up to 1 GiB considering 128 KiB erase-block size. MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191" From 6c3dfad878a2dd5d6282790ab5d16562cc27277d Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Tue, 29 Aug 2017 10:45:24 +0200 Subject: [PATCH 14/35] init-ifupdown: fix interfaces order The bridge example uses the wireless interface and it assumes that it is initialized, so it must be placed after it. https://jira.digi.com/browse/DEL-4823 Signed-off-by: Jose Diaz de Grenu (cherry picked from commit d7c8fa4b9a8485150443bc9af21256579d8ac722) --- .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 60cd13e5d..388399008 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -30,7 +30,6 @@ do_install_append() { sed -i -e 's,##WLAN_P2P_INTERFACE##,${WLAN_P2P_INTERFACE},g' ${D}${sysconfdir}/network/interfaces fi fi - cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces # Remove config entries if corresponding variable is not defined [ -z "${P2P0_STATIC_DNS}" ] && sed -i -e "/##P2P0_STATIC_DNS##/d" ${D}${sysconfdir}/network/interfaces @@ -46,6 +45,10 @@ do_install_append() { sed -i -e "s,##WPA_DRIVER##,${WPA_DRIVER},g" ${D}${sysconfdir}/network/interfaces } +do_install_append_ccimx6sbc() { + cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces +} + do_install_append_ccimx6ul() { install -d ${D}${base_bindir} install -m 0755 ${WORKDIR}/virtwlans.sh ${D}${base_bindir} @@ -64,6 +67,8 @@ do_install_append_ccimx6ul() { sed -i -e "s,##WLAN1_STATIC_NETMASK##,${WLAN1_STATIC_NETMASK},g" ${D}${sysconfdir}/network/interfaces sed -i -e "s,##WLAN1_STATIC_GATEWAY##,${WLAN1_STATIC_GATEWAY},g" ${D}${sysconfdir}/network/interfaces sed -i -e "s,##WLAN1_STATIC_DNS##,${WLAN1_STATIC_DNS},g" ${D}${sysconfdir}/network/interfaces + + cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces } # Disable wireless interfaces on first boot for non-wireless variants From 8b24f919b238717e69b0cd7d49b2f9b96bcd779c Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Tue, 29 Aug 2017 10:48:32 +0200 Subject: [PATCH 15/35] init-ifupdown: use wlan1 for the bridging example wlan1 is the interface used for SoftAP, so use that one instead. This also matches with the 'Network bridging' chapter of the documentation. https://jira.digi.com/browse/DEL-4823 Signed-off-by: Jose Diaz de Grenu (cherry picked from commit e6beba4cb0ecd51ef405910e51586598b651e6ca) --- .../init-ifupdown-1.0/ccimx6ul/interfaces.br0.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/interfaces.br0.example b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/interfaces.br0.example index 8340c5611..60e05fe52 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/interfaces.br0.example +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/interfaces.br0.example @@ -1,7 +1,7 @@ -## Example bridge between eth0 and wlan0 +## Example bridge between eth0 and wlan1 #auto br0 #iface br0 inet static -# bridge_ports eth0 wlan0 +# bridge_ports eth0 wlan1 # address 192.168.42.50 # netmask 255.255.255.0 From c9bdb375251640597cb4c2c0b26ebecb34f7f211 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 25 Sep 2017 15:20:01 +0200 Subject: [PATCH 16/35] mca_tool: update checksums for build 1.11 Signed-off-by: Hector Palacios (cherry picked from commit c9e81ed4eca0360e13fb3f3bd4a390310f2477c4) --- .../recipes-digi/mca/{mca-tool_1.10.bb => mca-tool_1.11.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.10.bb => mca-tool_1.11.bb} (70%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.10.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.11.bb similarity index 70% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.10.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.11.bb index 206e0abe2..a377aa142 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.10.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.11.bb @@ -7,8 +7,8 @@ LICENSE = "CLOSED" PKGNAME = "mca_tool" SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "e739879489b2d0f0ab2fa61f60af80f6" -SRC_URI[sha256sum] = "af2eb7abebfbabe228c574b887d166d2ef5ad5b3a9308ccd07778d0ccbed1e8b" +SRC_URI[md5sum] = "7a2c1119914cfc59c2b8463dba155d03" +SRC_URI[sha256sum] = "71a9002851520947aca443b536327b08a5f413e71a9d6ba79d00e32180220b71" S = "${WORKDIR}/${PKGNAME}-${PV}" From 1279aef05fb81c8cba4213e5c21295ba3f6c0d69 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Fri, 29 Sep 2017 14:05:05 +0200 Subject: [PATCH 17/35] meta-digi-arm: firmware-atheros: update binary. CC6 PS_ASIC_class_1.pst MD5SUM be8766069eed652449682d9006dd6ecd https://jira.digi.com/browse/DEL-5057 Signed-off-by: Francisco Gil (cherry picked from commit 74b734f0953d3d054cae7a3efcb0f5a01febfce3) --- .../firmware-atheros/ccimx6/PS_ASIC_class_1.pst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/PS_ASIC_class_1.pst b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/PS_ASIC_class_1.pst index d749a0774..0155e02ee 100644 --- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/PS_ASIC_class_1.pst +++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/PS_ASIC_class_1.pst @@ -72,10 +72,10 @@ # [H:S]0013 [H:S]00F0 -[H:A]C1 C1 20 02 BD 08 FE FE C9 00 00 CC B1 01 20 00 +[H:A]C1 C1 20 02 BD 08 FE FE C2 00 00 CC B1 01 20 00 FF CC 02 CC 04 00 B6 FB A9 90 00 21 00 E0 FF CC 08 CC 1E 00 80 84 00 07 DB 05 93 11 FF CC 0E CC - 0B 00 E4 FF 61 47 00 00 4D FD 61 47 00 00 58 FD + 0A 00 E4 FF 61 47 00 00 4D FD 61 47 00 00 58 FD E8 FF 41 27 04 00 6F FD 41 27 04 00 6C FD EC FF A0 A7 00 00 2F FD A0 A7 00 00 6D FD F0 FF 60 27 01 00 50 FD 60 27 01 00 6F FD F4 FF A0 C7 04 00 @@ -83,8 +83,7 @@ 80 C7 08 00 58 FD FC FF 40 47 09 00 66 FD 40 47 09 00 0B FD 00 00 80 C7 0D 00 09 FD 80 C7 0D 00 09 FD 04 00 20 47 0E 40 58 FD 20 47 0E 40 58 FD - 08 00 40 47 12 40 58 FD 40 47 12 40 58 FD 0C 00 - 40 47 12 40 58 FD 40 47 12 40 58 FD FF CC 0F CC + 08 00 40 47 12 40 58 FD 40 47 12 40 58 FD FF CC 0F CC 01 01 01 01 07 04 03 33 00 0A 00 04 00 00 60 6D F0 00 66 01 00 00 00 00 00 00 FF CC 10 CC 22 81 From c084b9b83aef93a1e77ddbdfc5f99128d6e95bb8 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Wed, 4 Oct 2017 15:48:16 +0200 Subject: [PATCH 18/35] cellular: Enable IPV6 support. This commit enables the IPV6 support that is necessary for the XBee Cellular LTE Cat1 modem. Signed-off-by: Mike Engel https://jira.digi.com/browse/DEL-4839 (cherry picked from commit a5cfaa921d182cc862c10bcf4c58b0c01166cd2b) --- .../networkmanager/networkmanager/nm.cellular | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular index b282aba1e..679945f3e 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular @@ -14,4 +14,4 @@ lcp-echo-failure=3 lcp-echo-interval=5 [ipv6] -method=ignore +method=auto From c14091e5e7aa079b6a964d34dcaaa69bcd6deb98 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Wed, 11 Oct 2017 13:53:54 +0200 Subject: [PATCH 19/35] README: Update release changelog list. This commit updates the release changelog. Signed-off-by: Mike Engel https://jira.digi.com/browse/DEL-5040 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index e04f1c4ae..a23684e1a 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,11 @@ Documentation is available online on the Digi documentation site: * 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 From 85706b18faa9d5632f6eb6f5c25a482ed5a9b679 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Wed, 11 Oct 2017 13:39:39 +0200 Subject: [PATCH 20/35] meta-digi: update revisions for dey-2.2-r2.3 Signed-off-by: Mike Engel --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- 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_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 03d459756..67263505d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" # 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}" +SRC_URI = "${UBOOT_GIT_URI};nobranch=1" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" 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 8c99a86e0..bcb89ee96 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" # 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 f70e0e122..55df3c7ab 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" S = "${WORKDIR}" @@ -11,7 +11,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 40c72fcdf..67462434b 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a5a4a50693639c2bb7478f7f15fdd318feb705ee" 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 1f7eb809e..43d0f3201 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 6d7e0ec69..d6215f7f9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8a6a9230dfe407e1764b5db8ef5b15601d85cfd2" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 6819a65b9..8583d0205 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "281cebeffa46a072e5d64c8e75810a7d9d0dd526" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 3718a6da4..3a9851c46 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a37045aea6046670e75c4ec9285df75d770d46d4" 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..9f7e98759 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 = "5c79d1ddde37c18f4f311fb0046f85c1e2f6a38a" 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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index b837549f7..a6efe3998 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${GIT_URI};nobranch=1" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 107243991..abbdd0b8c 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,14 +14,14 @@ AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" SRCBRANCH = "dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" 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 00b24ac1f..fe7bcd22f 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" 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" From 8f5b524848ec4b434c6f342c9a4a950254eee639 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 17 Oct 2017 11:04:16 +0200 Subject: [PATCH 21/35] meta-digi: revert revisions to AUTOREV Signed-off-by: Mike Engel --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- 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_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 67263505d..03d459756 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" +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" +SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" 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 bcb89ee96..8c99a86e0 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" +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 55df3c7ab..f70e0e122 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -11,7 +11,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 67462434b..40c72fcdf 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.2/maint" -SRCREV = "a5a4a50693639c2bb7478f7f15fdd318feb705ee" +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 43d0f3201..1f7eb809e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index d6215f7f9..6d7e0ec69 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "8a6a9230dfe407e1764b5db8ef5b15601d85cfd2" +SRCREV = "${AUTOREV}" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 8583d0205..6819a65b9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "281cebeffa46a072e5d64c8e75810a7d9d0dd526" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 3a9851c46..3718a6da4 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "a37045aea6046670e75c4ec9285df75d770d46d4" +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 9f7e98759..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 = "5c79d1ddde37c18f4f311fb0046f85c1e2f6a38a" +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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index a6efe3998..b837549f7 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" +SRCREV = "${AUTOREV}" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};nobranch=1" +SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 abbdd0b8c..107243991 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,14 +14,14 @@ AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" SRCBRANCH = "dey-2.2/maint" -SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" +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 fe7bcd22f..00b24ac1f 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.2/maint" -SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" +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" From 080f9ec8cc80abd2d0abd332d1b9aa68b8bbc93a Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Thu, 9 Nov 2017 12:23:43 +0100 Subject: [PATCH 22/35] README: Update dey-2.2-r2 changelog Update changelog with Krack vulnerability fix and other stuff. Signed-off-by: Isaac Hermida --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index a23684e1a..ef465d1eb 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,17 @@ Documentation is available online on the Digi documentation site: ## 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 From bacb8f25f3d1567f211f21cb54b374bde3e98c3b Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Thu, 9 Nov 2017 15:45:02 +0100 Subject: [PATCH 23/35] meta-digi: update revisions for dey-2.2-r2.4 Signed-off-by: Isaac Hermida --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- 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_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 03d459756..67263505d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" # 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}" +SRC_URI = "${UBOOT_GIT_URI};nobranch=1" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" 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 8c99a86e0..bcb89ee96 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" # 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 f70e0e122..55df3c7ab 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" S = "${WORKDIR}" @@ -11,7 +11,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 40c72fcdf..67462434b 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a5a4a50693639c2bb7478f7f15fdd318feb705ee" 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 1f7eb809e..43d0f3201 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 6d7e0ec69..d6215f7f9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8a6a9230dfe407e1764b5db8ef5b15601d85cfd2" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 6819a65b9..8583d0205 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "281cebeffa46a072e5d64c8e75810a7d9d0dd526" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 3718a6da4..3a9851c46 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a37045aea6046670e75c4ec9285df75d770d46d4" 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..ff8d94577 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 = "f973666e21e9964cc8a20ff44dd500b132a1a0b4" 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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index b837549f7..a6efe3998 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${GIT_URI};nobranch=1" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 107243991..abbdd0b8c 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,14 +14,14 @@ AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" SRCBRANCH = "dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" 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 00b24ac1f..fe7bcd22f 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" 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" From 58e835a32a99a0cfcada1bd936522d411e369380 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Thu, 9 Nov 2017 16:06:00 +0100 Subject: [PATCH 24/35] meta-digi: revert revisions to AUTOREV Signed-off-by: Isaac Hermida --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- 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_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 67263505d..03d459756 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" +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" +SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" 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 bcb89ee96..8c99a86e0 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" +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 55df3c7ab..f70e0e122 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "0a4ec9f40bed27a73743db66c1fbf96b7124c227" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -11,7 +11,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 67462434b..40c72fcdf 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.2/maint" -SRCREV = "a5a4a50693639c2bb7478f7f15fdd318feb705ee" +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 43d0f3201..1f7eb809e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index d6215f7f9..6d7e0ec69 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "8a6a9230dfe407e1764b5db8ef5b15601d85cfd2" +SRCREV = "${AUTOREV}" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 8583d0205..6819a65b9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "281cebeffa46a072e5d64c8e75810a7d9d0dd526" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 3a9851c46..3718a6da4 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "a37045aea6046670e75c4ec9285df75d770d46d4" +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 ff8d94577..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 = "f973666e21e9964cc8a20ff44dd500b132a1a0b4" +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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index a6efe3998..b837549f7 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" +SRCREV = "${AUTOREV}" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};nobranch=1" +SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 abbdd0b8c..107243991 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,14 +14,14 @@ AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" SRCBRANCH = "dey-2.2/maint" -SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" +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 fe7bcd22f..00b24ac1f 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.2/maint" -SRCREV = "2302b7c2e2ba46ce3e1b8481a551e33f55c65255" +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" From c6b424d8cce143c9f79e63ae75b78ef006d6551b Mon Sep 17 00:00:00 2001 From: Sebastian Pastor Date: Tue, 28 Nov 2017 15:40:39 +0100 Subject: [PATCH 25/35] bluetooth-init: if hciattach fails, reset the BT interface and retry With these changes the hciattach mechanism is retried up to 5 times. Signed-off-by: Sebastian Pastor https://jira.digi.com/browse/DEL-5343 https://jira.digi.com/browse/DEL-3711 --- .../bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init | 16 +++++++++++----- .../bluez/bluez5-5.41/ccimx6ul/bluetooth-init | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init index 1a9741841..f6fbc3047 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init @@ -48,11 +48,17 @@ bluetooth_init() { # Start the Bluetooth driver and bring up the interface HCIATTACH_LOG="/var/log/hciattach.log" - killproc hciattach - powercycle_gpio "${BT_EN_QCA_GPIO_NR}" - if ! hciattach ttyBt qca ${BT_RATE:-3000000} -t30 ${BT_FLOW:-flow} unused ${BT_MACADDR} >${HCIATTACH_LOG} 2>&1; then - BT_ERROR="FAIL (hciattach)" - fi + + for RETRY in $(seq 1 5) + do + killproc hciattach + powercycle_gpio "${BT_EN_QCA_GPIO_NR}" + if hciattach ttyBt qca ${BT_RATE:-3000000} -t30 ${BT_FLOW:-flow} unused ${BT_MACADDR} >${HCIATTACH_LOG} 2>&1; then + return + fi + sleep 1 + done + BT_ERROR="FAIL (hciattach)" } # Source function library 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 925d4933f..6cad5a082 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 @@ -67,11 +67,17 @@ bluetooth_init() { # Start the Bluetooth driver and bring up the interface HCIATTACH_LOG="/var/log/hciattach.log" - killproc hciattach - powercycle_gpio "${BT_EN_QCA_GPIO_NR}" - if ! hciattach ttyBt qca ${BT_RATE:-3000000} -t30 ${BT_FLOW:-flow} unused ${BT_MACADDR} >${HCIATTACH_LOG} 2>&1; then - BT_ERROR="FAIL (hciattach)" - fi + + for RETRY in $(seq 1 5) + do + killproc hciattach + powercycle_gpio "${BT_EN_QCA_GPIO_NR}" + if hciattach ttyBt qca ${BT_RATE:-3000000} -t30 ${BT_FLOW:-flow} unused ${BT_MACADDR} >${HCIATTACH_LOG} 2>&1; then + return + fi + sleep 1 + done + BT_ERROR="FAIL (hciattach)" } # Source function library From 3fdf2d0ea35da98fa92275d008d1e50b1f67896a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 30 Nov 2017 16:04:17 +0100 Subject: [PATCH 26/35] README: update release artifacts links Signed-off-by: Javier Viguera --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2bedea4a3..88a55bdc1 100644 --- a/README.md +++ b/README.md @@ -74,8 +74,8 @@ Documentation is available online on the Digi documentation site: # Downloads -* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r2/images/ -* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r2/sdk/ +* 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/ # Release Changelog From 04ea618a68c6cc82ba2e7675d92a2654682f58d3 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 30 Nov 2017 16:23:45 +0100 Subject: [PATCH 27/35] meta-digi: update revisions for dey-2.2-r3.1 Signed-off-by: Javier Viguera --- 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_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 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/cryptoauthlib/cryptoauthlib_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 ++-- 13 files changed, 22 insertions(+), 22 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 8c99a86e0..ffbe9c456 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "3ccec403129e8735e4db264d7bc6ed92f91e9431" # 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 f70e0e122..65a6f5045 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "3ccec403129e8735e4db264d7bc6ed92f91e9431" S = "${WORKDIR}" @@ -11,7 +11,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 be2979cd2..3eb65ad6f 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1754f440a9971ba99fa37d36c0b9b1d77f067207" 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 1f7eb809e..43d0f3201 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 6d707e524..fb204131e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "53e6f29fc7ea7b36f2efed731853c16b4bba39fb" COMPATIBLE_MACHINE = "(ccimx6sbc)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index c3a37c42c..aa986ba3a 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8002028c36d411d48624568cd15d451cc2963245" COMPATIBLE_MACHINE = "(ccimx6sbc|ccimx6ul)" 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 4bd073c7e..94dfd9af2 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 @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.9/dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "c5025d52ab872763032a566ede24ae778223c8e2" COMPATIBLE_MACHINE = "(ccimx6qpsbc|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..ff8d94577 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 = "f973666e21e9964cc8a20ff44dd500b132a1a0b4" 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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index 2db3ee8cb..d52b99ac6 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/atmel-cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${GIT_URI};nobranch=1" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 80d2c068d..6f03bb7c1 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1e02f43c812e8884509577b9f5cae77c6f1f8e08" 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 5988605f6..5483f796b 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1e02f43c812e8884509577b9f5cae77c6f1f8e08" 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 32ae4e863..0dacc4d3b 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 = "master" -SRCREV = "${AUTOREV}" +SRCREV = "1e02f43c812e8884509577b9f5cae77c6f1f8e08" 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..4ff1fe8c5 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 = "396c31721e43dba629e139e95a04a9ee2ccf27cd" 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 970d45322015b9bb267976df6db7373d38b7e348 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 30 Nov 2017 16:29:12 +0100 Subject: [PATCH 28/35] meta-digi: revert revisions to AUTOREV Signed-off-by: Javier Viguera --- 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_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 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/cryptoauthlib/cryptoauthlib_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 ++-- 13 files changed, 22 insertions(+), 22 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 ffbe9c456..8c99a86e0 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "3ccec403129e8735e4db264d7bc6ed92f91e9431" +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 65a6f5045..f70e0e122 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "3ccec403129e8735e4db264d7bc6ed92f91e9431" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -11,7 +11,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 3eb65ad6f..be2979cd2 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.2/maint" -SRCREV = "1754f440a9971ba99fa37d36c0b9b1d77f067207" +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 43d0f3201..1f7eb809e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index fb204131e..6d707e524 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "53e6f29fc7ea7b36f2efed731853c16b4bba39fb" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6sbc)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index aa986ba3a..c3a37c42c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "8002028c36d411d48624568cd15d451cc2963245" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6sbc|ccimx6ul)" 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 94dfd9af2..4bd073c7e 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 @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.9/dey-2.2/maint" -SRCREV = "c5025d52ab872763032a566ede24ae778223c8e2" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul)" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index ff8d94577..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 = "f973666e21e9964cc8a20ff44dd500b132a1a0b4" +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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index d52b99ac6..2db3ee8cb 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" +SRCREV = "${AUTOREV}" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/atmel-cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};nobranch=1" +SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 6f03bb7c1..80d2c068d 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.2/maint" -SRCREV = "1e02f43c812e8884509577b9f5cae77c6f1f8e08" +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 5483f796b..5988605f6 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.2/maint" -SRCREV = "1e02f43c812e8884509577b9f5cae77c6f1f8e08" +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 0dacc4d3b..32ae4e863 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 = "master" -SRCREV = "1e02f43c812e8884509577b9f5cae77c6f1f8e08" +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 4ff1fe8c5..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 = "396c31721e43dba629e139e95a04a9ee2ccf27cd" +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 ffb0e6954b88f9319044738219d84130fc629c87 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 4 Dec 2017 10:12:08 +0100 Subject: [PATCH 29/35] Revert "suspend: set wireless interfaces managed by NM as unmanaged before suspend" NetworkManager will be restarted on the suspend script so this workaround is not needed This reverts commit b3ae030fce8b24c4f32e9eb618c664d57c6e0dce. Signed-off-by: Arturo Buzarra --- .../busybox/busybox-1.24.1/ccimx6qpsbc/suspend | 12 ------------ .../busybox/busybox-1.24.1/ccimx6sbc/suspend | 12 ------------ .../busybox/busybox-1.24.1/ccimx6ul/suspend | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend index 28a9f68ca..50e3e59a3 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend @@ -36,13 +36,6 @@ suspend_interfaces() { for i in $(sed -ne 's,^\(wlan[0-9]\)=.*,\1,g;T;p' /var/run/ifstate | sort -r); do ifdown "${i}" && RESUME_IFACES="${RESUME_IFACES:+${RESUME_IFACES} }${i}" done - - # Get a list of the wireless interfaces managed by NetworkManager - # and set them to unmanaged before suspend. - for i in $(nmcli -t -f DEVICE,TYPE,STATE dev | grep :wifi: | grep -v unmanaged | cut -d':' -f1); do - nmcli dev set "${i}" managed no && NM_MANAGED_IFACES="${NM_MANAGED_IFACES:+${NM_MANAGED_IFACES} }${i}" - done - grep -qs '^wlan' /proc/modules && rmmod wlan fi @@ -61,11 +54,6 @@ resume_interfaces() { udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null - # Set interfaces managed by NetworkManager back as managed - for i in $(echo ${NM_MANAGED_IFACES} | tr ' ' '\n' | sort); do - nmcli dev set "${i}" managed yes - done - # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do grep -qs "^${i}" /var/run/ifstate || ifup "${i}" diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend index 44f9548e6..140645eea 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend @@ -36,13 +36,6 @@ suspend_interfaces() { for i in $(sed -ne 's,^\(wlan[0-9]\)=.*,\1,g;T;p' /var/run/ifstate | sort -r); do ifdown "${i}" && RESUME_IFACES="${RESUME_IFACES:+${RESUME_IFACES} }${i}" done - - # Get a list of the wireless interfaces managed by NetworkManager - # and set them to unmanaged before suspend. - for i in $(nmcli -t -f DEVICE,TYPE,STATE dev | grep :wifi: | grep -v unmanaged | cut -d':' -f1); do - nmcli dev set "${i}" managed no && NM_MANAGED_IFACES="${NM_MANAGED_IFACES:+${NM_MANAGED_IFACES} }${i}" - done - grep -qs '^ath6kl_sdio' /proc/modules && rmmod ath6kl_sdio ath6kl_core fi @@ -61,11 +54,6 @@ resume_interfaces() { udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d0301" timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null - # Set interfaces managed by NetworkManager back as managed - for i in $(echo ${NM_MANAGED_IFACES} | tr ' ' '\n' | sort); do - nmcli dev set "${i}" managed yes - done - # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do grep -qs "^${i}" /var/run/ifstate || ifup "${i}" diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend index f2ee3cb22..a74f24d35 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend @@ -36,13 +36,6 @@ suspend_interfaces() { for i in $(sed -ne 's,^\(wlan[0-9]\)=.*,\1,g;T;p' /var/run/ifstate | sort -r); do ifdown "${i}" && RESUME_IFACES="${RESUME_IFACES:+${RESUME_IFACES} }${i}" done - - # Get a list of the wireless interfaces managed by NetworkManager - # and set them to unmanaged before suspend. - for i in $(nmcli -t -f DEVICE,TYPE,STATE dev | grep :wifi: | grep -v unmanaged | cut -d':' -f1); do - nmcli dev set "${i}" managed no && NM_MANAGED_IFACES="${NM_MANAGED_IFACES:+${NM_MANAGED_IFACES} }${i}" - done - grep -qs '^wlan' /proc/modules && rmmod wlan fi @@ -61,11 +54,6 @@ resume_interfaces() { udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null - # Set interfaces managed by NetworkManager back as managed - for i in $(echo ${NM_MANAGED_IFACES} | tr ' ' '\n' | sort); do - nmcli dev set "${i}" managed yes - done - # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do grep -qs "^${i}" /var/run/ifstate || ifup "${i}" From 2a175fd5469cc65460582830b946e4e59c50df5e Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 4 Dec 2017 11:28:23 +0100 Subject: [PATCH 30/35] suspend: manage NetworkManager service on suspend/resume NetworkManager was experiencing an unexpected behavior managing the network interfaces on a supend/resume process, then to avoid this undesired behavior the suspend script will stop and restart the NetworkManager service. https://jira.digi.com/browse/DEL-5351 Signed-off-by: Arturo Buzarra --- .../busybox/busybox-1.24.1/ccimx6qpsbc/suspend | 7 +++++++ .../recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend | 7 +++++++ .../recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend index 50e3e59a3..9b5d6ca47 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6qpsbc/suspend @@ -22,6 +22,7 @@ lockfd="9" BT_INIT="/etc/init.d/bluetooth-init" BT_DAEMON="/etc/init.d/bluetooth" +NM_DAEMON="/etc/init.d/networkmanager" usage() { printf "\nSuspend system to RAM memory\n" @@ -31,6 +32,9 @@ usage() { } suspend_interfaces() { + # Stop NetworkManager before suspend + ${NM_DAEMON} stop + # Suspend wireless interfaces if [ -d "/proc/device-tree/wireless" ]; then for i in $(sed -ne 's,^\(wlan[0-9]\)=.*,\1,g;T;p' /var/run/ifstate | sort -r); do @@ -60,6 +64,9 @@ resume_interfaces() { done fi + # Resume NetworkManager after suspend + ${NM_DAEMON} start + # Resume bluetooth interface if [ -d "/proc/device-tree/bluetooth" ]; then if [ -n "${up_bt_on_resume}" ]; then diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend index 140645eea..21a30a524 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6sbc/suspend @@ -22,6 +22,7 @@ lockfd="9" BT_INIT="/etc/init.d/bluetooth-init" BT_DAEMON="/etc/init.d/bluetooth" +NM_DAEMON="/etc/init.d/networkmanager" usage() { printf "\nSuspend system to RAM memory\n" @@ -31,6 +32,9 @@ usage() { } suspend_interfaces() { + # Stop NetworkManager before suspend + ${NM_DAEMON} stop + # Suspend wireless interfaces if [ -d "/proc/device-tree/wireless" ]; then for i in $(sed -ne 's,^\(wlan[0-9]\)=.*,\1,g;T;p' /var/run/ifstate | sort -r); do @@ -67,6 +71,9 @@ resume_interfaces() { ${BT_DAEMON} start >/dev/null fi fi + + # Resume NetworkManager after suspend + ${NM_DAEMON} start } enter_critical_section() { diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend index a74f24d35..969876e33 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend @@ -22,6 +22,7 @@ lockfd="9" BT_INIT="/etc/init.d/bluetooth-init" BT_DAEMON="/etc/init.d/bluetooth" +NM_DAEMON="/etc/init.d/networkmanager" usage() { printf "\nSuspend system to RAM memory\n" @@ -31,6 +32,9 @@ usage() { } suspend_interfaces() { + # Stop NetworkManager before suspend + ${NM_DAEMON} stop + # Suspend wireless interfaces if [ -d "/proc/device-tree/wireless" ]; then for i in $(sed -ne 's,^\(wlan[0-9]\)=.*,\1,g;T;p' /var/run/ifstate | sort -r); do @@ -67,6 +71,9 @@ resume_interfaces() { ${BT_DAEMON} start >/dev/null fi fi + + # Resume NetworkManager after suspend + ${NM_DAEMON} start } enter_critical_section() { From b62b13435ac0fd2a5adbc476db0e268952726ce9 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 12 Dec 2017 10:47:30 +0100 Subject: [PATCH 31/35] README: cosmetic rework for supported platforms: - Remove 'Digi' and 'Digi P/N' from most items. - Create h2 title for platforms. - Group items into 'SOM' and carrier boards. - Add dots at the end of long sentences. Signed-off-by: Hector Palacios --- README.md | 132 +++++++++++++++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index 88a55bdc1..e1490cfe5 100644 --- a/README.md +++ b/README.md @@ -23,36 +23,36 @@ The current release supports the following hardware platforms: Software for the following hardware platforms is in production support: -* Digi ConnectCore 6UL - * [Digi P/N CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne) - * [Digi P/N CC-MX-JN58-Z1](https://www.digi.com/products/models/cc-mx-jn58-z1) - * Digi P/N CC-WMX-JN7A-NE -* Digi ConnectCore 6UL SBC Express - * [Digi P/N CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm#concept/yocto/c_get_started_with_yocto.htm)) -* Digi ConnectCore 6UL SBC Pro - * [Digi P/N CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm#concept/yocto/c_get_started_with_yocto.htm)) +## ConnectCore 6UL +* ConnectCore 6UL System-on-Module (SOM) + * [CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne) + * [CC-MX-JN58-Z1](https://www.digi.com/products/models/cc-mx-jn58-z1) + * CC-WMX-JN7A-NE +* ConnectCore 6UL SBC Express + * [CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm#concept/yocto/c_get_started_with_yocto.htm)) +* ConnectCore 6UL SBC Pro + * [CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm#concept/yocto/c_get_started_with_yocto.htm)) -* Digi ConnectCore 6 - * [Digi P/N CC-WMX-J97C-TN](http://www.digi.com/products/models/cc-wmx-j97c-tn) - * [Digi P/N CC-WMX-L96C-TE](http://www.digi.com/products/models/cc-wmx-l96c-te) - * [Digi P/N CC-WMX-L87C-TE](http://www.digi.com/products/models/cc-wmx-l87c-te) - * [Digi P/N CC-MX-L76C-Z1](http://www.digi.com/products/models/cc-mx-l76c-z1) - * [Digi P/N CC-MX-L86C-Z1](http://www.digi.com/products/models/cc-mx-l86c-z1) - * [Digi P/N CC-MX-L96C-Z1](http://www.digi.com/products/models/cc-mx-l96c-z1) - * [Digi P/N CC-WMX-L76C-TE](http://www.digi.com/products/models/cc-wmx-l76c-te) - * Digi P/N CC-WMX-K87C-FJA - * Digi P/N CC-WMX-K77C-TE - * Digi P/N CC-WMX-L97D-TN - * Digi P/N CC-WMX-J98C-FJA - * Digi P/N CC-WMX-J98C-FJA-1 - -* Digi ConnectCore 6 Development Kit - * [Digi P/N CC-WMX6-KIT](http://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm#concept/yocto/c_get_started_with_yocto.htm)) - -* Digi ConnectCore 6 SBC - * [Digi P/N CC-SB-WMX-J97C-1](http://www.digi.com/products/models/cc-sb-wmx-j97c-1) - * [Digi P/N CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1) - * [Digi P/N CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1) +## ConnectCore 6 +* ConnectCore 6 System-on-Module (SOM) + * [CC-WMX-J97C-TN](http://www.digi.com/products/models/cc-wmx-j97c-tn) + * [CC-WMX-L96C-TE](http://www.digi.com/products/models/cc-wmx-l96c-te) + * [CC-WMX-L87C-TE](http://www.digi.com/products/models/cc-wmx-l87c-te) + * [CC-MX-L76C-Z1](http://www.digi.com/products/models/cc-mx-l76c-z1) + * [CC-MX-L86C-Z1](http://www.digi.com/products/models/cc-mx-l86c-z1) + * [CC-MX-L96C-Z1](http://www.digi.com/products/models/cc-mx-l96c-z1) + * [CC-WMX-L76C-TE](http://www.digi.com/products/models/cc-wmx-l76c-te) + * CC-WMX-K87C-FJA + * CC-WMX-K77C-TE + * CC-WMX-L97D-TN + * CC-WMX-J98C-FJA + * CC-WMX-J98C-FJA-1 +* ConnectCore 6 Development Kit + * [CC-WMX6-KIT](http://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm#concept/yocto/c_get_started_with_yocto.htm)) +* ConnectCore 6 SBC + * [CC-SB-WMX-J97C-1](http://www.digi.com/products/models/cc-sb-wmx-j97c-1) + * [CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1) + * [CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1) Previous versions of Digi Embedded Yocto include support for additional Digi hardware. @@ -68,9 +68,9 @@ To install, please follow the instructions at the dey-manifest [README](https:// Documentation is available online on the Digi documentation site: -* [Digi ConnectCore 6UL SBC Express](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm) -* [Digi ConnectCore 6UL SBC Pro](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm) -* [Digi ConnectCore 6 Jumpstart Development Kit](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm) +* [ConnectCore 6UL SBC Express](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm) +* [ConnectCore 6UL SBC Pro](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm) +* [ConnectCore 6 Jumpstart Development Kit](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm) # Downloads @@ -168,43 +168,43 @@ boot a signed U-Boot only. devices (ConnectCore 6UL and ConnectCore 6 Plus) running a 4.9 kernel version fail to join to autonomous groups. -## Digi ConnectCore 6UL +## ConnectCore 6UL -* The UART connected to the Bluetooth chip on early versions of the ConnectCore - 6UL system-on-module (hardware version < 4) cannot properly execute flow - control. To work around this issue, UART1 of these SOM versions has been - configured to operate at 115200 bps and without hardware flow control, - reducing the maximum throughput of this interface. -* When using wireless concurrent mode as the wireless interface is shared - between several different functionalities performance is reduced. -* When using wireless concurrent mode Digi recommends to keep the different - modes on the same frequency channels. For example, when configuring access - point mode on channel 36 on band A, the recommendation would be to connect - to the same channel both in station mode and WiFi direct so that the radio - performance is optimized -* When working as an access point, DFS capable channels in band A are not - currently supported. -* The QCA6564 wireless chip does not support Wake On Wireless LAN +* ConnectCore 6UL System-on-Module (SOM) + * The UART connected to the Bluetooth chip on early versions of the ConnectCore + 6UL system-on-module (hardware version < 4) cannot properly execute flow + control. To work around this issue, UART1 of these SOM versions has been + configured to operate at 115200 bps and without hardware flow control, + reducing the maximum throughput of this interface. + * When using wireless concurrent mode as the wireless interface is shared + between several different functionalities performance is reduced. + * When using wireless concurrent mode Digi recommends to keep the different + modes on the same frequency channels. For example, when configuring access + point mode on channel 36 on band A, the recommendation would be to connect + to the same channel both in station mode and WiFi direct so that the radio + performance is optimized. + * When working as an access point, DFS capable channels in band A are not + currently supported. + * The QCA6564 wireless chip does not support Wake On Wireless LAN. -## Digi ConnectCore 6 +## ConnectCore 6 -* NXP i.MX6 processor has a documented errata (ERR004512) whereby the maximum -performance of the Gigabit FEC is limited to 400Mbps (total for Tx and Rx) -* When using softAP mode on Band A on the Qualcomm AR6233, channels used for -Dynamic Frequency Selection (DFS) are not supported -* The Qualcomm AR6233 firmware does not support the following configuration -modes: - * Concurrent modes involving P2P mode, such as P2P + softAP or P2P + STA - * Bluetooth + softAP + STA concurrent mode -* A maximum of five clients are supported when using Qualcomm's AR6233 in -softAP mode -* A maximum of ten connected devices are supported when using Qualcomm's AR6233 -Bluetooth Low Energy mode - -## Digi ConnectCore 6 SBC - -* The Micrel PHY KSZ9031 may take between five and six seconds to -auto-negotiate with Gigabit switches +* ConnectCore 6 System-on-Module (SOM) + * NXP i.MX6 processor has a documented errata (ERR004512) whereby the maximum + performance of the Gigabit FEC is limited to 400Mbps (total for Tx and Rx). + * When using softAP mode on Band A on the Qualcomm AR6233, channels used for + Dynamic Frequency Selection (DFS) are not supported. + * The Qualcomm AR6233 firmware does not support the following configuration + modes: + * Concurrent modes involving P2P mode, such as P2P + softAP or P2P + STA. + * Bluetooth + softAP + STA concurrent mode. + * A maximum of five clients are supported when using Qualcomm's AR6233 in + softAP mode. + * A maximum of ten connected devices are supported when using Qualcomm's AR6233 + Bluetooth Low Energy mode. +* ConnectCore 6 SBC + * The Micrel PHY KSZ9031 may take between five and six seconds to + auto-negotiate with Gigabit switches. # Support Contact Information From e0994278014e4326b9445662faf772c3c0b02f49 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 12 Dec 2017 10:47:54 +0100 Subject: [PATCH 32/35] README: add ConnectCore 6 Plus platform Signed-off-by: Hector Palacios --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index e1490cfe5..5392b8494 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,12 @@ Software for the following hardware platforms is in production support: * [CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1) * [CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1) +## ConnectCore 6 Plus +* ConnectCore 6 Plus System-on-Module (SOM) + * CC-WMX-KK8D-TN +* ConnectCore 6 Plus SBC + * CC-SB-WMX-KK8D + Previous versions of Digi Embedded Yocto include support for additional Digi hardware. @@ -71,6 +77,7 @@ Documentation is available online on the Digi documentation site: * [ConnectCore 6UL SBC Express](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm) * [ConnectCore 6UL SBC Pro](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm) * [ConnectCore 6 Jumpstart Development Kit](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm) +* [ConnectCore 6 Plus Jumpstart Development Kit](https://www.digi.com/resources/documentation/digidocs/90002275/default.htm) # Downloads @@ -81,6 +88,7 @@ Documentation is available online on the Digi documentation site: ## 2.2-r3 +* Added support for ConnectCore 6 Plus platform * Added Digi APIX C library to access and manage ConnectCore platforms interfaces: * ADC * GPIO @@ -206,6 +214,15 @@ boot a signed U-Boot only. * The Micrel PHY KSZ9031 may take between five and six seconds to auto-negotiate with Gigabit switches. +## ConnectCore 6 Plus + +* ConnectCore 6 Plus System-on-Module (SOM) + * NXP i.MX6QP processor has a documented errata (ERR004512) whereby the maximum + performance of the Gigabit FEC is limited to 400Mbps (total for Tx and Rx). +* ConnectCore 6 Plus SBC + * The Micrel PHY KSZ9031 may take between five and six seconds to + auto-negotiate with Gigabit switches. + # Support Contact Information For support questions please contact Digi Technical Support: From 7b64446d9f9722b407c561fcad82255b5cd4b8ba Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 14 Dec 2017 11:42:18 +0100 Subject: [PATCH 33/35] README: review/complete for 2.2-r3 release https://jira.digi.com/browse/DEL-5046 Signed-off-by: Javier Viguera --- README.md | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 5392b8494..4a921c1ac 100644 --- a/README.md +++ b/README.md @@ -19,38 +19,37 @@ OS versions: # Supported Platforms -The current release supports the following hardware platforms: - Software for the following hardware platforms is in production support: ## ConnectCore 6UL * ConnectCore 6UL System-on-Module (SOM) - * [CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne) + * [CC-WMX-JN58-NE](https://www.digi.com/products/models/cc-wmx-jn58-ne) * [CC-MX-JN58-Z1](https://www.digi.com/products/models/cc-mx-jn58-z1) * CC-WMX-JN7A-NE * ConnectCore 6UL SBC Express - * [CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm#concept/yocto/c_get_started_with_yocto.htm)) + * [CC-WMX6UL-START](https://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm#concept/yocto/c_get_started_with_yocto.htm)) + * [CC-SBE-WMX-JN58](https://www.digi.com/products/models/cc-sbe-wmx-jn58) * ConnectCore 6UL SBC Pro * [CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm#concept/yocto/c_get_started_with_yocto.htm)) + * [CC-SBP-WMX-JN58](https://www.digi.com/products/models/cc-sbp-wmx-jn58) ## ConnectCore 6 * ConnectCore 6 System-on-Module (SOM) - * [CC-WMX-J97C-TN](http://www.digi.com/products/models/cc-wmx-j97c-tn) - * [CC-WMX-L96C-TE](http://www.digi.com/products/models/cc-wmx-l96c-te) - * [CC-WMX-L87C-TE](http://www.digi.com/products/models/cc-wmx-l87c-te) - * [CC-MX-L76C-Z1](http://www.digi.com/products/models/cc-mx-l76c-z1) - * [CC-MX-L86C-Z1](http://www.digi.com/products/models/cc-mx-l86c-z1) - * [CC-MX-L96C-Z1](http://www.digi.com/products/models/cc-mx-l96c-z1) - * [CC-WMX-L76C-TE](http://www.digi.com/products/models/cc-wmx-l76c-te) + * [CC-WMX-J97C-TN](https://www.digi.com/products/models/cc-wmx-j97c-tn) + * [CC-WMX-L96C-TE](https://www.digi.com/products/models/cc-wmx-l96c-te) + * [CC-WMX-L87C-TE](https://www.digi.com/products/models/cc-wmx-l87c-te) + * [CC-MX-L76C-Z1](https://www.digi.com/products/models/cc-mx-l76c-z1) + * [CC-MX-L86C-Z1](https://www.digi.com/products/models/cc-mx-l86c-z1) + * [CC-MX-L96C-Z1](https://www.digi.com/products/models/cc-mx-l96c-z1) + * [CC-WMX-L76C-TE](https://www.digi.com/products/models/cc-wmx-l76c-te) * CC-WMX-K87C-FJA * CC-WMX-K77C-TE * CC-WMX-L97D-TN * CC-WMX-J98C-FJA * CC-WMX-J98C-FJA-1 -* ConnectCore 6 Development Kit - * [CC-WMX6-KIT](http://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm#concept/yocto/c_get_started_with_yocto.htm)) * ConnectCore 6 SBC - * [CC-SB-WMX-J97C-1](http://www.digi.com/products/models/cc-sb-wmx-j97c-1) + * [CC-WMX6-KIT](https://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm#concept/yocto/c_get_started_with_yocto.htm)) + * [CC-SB-WMX-J97C-1](https://www.digi.com/products/models/cc-sb-wmx-j97c-1) * [CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1) * [CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1) @@ -76,8 +75,8 @@ Documentation is available online on the Digi documentation site: * [ConnectCore 6UL SBC Express](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm) * [ConnectCore 6UL SBC Pro](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm) -* [ConnectCore 6 Jumpstart Development Kit](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm) -* [ConnectCore 6 Plus Jumpstart Development Kit](https://www.digi.com/resources/documentation/digidocs/90002275/default.htm) +* [ConnectCore 6 SBC](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm) +* [ConnectCore 6 Plus SBC](https://www.digi.com/resources/documentation/digidocs/90002275/default.htm) # Downloads @@ -89,6 +88,7 @@ Documentation is available online on the Digi documentation site: ## 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 @@ -96,6 +96,9 @@ Documentation is available online on the Digi documentation site: * 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 @@ -228,8 +231,8 @@ boot a signed U-Boot only. For support questions please contact Digi Technical Support: * [Enterprise Support](https://mydigi.secure.force.com/customers/) -* [Product Technical Support](http://www.digi.com/support/product-support) -* [Support forum](http://www.digi.com/support/forum/) +* [Product Technical Support](https://www.digi.com/support#support-tools) +* [Support forum](https://www.digi.com/support/forum/) When you contact Digi Technical Support, include important system details and device information to help Digi resolve the issue more quickly. From 1bb7cd7407e6daae48be642fc9855cb5e742e2f1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 14 Dec 2017 16:16:30 +0100 Subject: [PATCH 34/35] meta-digi: update revisions for dey-2.2-r3.2 Signed-off-by: Javier Viguera --- 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_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 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/cryptoauthlib/cryptoauthlib_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 ++-- 13 files changed, 22 insertions(+), 22 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 8c99a86e0..ffbe9c456 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-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "3ccec403129e8735e4db264d7bc6ed92f91e9431" # 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 f70e0e122..65a6f5045 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 @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "3ccec403129e8735e4db264d7bc6ed92f91e9431" S = "${WORKDIR}" @@ -11,7 +11,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 be2979cd2..d9feec5da 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "7f421e5e0b4a2fe1450c570354e1e7f9c6dde41a" 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 1f7eb809e..43d0f3201 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,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_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 6d707e524..fb204131e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "53e6f29fc7ea7b36f2efed731853c16b4bba39fb" COMPATIBLE_MACHINE = "(ccimx6sbc)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index c3a37c42c..f429b0db6 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "5396a8025e624937c036b27994fd3c301bc772ea" COMPATIBLE_MACHINE = "(ccimx6sbc|ccimx6ul)" 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 4bd073c7e..aa4392d4e 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 @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.9/dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "f832589390309342e331658fde473697a68a05dd" COMPATIBLE_MACHINE = "(ccimx6qpsbc|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..ff8d94577 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 = "f973666e21e9964cc8a20ff44dd500b132a1a0b4" 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/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index 2db3ee8cb..d52b99ac6 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -6,11 +6,11 @@ LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" SRCBRANCH = "dey-2.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/atmel-cryptoauth-openssl-engine.git', d)}" -SRC_URI = "${GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${GIT_URI};nobranch=1" S = "${WORKDIR}/git/engine_atecc/cryptoauthlib" 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 80d2c068d..53b6ee19f 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9cf9701082d7e99f1c200c5e08d6189c023579e8" 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 5988605f6..937d16733 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9cf9701082d7e99f1c200c5e08d6189c023579e8" 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 32ae4e863..055083f63 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 = "master" -SRCREV = "${AUTOREV}" +SRCREV = "9cf9701082d7e99f1c200c5e08d6189c023579e8" 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 52969229d548245ea2bad1bda04ba8982fe8493d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 18 Dec 2017 10:44:47 +0100 Subject: [PATCH 35/35] cryptoauthlib: fix GitHub repository URL Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index d52b99ac6..ce5dc22d8 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a SRCBRANCH = "dey-2.2/maint" SRCREV = "9c07aefd00d18ffbc4585a2a2b94f10201146b20" -GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/atmel-cryptoauth-openssl-engine.git', d)}" +GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/atmel-cryptoauth-openssl-engine.git;protocol=ssh', '${DIGI_GITHUB_GIT}/cryptoauth-openssl-engine.git', d)}" SRC_URI = "${GIT_URI};nobranch=1"