From 65ac281615e40d70134cb198fdc29f0759d15c0d Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 14 Sep 2018 12:24:13 +0200 Subject: [PATCH 01/17] meta-digi: revert revisions to AUTOREV Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 5 ++--- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 5 ++--- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- .../recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 20 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 a9f1c9725..6afbffc03 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 965c301e6..dadec8a3e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -13,7 +13,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2017.03/maint" -SRCREV = "8d60f536d2063ac6a0676bdf34c4c8c8807371c5" +SRCREV = "${AUTOREV}" S = "${WORKDIR}/git" @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" 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_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 6e391ba1b..30df920ad 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" SRCBRANCH = "v2017.03/maint" -SRCREV = "8d60f536d2063ac6a0676bdf34c4c8c8807371c5" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -14,7 +14,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index aa8603301..2ac6a28ba 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 @@ -11,13 +11,12 @@ PV_ccimx8x = "v4.0.11.208Q" SRCBRANCH = "dey-2.4/maint" SRCBRANCH_ccimx8x = "dey-2.4/maint_cc8x" -SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db" -SRCREV_ccimx8x = "bb11723b14dab4c8d930bb38a08f736b2985d5e1" +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} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index f71b69f7c..6ec4550da 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" LOCALVERSION = "-dey" SRCBRANCH = "v4.9/dey-2.4/maint" SRCBRANCH_ccimx8x = "v4.9/dey-2.4/maint_cc8x" -SRCREV = "4b330d1554efae747a884aa06e4f1128c3fa8ae4" -SRCREV_ccimx8x = "40329ffd9219c94aec9b8337bc7faa452b684f54" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo 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" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d32144c1a..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 = "433c1a58a7e63933a60716195e6bb834b201bf1c" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 4165f97cb..6234aee49 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" SRCBRANCH = "dey-2.4/maint" -SRCREV = "6bb9699c29107cad06654bf537e92e4c9ec1b45c" +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 a86999278..f21faa8e5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" SRCBRANCH = "dey-2.4/maint" -SRCREV = "6bb9699c29107cad06654bf537e92e4c9ec1b45c" +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 e54ad573a..aee31ad07 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" SRCBRANCH = "dey-2.4/maint" -SRCREV = "6bb9699c29107cad06654bf537e92e4c9ec1b45c" +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 1f9f9069e..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 = "bfef0d85b43749fecd8faa3e962d1bc945ca03d2" +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 44def5862f8e1519ade30c79ec612879d26ea915 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 24 Sep 2018 14:04:01 +0200 Subject: [PATCH 02/17] ccimx8x-sbc-express: libdigiapix: change default SPI device index On this platform, the SPI device gets registered as /dev/spidev32766.0. https://jira.digi.com/browse/DEL-6183 Signed-off-by: Gabriel Valcazar --- .../libdigiapix/libdigiapix-git/ccimx8x-sbc-express/board.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/board.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/board.conf index 32d2bd5ae..3d6ce6856 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/board.conf +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/board.conf @@ -17,7 +17,7 @@ DEFAULT_I2C_BUS = 1 [SPI] # SPI-3 on Expansion connector. -DEFAULT_SPI = 2,0 +DEFAULT_SPI = 32766,0 [PWM] From 4d35d15fee891bc5e0687ea19eaebbda9f16fab9 Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Tue, 9 Oct 2018 09:40:30 +0200 Subject: [PATCH 03/17] kernel-module-imx-gpu, imx-gst1.0-plugin: fix file paths Currently the contents of FILESEXTRAPATHS and the actual paths being used for the patch files are not aligned. That generates the following WARNINGs: imx-gst1.0-plugin_4.3.4.bb: Unable to get checksum for imx-gst1.0-plugin SRC_URI entry 0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch: file could not be found kernel-module-imx-gpu-viv_5.0.11.p8.6.bb: Unable to get checksum for kernel-module-imx-gpu-viv SRC_URI entry 0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch: file could not be found kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bb: Unable to get checksum for kernel-module-imx-gpu-viv SRC_URI entry 0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch: file could not be found Also, those patches are not being applied. This patch fixes FILESEXTRAPATHS to contain the actual paths being used. Signed-off-by: Jose Diaz de Grenu --- .../kernel-modules/kernel-module-imx-gpu-viv_%.bbappend | 4 +--- .../recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend index 86f3daa69..ac10b669d 100644 --- a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend +++ b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend @@ -1,8 +1,6 @@ # Copyright (C) 2017-2018 Digi International -VER_DIR = "${@d.getVar('PV', True).split('+git')[0]}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${VER_DIR}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch \ diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend index 9cc4e0cb0..90696801e 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend +++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend @@ -1,7 +1,6 @@ # Copyright (C) 2016-2018 Digi International -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch" - SRC_URI_append_ccimx6 = " file://0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch" From d74e5d3cc2df240145b60878b66bfbe1def376c7 Mon Sep 17 00:00:00 2001 From: fgilmar Date: Wed, 7 Nov 2018 12:48:25 +0100 Subject: [PATCH 04/17] dey_examples: adc: fix a typo in the adc_list definition Signed-off-by: fgilmar --- .../recipes-digi/dey-examples/files/adc_sample/adc_sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/dey-examples/files/adc_sample/adc_sample.c b/meta-digi-dey/recipes-digi/dey-examples/files/adc_sample/adc_sample.c index f80d602ac..fa9f48852 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/files/adc_sample/adc_sample.c +++ b/meta-digi-dey/recipes-digi/dey-examples/files/adc_sample/adc_sample.c @@ -65,7 +65,7 @@ struct adc_data adc_list[] = { .nbits = 12, }, { - .type = ADC_TYPE_MCA_C6UL, + .type = ADC_TYPE_MCA_CC6UL, .name = "MCA-CC6UL", .dev_name = "mca-cc6ul-adc", .nbits = 12, From 82bcb4ad19643214f1567af6935b0e4e2f4e8319 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 9 Nov 2018 16:02:31 +0100 Subject: [PATCH 05/17] README: remove '-beta' from versions Signed-off-by: Hector Palacios --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bf008e31a..2f1484561 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Digi Embedded Yocto (DEY) 2.4 -## Release 2.4-r2.4-beta +## Release 2.4-r2.1 This document provides information about Digi Embedded Yocto, Digi International's professional embedded Yocto development environment. @@ -93,12 +93,12 @@ Documentation is available online on the Digi documentation site: # Downloads -* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.4/r2-beta/images/ -* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.4/r2-beta/sdk/ +* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.4/r2/images/ +* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.4/r2/sdk/ # Release Changelog -## 2.4-r2.4-beta +## 2.4-r2.1 * Added support for ConnectCore 8X platform. Supported features: * Bluetooth and Wireless interfaces (STA, SoftAP, P2P, Concurrence) From d159eae03aa584af6b2b87e753ba3dc4342963db Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 13 Nov 2018 14:11:11 +0100 Subject: [PATCH 06/17] meta-digi-dey: sysinfo: adapt script to CC8X platform https://jira.digi.com/browse/DEL-6261 Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 43a0e2802..5ae651040 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -267,8 +267,13 @@ BOARD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant | tr -d '\0')" BOARD_SN="$(cat /proc/device-tree/digi,hwid,sn | tr -d '\0')" BOARD_VERSION="$(cat /proc/device-tree/digi,carrierboard,version | tr -d '\0')" BOARD_ID="$(cat /proc/device-tree/digi,carrierboard,id | tr -d '\0')" + if grep -qs '\' /proc/device-tree/compatible; then MCA_NODE="/sys/bus/i2c/devices/0-007e" +elif grep -qs '\' /proc/device-tree/compatible; then + MCA_NODE="/sys/bus/i2c/devices/0-0063" +fi +if [ -d "$MCA_NODE" ]; then MCA_HW_VERSION=$(cat ${MCA_NODE}/hw_version 2>/dev/null | tr -d '\0') || MCA_HW_VERSION="??" MCA_FW_VERSION=$(cat ${MCA_NODE}/fw_version 2>/dev/null | tr -d '\0') || MCA_FW_VERSION="??" MCA_VERSION="HW_VERSION=${MCA_HW_VERSION} FW_VERSION=${MCA_FW_VERSION}" From d742339ebb063af80976f5daea20590d988e2ca4 Mon Sep 17 00:00:00 2001 From: Hector Bujanda Date: Wed, 14 Nov 2018 17:22:02 +0100 Subject: [PATCH 07/17] mca_tool: update checksums for build 1.15 Collects following changes: - Added tamper support for cc8x. https://jira.digi.com/browse/DEL-6226 Signed-off-by: Hector Bujanda --- .../mca/{mca-tool_1.14.bb => mca-tool_1.15.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.14.bb => mca-tool_1.15.bb} (61%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.14.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.15.bb similarity index 61% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.14.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.15.bb index 121eb1e2f..c081a9a99 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.14.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.15.bb @@ -8,13 +8,13 @@ PKGNAME = "mca_tool" # ARM tarball SRC_URI_arm = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=arm" -SRC_URI[arm.md5sum] = "a9c9e4bbafa65b8140def4db60518a61" -SRC_URI[arm.sha256sum] = "70bae34b602573547cd6f9c6a738aaef4f90c03ce7a97b4d54013b20acbf9a45" +SRC_URI[arm.md5sum] = "8069da600af8b607c96d1edf9c5dad8c" +SRC_URI[arm.sha256sum] = "54a13f497161106c785e81e8dfe506ce46c6c1ecf3e81185055112c9217506d3" # AARCH64 tarball SRC_URI_aarch64 = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=aarch64" -SRC_URI[aarch64.md5sum] = "ccde3a7d4981e179b271a3ce258c036c" -SRC_URI[aarch64.sha256sum] = "da6e9710dd4ff07451cbd1e6f7961f42e97a1c6c0f8b25141be48b229aa9b5a8" +SRC_URI[aarch64.md5sum] = "ee0b11428450b48b8ad3f27d3ebe0556" +SRC_URI[aarch64.sha256sum] = "032691491e2b5f294992fab453f2864666b3af495b439be897f23adacb312827" S = "${WORKDIR}/${PKGNAME}-${PV}" From 93d4852e69686c691cec446544f9d298e6bd3747 Mon Sep 17 00:00:00 2001 From: fgilmar Date: Thu, 22 Nov 2018 08:38:46 +0100 Subject: [PATCH 08/17] libdigiapix: add libsocketcan dependency for the CAN APIx Signed-off-by: fgilmar --- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 7d67c9075..e9b48fa15 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -6,7 +6,7 @@ SECTION = "libs" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" -DEPENDS = "libsoc" +DEPENDS = "libsoc libsocketcan" SRCBRANCH ?= "master" SRCREV = "${AUTOREV}" From b16a7db8a4850099f6ef4a39ca0c8e207f11f48b Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 29 Nov 2018 11:44:02 +0100 Subject: [PATCH 09/17] ccimx6sbc: add support for variant 0x15 New ccimx6 variant: * Dual-lite industrial, 800MHz * 4GB eMMC, * 1GB DDR3, * Temp grade: -40/+85C https://jira.digi.com/browse/DEL-6273 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt index 8590ac48c..192bce29c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt @@ -41,6 +41,8 @@ else setenv fdt_file zImage-imx6dl-ccimx6sbc-wb.dtb elif test "${module_variant}" = "0x14"; then setenv fdt_file zImage-imx6q-ccimx6sbc.dtb + elif test "${module_variant}" = "0x15"; then + setenv fdt_file zImage-imx6dl-ccimx6sbc.dtb else echo "------ Using default fdt_file" fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt index 818f19018..16913438b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt @@ -27,7 +27,7 @@ if test -n "${module_variant}"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc.imx; elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x0e" || test "${module_variant}" = "0x0f"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc512MB.imx; - elif test "${module_variant}" = "0x0b"; then + elif test "${module_variant}" = "0x0b" || test "${module_variant}" = "0x15"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc.imx; elif test "${module_variant}" = "0x0c" || test "${module_variant}" = "0x13"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc512MB.imx; From 755892a33ce81222ce7a1c742b0343ec1ea3dbf4 Mon Sep 17 00:00:00 2001 From: fgilmar Date: Thu, 29 Nov 2018 13:30:58 +0100 Subject: [PATCH 10/17] AWS Greengrass: add new recipe for AWS Greengrass core 1.7.0 Signed-off-by: fgilmar --- .../greengrass/greengrass_1.7.0.bb | 153 ++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 meta-digi-dey/recipes-aws/greengrass/greengrass_1.7.0.bb diff --git a/meta-digi-dey/recipes-aws/greengrass/greengrass_1.7.0.bb b/meta-digi-dey/recipes-aws/greengrass/greengrass_1.7.0.bb new file mode 100644 index 000000000..1d90363dd --- /dev/null +++ b/meta-digi-dey/recipes-aws/greengrass/greengrass_1.7.0.bb @@ -0,0 +1,153 @@ +# Copyright (C) 2018, Digi International Inc. + +SUMMARY = "AWS IoT Greengrass core" +HOMEPAGE = "https://aws.amazon.com/greengrass/" +# +# The Amazon Greengrass Core Product includes the following third-party software/licensing: +# github.com/aws/aws-sdk-go/; version 1.15.65 -- https://github.com/aws/aws-sdk-go/ +# github.com/coreos/go-systemd/; version 10 -- https://github.com/coreos/go-systemd/ +# github.com/docker/docker; version 1.12.0-rc4 -- https://github.com/docker/docker +# github.com/docker/go-units; version 0.3.1 -- https://github.com/docker/go-units +# github.com/go-ini/ini; version 1.32.0 -- https://github.com/go-ini/ini +# github.com/jmespath/go-jmespath; version 0.2.2 -- https://github.com/jmespath/go-jmespath +# github.com/mwitkow/go-http-dialer; version 0.1 -- https://github.com/mwitkow/go-http-dialer +# github.com/opencontainers/runc; version 1.0.0-rc3 -- https://github.com/opencontainers/runc +# github.com/opencontainers/runtime-spec; version 1.0.0-rc5 -- https://github.com/opencontainers/runtime-spec +# github.com/pquerna/ffjson; version 1.0 -- https://github.com/pquerna/ffjson +# github.com/vishvananda/netlink; version 0.1 -- https://github.com/vishvananda/netlink +# +# And the following Licenses: +LICENSE = "Apache-2.0 | BSD-2-Clause | BSD-3-Clause | MIT | PD | Proprietary" +LIC_FILES_CHKSUM = " \ + file://ggc/core/THIRD-PARTY-LICENSES;md5=28584ceb716d242782f9a7a7593c9ff2 \ +" +SRC_URI_arm = " \ + http:///not/exist/greengrass-linux-armv7l-${PV}.tar.gz;name=arm \ + file://greengrass-init \ +" + +SRC_URI[arm.md5sum] = "a7f3667ac9f24e434e7a85908d1db256" +SRC_URI[arm.sha256sum] ="339656dca947f1cff29635fbe7570b5ea04ca7256fd2177cf396711a60a8f26a" + +SRC_URI_aarch64 = " \ + http:///not/exist/greengrass-linux-aarch64-${PV}.tar.gz;name=aarch64 \ + file://greengrass-init \ +" + +# For ARCH64 we use another tarball. +SRC_URI[aarch64.md5sum] = "abfabf1464b7a1da0322dfd780415e48" +SRC_URI[aarch64.sha256sum] ="411956c8a41857c95dea5af6a41c7c0ab09310d621e054693d9e8ee57b23ed35" + +GG_TARBALL_LOCAL_PATH ?= "" + +# The tarball is only available for downloading after registration, so provide +# a PREMIRROR to a local directory that can be configured in the project's +# local.conf file using GG_TARBALL_LOCAL_PATH variable. +python() { + gg_tarball_local_path = d.getVar('GG_TARBALL_LOCAL_PATH', True) + if gg_tarball_local_path: + premirrors = d.getVar('PREMIRRORS', True) + d.setVar('PREMIRRORS', "http:///not/exist/greengrass.* file://%s \\n %s" % (gg_tarball_local_path, premirrors)) +} + +S = "${WORKDIR}/${BPN}" + +inherit aws-iot update-rc.d useradd + +GG_USESYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', 'no', d)}" + +# Disable tasks not needed for the binary package +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -d ${D}/${BPN} + tar --no-same-owner --exclude='./patches' --exclude='./.pc' -cpf - -C ${S} . \ + | tar --no-same-owner -xpf - -C ${D}/${BPN} + + # Install wrapper bootscript to launch Greengrass core on boot + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/greengrass-init ${D}${sysconfdir}/init.d/greengrass + sed -i -e "s,##GG_INSTALL_DIR##,/${BPN},g" ${D}${sysconfdir}/init.d/greengrass + + # If certificates do exist, install them and update the config file + if [ -f "${AWS_IOT_CERTS_DIR}/${AWS_GGCORE_ROOT_CA}" ] && \ + [ -f "${AWS_IOT_CERTS_DIR}/${AWS_GGCORE_CERTIFICATE}" ] && \ + [ -f "${AWS_IOT_CERTS_DIR}/${AWS_GGCORE_PRIVATE_KEY}" ]; then + install -m 0644 "${AWS_IOT_CERTS_DIR}/${AWS_GGCORE_ROOT_CA}" \ + "${AWS_IOT_CERTS_DIR}/${AWS_GGCORE_CERTIFICATE}" \ + "${AWS_IOT_CERTS_DIR}/${AWS_GGCORE_PRIVATE_KEY}" \ + ${D}/${BPN}/certs/ + sed -i -e "s,\[ROOT_CA_PEM_HERE],${AWS_GGCORE_ROOT_CA},g" \ + -e "s,\[CLOUD_PEM_CRT_HERE],${AWS_GGCORE_CERTIFICATE},g" \ + -e "s,\[CLOUD_PEM_KEY_HERE],${AWS_GGCORE_PRIVATE_KEY},g" \ + ${D}/${BPN}/config/config.json + fi + + # Configure the rest of GG Core parameters + [ -n "${AWS_GGCORE_THING_ARN}" ] && sed -i -e "s,\[THING_ARN_HERE],${AWS_GGCORE_THING_ARN},g" ${D}/${BPN}/config/config.json + if [ -n "${AWS_GGCORE_IOT_HOST}" ]; then + AWS_GGCORE_HOST_PREFIX="$(echo ${AWS_GGCORE_IOT_HOST} | sed -e 's,\([^.]\+\)\.iot.*,\1,g')" + AWS_GGCORE_REGION="$(echo ${AWS_GGCORE_IOT_HOST} | sed -e 's,.*.iot\.\([^.]\+\)\..*,\1,g')" + [ -n "${AWS_GGCORE_HOST_PREFIX}" ] && sed -i -e "s,\[HOST_PREFIX_HERE],${AWS_GGCORE_HOST_PREFIX},g" ${D}/${BPN}/config/config.json + [ -n "${AWS_GGCORE_REGION}" ] && sed -i -e "s,\[AWS_REGION_HERE],${AWS_GGCORE_REGION},g" ${D}/${BPN}/config/config.json + fi + + # Configure whether to use systemd or not + sed -i -e "/useSystemd/{s,\[yes|no],${GG_USESYSTEMD},g}" ${D}/${BPN}/config/config.json +} + +pkg_postinst_${PN}() { + # Enable protection for hardlinks and symlinks + if ! grep -qs 'protected_.*links' $D${sysconfdir}/sysctl.conf; then + cat >> $D${sysconfdir}/sysctl.conf <<-_EOF_ + # Greengrass: protect hardlinks/symlinks + fs.protected_hardlinks = 1 + fs.protected_symlinks = 1 + _EOF_ + fi + + # Customize '/etc/fstab' + if [ -f "$D${sysconfdir}/fstab" ]; then + # Disable TMPFS /var/volatile + sed -i -e '\#^tmpfs[[:blank:]]\+/var/volatile#s,^,#,g' $D${sysconfdir}/fstab + + # Mount a cgroup hierarchy with all available subsystems + if ! grep -qs '^cgroup' $D${sysconfdir}/fstab; then + cat >> $D${sysconfdir}/fstab <<-_EOF_ + # Greengrass: mount cgroups + cgroup /sys/fs/cgroup cgroup defaults 0 0 + _EOF_ + fi + fi + + # Disable '/etc/resolv.conf' symlink + if [ -f "$D${sysconfdir}/default/volatiles/00_core" ]; then + sed -i -e '/resolv.conf/d' $D${sysconfdir}/default/volatiles/00_core + cat >> $D${sysconfdir}/default/volatiles/00_core <<-_EOF_ + # Greengrass: create a real (no symlink) resolv.conf + f root root 0644 /etc/resolv.conf none + _EOF_ + fi +} + +FILES_${PN} = "/${BPN} ${sysconfdir}" + +CONFFILES_${PN} += "/${BPN}/config/config.json" + +INITSCRIPT_NAME = "greengrass" +INITSCRIPT_PARAMS = "defaults 80 20" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-r ggc_group" +USERADD_PARAM_${PN} = "-r -M -N -g ggc_group -s /bin/false ggc_user" + +# +# Disable failing QA checks: +# +# Binary was already stripped +# No GNU_HASH in the elf binary +# +INSANE_SKIP_${PN} += "already-stripped ldflags file-rdeps" + +RDEPENDS_${PN} += "ca-certificates python-argparse python-json python-numbers sqlite3" From d9e53bdc23271e85f44ea279aa05e79fd463e30a Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 30 Nov 2018 16:04:36 +0100 Subject: [PATCH 11/17] digi-sc-firmware: change version number to v1.0 This is only a cosmetic change to break away from NXP's versioning and use our own from now on. Signed-off-by: Gabriel Valcazar --- .../{digi-sc-firmware_0.7.bb => digi-sc-firmware_1.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-bsp/digi-sc-firmware/{digi-sc-firmware_0.7.bb => digi-sc-firmware_1.0.bb} (90%) diff --git a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_0.7.bb b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.0.bb similarity index 90% rename from meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_0.7.bb rename to meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.0.bb index d7b367b45..e64c3110f 100644 --- a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_0.7.bb +++ b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.0.bb @@ -11,8 +11,8 @@ inherit pkgconfig deploy SRC_URI = "${DIGI_PKG_SRC}/${PN}-${PV}.tar.gz" -SRC_URI[md5sum] = "1f8e370c9f25e6b03acc403c8487c7bd" -SRC_URI[sha256sum] = "67ea4ffed833c235b71dec592dc71659260da36eefa2958b8d51f200b50f3914" +SRC_URI[md5sum] = "3b6f34d30d2d6b72e0bda741eec71573" +SRC_URI[sha256sum] = "9879c904532815e4fe1ae1375b10d49b2f90f06e21790049867d0d258c2c030e" S = "${WORKDIR}/${PN}-${PV}" From 915f703c0e36e77649df12cca71905b0718bc78e Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 4 Dec 2018 15:56:41 +0100 Subject: [PATCH 12/17] README: update release information Signed-off-by: Mike Engel --- README.md | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 2f1484561..ebc6311eb 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,6 @@ Digi International's professional embedded Yocto development environment. Digi Embedded Yocto 2.4 is based on the Yocto Project(TM) 2.4 (Rocko) release. -This is a beta release for the ConnectCore 8X SBC Express. The rest of the -platforms are supported but have not been fully tested. - For a full list of supported features and interfaces please refer to the online documentation. @@ -70,6 +67,8 @@ Software for the following hardware platforms is in production support: * [CC-MX-JN7D-ZN](https://www.digi.com/cc8x) * ConnectCore 8X SBC Express * [CC-WMX8-EXPRESS](https://www.digi.com/cc8x) +* ConnectCore 8X SBC Pro + * [CC-WMX8-PRO](https://www.digi.com/cc8x) Previous versions of Digi Embedded Yocto include support for additional Digi hardware. @@ -83,13 +82,7 @@ To install, please follow the instructions at the dey-manifest [README](https:// # Documentation -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 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) -* [ConnectCore 8X SBC Express](https://www.digi.com/cc8x/documentation) +Documentation is available online at https://www.digi.com/resources/documentation/digidocs/embedded/ # Downloads @@ -103,13 +96,12 @@ Documentation is available online on the Digi documentation site: * Added support for ConnectCore 8X platform. Supported features: * Bluetooth and Wireless interfaces (STA, SoftAP, P2P, Concurrence) * MCA: Reset, Watchdog, RTC, GPIOs and ADCs - * SBC Express interfaces: Ethernet, microSD, UART, I2C, CAN, SPI, USB host, - USB device, GPIOs, XBee, LVDS Display, Touch Screen controller - * Graphics and Video -* Updated U-Boot to version 2017.03-r1 +* Updated U-Boot to version 2017.03-r2 * Fixed XBee RESET_N polarity assertion. Requires updating polarity of the ``digi,reset-gpio`` property of node ``xbee`` on device tree files derived from ConnectCore 6UL SBC Pro to use polarity **GPIO_ACTIVE_LOW** +* Updated AWS Greengrass core to version 1.7.0 +* Updated kernel version to v4.9.135 for i.MX6 and i.MX6UL platforms. ## 2.4-r1 @@ -139,6 +131,7 @@ boot a signed U-Boot only. * For P2P connections Digi recommends "Negotiated GO" modes. The QCA6564 devices (ConnectCore 6UL and ConnectCore 6 Plus) running a 4.9 kernel version fail to join to autonomous groups. +* Trustfence secure console is not supported on U-Boot v2017.03. In order to use this functionality, U-Boot v2015.04 will be required. ## ConnectCore 6UL @@ -192,10 +185,6 @@ boot a signed U-Boot only. * i.MX8QXP Processor * The following processor features are not supported in this BSP release: Power Management, PWM, ADC, RS485. They will be implemented in future releases. - * VPU unit is not fully functional, hence hardware video encoding/decoding is - not available. On this release, video encoding/decoding can be done via - software plugins, reducing the performance of video playback. This will be - available in future releases of the hardware. * GPU maximum performance reduced. The maximum frequency targets are 850 MHz for the shaders and 700 MHz for the core. However, in this hardware release the maximum frequency is limited to 650 MHz for the shaders and 600 MHz for @@ -203,26 +192,12 @@ boot a signed U-Boot only. be met in future releases of the hardware. * BSDL operation is not supported. It will be available in future releases of the hardware. -* ConnectCore 8X System-on-Module (SOM) - * The UART connected to the Bluetooth chip on early versions of the ConnectCore - 8X System-on-Module (hardware version = 1) 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. It will be fixed in - future releases of the hardware. - * MCA firmware cannot be updated without a debugger on early versions of the - ConnectCore 8X System-on-Module (hardware version = 1). It will be fixed in - future releases of the hardware. - * MCA internal voltage reference cannot be enabled on early versions of the - ConnectCore 8X System-on-Module (hardware version = 1). It will be fixed in - future releases of the hardware. - * MCA tamper pins configuration is not supported. It will be available in - future releases. +* ConnectCore 8X SBC Pro + * USB 3.0 not supported. * Digi Embedded Yocto - * The following features are not supported in this release: + * The following features are not supported in this release for the ConnectCore 8X plaform: * Trustfence (TM) * Digi Remote Manager - * Amazon Web Services # Support Contact Information From 29d7aa0c414273b087d755c659c6c537fd5634e5 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 4 Dec 2018 16:36:16 +0100 Subject: [PATCH 13/17] meta-digi: update revisions for dey-2.4-r2.1 Signed-off-by: Mike Engel --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 5 +++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 5 +++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- .../recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 22 insertions(+), 20 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 6afbffc03..a9f1c9725 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 001031b25..1f0c2ca76 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -13,7 +13,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8" S = "${WORKDIR}/git" @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" 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_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 30df920ad..a4b62fcc4 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8" S = "${WORKDIR}" @@ -14,7 +14,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 2ac6a28ba..aa8603301 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 @@ -11,12 +11,13 @@ PV_ccimx8x = "v4.0.11.208Q" SRCBRANCH = "dey-2.4/maint" SRCBRANCH_ccimx8x = "dey-2.4/maint_cc8x" -SRCREV = "${AUTOREV}" +SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db" +SRCREV_ccimx8x = "bb11723b14dab4c8d930bb38a08f736b2985d5e1" 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 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 6ec4550da..3ea252832 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" LOCALVERSION = "-dey" SRCBRANCH = "v4.9/dey-2.4/maint" SRCBRANCH_ccimx8x = "v4.9/dey-2.4/maint_cc8x" -SRCREV = "${AUTOREV}" +SRCREV = "a78b3d90543e3b751d02be146eea6ecef98026d5" +SRCREV_ccimx8x = "c5bb360542d53dc8cfceaec5f2d9060e47fdc5bc" # Select internal or Github Linux repo 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}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index df5c2d21f..d32144c1a 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 = "433c1a58a7e63933a60716195e6bb834b201bf1c" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 6234aee49..650fae6c1 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" 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 f21faa8e5..e39eeb5e2 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" 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 aee31ad07..911196942 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" 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 e9b48fa15..a213c9446 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan" SRCBRANCH ?= "master" -SRCREV = "${AUTOREV}" +SRCREV = "780f117f0dbd5d64912221650c1be391921fca40" 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 dd5ba676ffbf91210aab2c266da7808b1ca9bd3b Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 4 Dec 2018 16:38:07 +0100 Subject: [PATCH 14/17] meta-digi: revert revisions to AUTOREV Signed-off-by: Mike Engel --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 5 ++--- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 5 ++--- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- .../recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 20 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 a9f1c9725..6afbffc03 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 1f0c2ca76..001031b25 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -13,7 +13,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2017.03/maint" -SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8" +SRCREV = "${AUTOREV}" S = "${WORKDIR}/git" @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" 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_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index a4b62fcc4..30df920ad 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" SRCBRANCH = "v2017.03/maint" -SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -14,7 +14,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index aa8603301..2ac6a28ba 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 @@ -11,13 +11,12 @@ PV_ccimx8x = "v4.0.11.208Q" SRCBRANCH = "dey-2.4/maint" SRCBRANCH_ccimx8x = "dey-2.4/maint_cc8x" -SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db" -SRCREV_ccimx8x = "bb11723b14dab4c8d930bb38a08f736b2985d5e1" +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} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3ea252832..6ec4550da 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" LOCALVERSION = "-dey" SRCBRANCH = "v4.9/dey-2.4/maint" SRCBRANCH_ccimx8x = "v4.9/dey-2.4/maint_cc8x" -SRCREV = "a78b3d90543e3b751d02be146eea6ecef98026d5" -SRCREV_ccimx8x = "c5bb360542d53dc8cfceaec5f2d9060e47fdc5bc" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo 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" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d32144c1a..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 = "433c1a58a7e63933a60716195e6bb834b201bf1c" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 650fae6c1..6234aee49 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" SRCBRANCH = "dey-2.4/maint" -SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" +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 e39eeb5e2..f21faa8e5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" SRCBRANCH = "dey-2.4/maint" -SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" +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 911196942..aee31ad07 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" SRCBRANCH = "dey-2.4/maint" -SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" +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 a213c9446..e9b48fa15 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan" SRCBRANCH ?= "master" -SRCREV = "780f117f0dbd5d64912221650c1be391921fca40" +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 eaf2a9b7ea82f4a99a76b595c18dbe12689a8d48 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 10 Dec 2018 16:45:00 +0100 Subject: [PATCH 15/17] u-boot-dey: have the v2017.03 recipe create additional symlinks Without these symlinks, U-Boot images will be left out of the installer .zip file. Unlike the v2015.04 recipe, the default symlinks aren't removed, because they're needed in the imx-boot recipe for the ccimx8x. https://jira.digi.com/browse/DEL-6333 Signed-off-by: Gabriel Valcazar --- .../recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 001031b25..06d097e83 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -117,7 +117,7 @@ do_deploy_append() { # u-boot- # and add a more suitable symlink in the form: # u-boot--. - if [ -n "${UBOOT_CONFIG}" ] && [ "${TRUSTFENCE_SIGN}" = "1" ] + if [ -n "${UBOOT_CONFIG}" ] then for config in ${UBOOT_MACHINE}; do i=$(expr $i + 1); @@ -125,19 +125,25 @@ do_deploy_append() { j=$(expr $j + 1); if [ $j -eq $i ] then - install ${B}/${config}/SRK_efuses.bin SRK_efuses-${PV}-${PR}.bin - ln -sf SRK_efuses-${PV}-${PR}.bin SRK_efuses.bin - - install ${B}/${config}/u-boot-dtb-signed-${type}.${UBOOT_SUFFIX} u-boot-dtb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - ln -sf u-boot-dtb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-dtb-signed-${type}.${UBOOT_SUFFIX} - - install ${B}/${config}/u-boot-dtb-usb-signed-${type}.${UBOOT_SUFFIX} u-boot-dtb-usb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - ln -sf u-boot-dtb-usb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-dtb-usb-signed-${type}.${UBOOT_SUFFIX} - - if [ "${TRUSTFENCE_DEK_PATH}" != "0" ] + cd ${DEPLOYDIR} + rm -r ${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-${type}.${UBOOT_SUFFIX} + if [ "${TRUSTFENCE_SIGN}" = "1" ] then - install ${B}/${config}/u-boot-dtb-encrypted-${type}.${UBOOT_SUFFIX} u-boot-dtb-encrypted-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - ln -sf u-boot-dtb-encrypted-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-dtb-encrypted-${type}.${UBOOT_SUFFIX} + install ${B}/${config}/SRK_efuses.bin SRK_efuses-${PV}-${PR}.bin + ln -sf SRK_efuses-${PV}-${PR}.bin SRK_efuses.bin + + install ${B}/${config}/u-boot-dtb-signed-${type}.${UBOOT_SUFFIX} u-boot-dtb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf u-boot-dtb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-dtb-signed-${type}.${UBOOT_SUFFIX} + + install ${B}/${config}/u-boot-dtb-usb-signed-${type}.${UBOOT_SUFFIX} u-boot-dtb-usb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf u-boot-dtb-usb-signed-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-dtb-usb-signed-${type}.${UBOOT_SUFFIX} + + if [ "${TRUSTFENCE_DEK_PATH}" != "0" ] + then + install ${B}/${config}/u-boot-dtb-encrypted-${type}.${UBOOT_SUFFIX} u-boot-dtb-encrypted-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf u-boot-dtb-encrypted-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-dtb-encrypted-${type}.${UBOOT_SUFFIX} + fi fi fi done From 72ebe668ddfb189ddd3f9b4e890b305b5b9ae47e Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Thu, 13 Dec 2018 16:34:04 +0100 Subject: [PATCH 16/17] README: update release information Signed-off-by: Mike Engel --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebc6311eb..3f76e4ca3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Digi Embedded Yocto (DEY) 2.4 -## Release 2.4-r2.1 +## Release 2.4-r2.2 This document provides information about Digi Embedded Yocto, Digi International's professional embedded Yocto development environment. From 943bd218eabecc71c8945d8de97782437a238795 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Thu, 13 Dec 2018 15:50:45 +0100 Subject: [PATCH 17/17] meta-digi: update revisions for dey-2.4-r2.2 Signed-off-by: Mike Engel --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 5 +++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 5 +++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- .../recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 4 ++-- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 22 insertions(+), 20 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 6afbffc03..a9f1c9725 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 06d097e83..be1894ed6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -13,7 +13,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n PROVIDES += "u-boot" SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8" S = "${WORKDIR}/git" @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" 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_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 30df920ad..a4b62fcc4 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8" S = "${WORKDIR}" @@ -14,7 +14,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 2ac6a28ba..aa8603301 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 @@ -11,12 +11,13 @@ PV_ccimx8x = "v4.0.11.208Q" SRCBRANCH = "dey-2.4/maint" SRCBRANCH_ccimx8x = "dey-2.4/maint_cc8x" -SRCREV = "${AUTOREV}" +SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db" +SRCREV_ccimx8x = "bb11723b14dab4c8d930bb38a08f736b2985d5e1" 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 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 6ec4550da..3ea252832 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" LOCALVERSION = "-dey" SRCBRANCH = "v4.9/dey-2.4/maint" SRCBRANCH_ccimx8x = "v4.9/dey-2.4/maint_cc8x" -SRCREV = "${AUTOREV}" +SRCREV = "a78b3d90543e3b751d02be146eea6ecef98026d5" +SRCREV_ccimx8x = "c5bb360542d53dc8cfceaec5f2d9060e47fdc5bc" # Select internal or Github Linux repo 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}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index df5c2d21f..d32144c1a 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 = "433c1a58a7e63933a60716195e6bb834b201bf1c" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 6234aee49..650fae6c1 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" 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 f21faa8e5..e39eeb5e2 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" 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 aee31ad07..911196942 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" SRCBRANCH = "dey-2.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179" 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 e9b48fa15..a213c9446 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan" SRCBRANCH ?= "master" -SRCREV = "${AUTOREV}" +SRCREV = "780f117f0dbd5d64912221650c1be391921fca40" 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 \