From dfc71d40ebd70383b75e4b813711b7fc921bc9b4 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Fri, 28 Apr 2017 12:41:38 +0200 Subject: [PATCH 01/43] 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 ++-- 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 ++-- 8 files changed, 12 insertions(+), 12 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 dcb784add..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 = "0de0373ade11801e9ce9eed20d31ab3fd37306dd" +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 39771860f..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 = "0de0373ade11801e9ce9eed20d31ab3fd37306dd" +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/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 e41f04b87..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 = "e2da450994b1dcc4b187fea9e258d993ef25fc56" +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 9554d7397..b2a62d6db 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 = "f1810a3190faad9b96cc8385b394ce7c9a6c5c3e" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(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" From 7a06a9ce5dfa364afa4a06926bd22c45c9cafb45 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 4 May 2017 17:24:25 +0200 Subject: [PATCH 02/43] modemmanager: add support for u-blox based XBee Cellular Add patch to MM, so it detects the U-Blox modem connected to the XBee socket. https://jira.digi.com/browse/DEL-4084 Signed-off-by: Javier Viguera (cherry picked from commit c1762b40f53f12992e75bf53cd1d0e6273eee92e) --- ...port-modems-connected-to-serial-port.patch | 32 +++++++++++++++++++ .../modemmanager/modemmanager_git.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch new file mode 100644 index 000000000..8d25e6036 --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch @@ -0,0 +1,32 @@ +From: Javier Viguera +Date: Thu, 4 May 2017 17:03:37 +0200 +Subject: [PATCH] ublox: support modems connected to serial port + +Add the vendor string, so it can be probed via AT commands. This allows +to support modems that are connected to a serial port. + +Upstream-Status: Pending + +Signed-off-by: Javier Viguera +--- + plugins/ublox/mm-plugin-ublox.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/ublox/mm-plugin-ublox.c b/plugins/ublox/mm-plugin-ublox.c +index 890f520754aa..0ca74d903f88 100644 +--- a/plugins/ublox/mm-plugin-ublox.c ++++ b/plugins/ublox/mm-plugin-ublox.c +@@ -66,11 +66,13 @@ mm_plugin_create (void) + { + static const gchar *subsystems[] = { "tty", "net", NULL }; + static const guint16 vendor_ids[] = { 0x1546, 0 }; ++ static const gchar *vendor_strings[] = { "u-blox", NULL }; + + return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_UBLOX, + MM_PLUGIN_NAME, "u-blox", + MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, + MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, ++ MM_PLUGIN_ALLOWED_VENDOR_STRINGS, vendor_strings, + MM_PLUGIN_ALLOWED_AT, TRUE, + MM_PLUGIN_CUSTOM_AT_PROBE, custom_at_probe, + NULL)); diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb index 620720075..064e68dc8 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb @@ -15,6 +15,7 @@ PV = "1.7.0+git${SRCPV}" SRC_URI = " \ git://anongit.freedesktop.org/git/ModemManager/ModemManager.git;protocol=https \ file://0001-configure.ac-add-foreign-automake-option.patch \ + file://0002-ublox-support-modems-connected-to-serial-port.patch \ file://0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch \ " SRCREV = "d09bc8baaa9fe93a72bb715530b1403a7a81c891" From db6d57284ad2df9dd94ead07a3b93ef65858268b Mon Sep 17 00:00:00 2001 From: Salvador Penalva Date: Thu, 11 May 2017 09:55:41 +0200 Subject: [PATCH 03/43] modemmanager: update to fix QMI bug and add Ublox patches for XBee QMI modems didn't work with the version of modemmanager that the dey-2.2-r1 release was using. We were using two patches for uBlox plugin to use XBee Cellular 3G that are now merged in modemmanager master. This updates modemmanager to use the commit where QMI problem was fixed and also include uBlox patches. https://jira.digi.com/browse/DEL-4192 Signed-off-by: Salvador Penalva (cherry picked from commit a2063b11a349a4ef542b7f4788eddb19fc615760) --- ...port-modems-connected-to-serial-port.patch | 32 ------------------ ...B230400-and-B921600-missing-baudrate.patch | 33 ------------------- .../modemmanager/modemmanager_git.bb | 4 +-- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch deleted file mode 100644 index 8d25e6036..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Javier Viguera -Date: Thu, 4 May 2017 17:03:37 +0200 -Subject: [PATCH] ublox: support modems connected to serial port - -Add the vendor string, so it can be probed via AT commands. This allows -to support modems that are connected to a serial port. - -Upstream-Status: Pending - -Signed-off-by: Javier Viguera ---- - plugins/ublox/mm-plugin-ublox.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/ublox/mm-plugin-ublox.c b/plugins/ublox/mm-plugin-ublox.c -index 890f520754aa..0ca74d903f88 100644 ---- a/plugins/ublox/mm-plugin-ublox.c -+++ b/plugins/ublox/mm-plugin-ublox.c -@@ -66,11 +66,13 @@ mm_plugin_create (void) - { - static const gchar *subsystems[] = { "tty", "net", NULL }; - static const guint16 vendor_ids[] = { 0x1546, 0 }; -+ static const gchar *vendor_strings[] = { "u-blox", NULL }; - - return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_UBLOX, - MM_PLUGIN_NAME, "u-blox", - MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, - MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, -+ MM_PLUGIN_ALLOWED_VENDOR_STRINGS, vendor_strings, - MM_PLUGIN_ALLOWED_AT, TRUE, - MM_PLUGIN_CUSTOM_AT_PROBE, custom_at_probe, - NULL)); diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch deleted file mode 100644 index 2eedc9ea2..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Javier Viguera -Date: Wed, 19 Apr 2017 14:13:56 +0200 -Subject: [PATCH] port-serial: add B230400 and B921600 missing baudrates - -So MM can use them when opening a specific serial port. - -Upstream-Status: Pending - -Signed-off-by: Javier Viguera ---- - src/mm-port-serial.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c -index 04ab17fe1675..b6359d28acd3 100644 ---- a/src/mm-port-serial.c -+++ b/src/mm-port-serial.c -@@ -260,9 +260,15 @@ parse_baudrate (guint baudrate_num, - case 115200: - speed = B115200; - break; -+ case 230400: -+ speed = B230400; -+ break; - case 460800: - speed = B460800; - break; -+ case 921600: -+ speed = B921600; -+ break; - default: - return FALSE; - } diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb index 064e68dc8..623a8db0a 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb @@ -15,10 +15,8 @@ PV = "1.7.0+git${SRCPV}" SRC_URI = " \ git://anongit.freedesktop.org/git/ModemManager/ModemManager.git;protocol=https \ file://0001-configure.ac-add-foreign-automake-option.patch \ - file://0002-ublox-support-modems-connected-to-serial-port.patch \ - file://0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch \ " -SRCREV = "d09bc8baaa9fe93a72bb715530b1403a7a81c891" +SRCREV = "d41d717112e6a183a0df510c210e80a86fc11060" S = "${WORKDIR}/git" From 1eccad50b7e3fe8ccce0b6b738ef98e3c66cd66d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 26 May 2017 17:03:16 +0200 Subject: [PATCH 04/43] image_types class: fix build error due to missing images dependencies A couple of commits in poky.git broke the dependence from our boot and recovery images to the trustfence and recovery initramfs images: http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=morty&id=6c3d10ea62ad282a764da83aa701f92c6d3db6cb http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=morty&id=99c6c878ee122a04f23ef49ea653208ca1c7aa77 This commit fixes the dependencies again, so when you build those images, it builds first the required initramfs images. https://jira.digi.com/browse/DEL-4320 Signed-off-by: Javier Viguera (cherry picked from commit efba5b5e7cc386b903c201219d7e13f018f3219b) --- meta-digi-arm/classes/image_types_digi.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 1bcb23d25..334ac0e79 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -122,9 +122,9 @@ do_image_boot_ubifs[imgsuffix] = "." # # This is needed because otherwise the IMAGE_DEPENDS_ is not used and the build fails. # -IMAGE_TYPEDEP_boot = " \ - ${@bb.utils.contains('IMAGE_FSTYPES', 'boot.ubifs', 'boot.ubifs', '', d)} \ - ${@bb.utils.contains('IMAGE_FSTYPES', 'boot.vfat', 'boot.vfat', '', d)} \ +IMAGE_DEPENDS_boot = " \ + ${@bb.utils.contains('IMAGE_FSTYPES', 'boot.ubifs', '${IMAGE_DEPENDS_boot.ubifs}', '', d)} \ + ${@bb.utils.contains('IMAGE_FSTYPES', 'boot.vfat', '${IMAGE_DEPENDS_boot.vfat}', '', d)} \ " ################################################################################ @@ -198,9 +198,9 @@ do_image_recovery_ubifs[imgsuffix] = "." # # This is needed because otherwise the IMAGE_DEPENDS_ is not used and the build fails. # -IMAGE_TYPEDEP_recovery = " \ - ${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.ubifs', 'recovery.ubifs', '', d)} \ - ${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.vfat', 'recovery.vfat boot.vfat', '', d)} \ +IMAGE_DEPENDS_recovery = " \ + ${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.ubifs', '${IMAGE_DEPENDS_recovery.ubifs}', '', d)} \ + ${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.vfat', '${IMAGE_DEPENDS_recovery.vfat}', '', d)} \ " ################################################################################ From a28cdcc70721a0829ecc43e4f47b2ea68da21a74 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 13 Jun 2017 16:38:40 +0200 Subject: [PATCH 05/43] meta-digi: Update Readme with hot-fix changes. Signed-off-by: Mike Engel https://jira.digi.com/browse/DEL-4364 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ef239754..e4bff0859 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,11 @@ Documentation is available online on the Digi documentation site: * Updated Qt 5.7 * Updated ModemManager with validated support for: * Digi's XBee Cellular LTE Cat 1 (USA/Verizon), with P/N XBC-V1-UT-001 + * Digi's XBee Cellular 3G Global, with P/N XBC-M5-UT-001 + * U-Blox's TOBY L-200/L-210 * Telit's LE910 and HE910 * Huawei's ME909u - * Quectel's EC21 + * Quectel's EC21 and EC25 * Modified default networking settings: * Defalt to dynamic IP addresses assignments * Default station and softAP concurrent wireless mode From aa2d5fd346ecd82721f353212c40791d3650c58c Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 13 Jun 2017 17:46:19 +0200 Subject: [PATCH 06/43] meta-digi: update revisions for dey-2.2-r1.5 Signed-off-by: Mike Engel https://jira.digi.com/browse/DEL-4364 --- 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 ++-- 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 ++-- 8 files changed, 12 insertions(+), 12 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..dcb784add 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 = "0de0373ade11801e9ce9eed20d31ab3fd37306dd" # 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..39771860f 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 = "0de0373ade11801e9ce9eed20d31ab3fd37306dd" 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/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..e41f04b87 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 = "e2da450994b1dcc4b187fea9e258d993ef25fc56" 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 b2a62d6db..9554d7397 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 = "f1810a3190faad9b96cc8385b394ce7c9a6c5c3e" COMPATIBLE_MACHINE = "(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" From 38dccefc9c873747140a199797a856e8684deb89 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 13 Jun 2017 17:48:23 +0200 Subject: [PATCH 07/43] 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 ++-- 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 ++-- 8 files changed, 12 insertions(+), 12 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 dcb784add..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 = "0de0373ade11801e9ce9eed20d31ab3fd37306dd" +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 39771860f..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 = "0de0373ade11801e9ce9eed20d31ab3fd37306dd" +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/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 e41f04b87..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 = "e2da450994b1dcc4b187fea9e258d993ef25fc56" +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 9554d7397..b2a62d6db 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 = "f1810a3190faad9b96cc8385b394ce7c9a6c5c3e" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(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" From 234f783b8180f7c155d8812046306b22448acc12 Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Mon, 10 Jul 2017 09:58:57 +0200 Subject: [PATCH 08/43] sysinfo: remove errors if the IOEXP is not programmed If the IOExpander is not programmed but the kernel is running its driver, the following messages will appear when running sysinfo: cat: can't open '/sys/devices/platform/soc/2100000.aips-bus/21a0000.i2c/i2c-0/0-006e/hw_version': No such file or directory cat: can't open '/sys/devices/platform/soc/2100000.aips-bus/21a0000.i2c/i2c-0/0-006e/fw_version': No such file or directory Signed-off-by: Diaz de Grenu, Jose --- meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 0ad16d112..9d0695a87 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -274,8 +274,8 @@ fi IOEXP_NODE="/sys/devices/platform/soc/2100000.aips-bus/21a0000.i2c/i2c-0/0-006e" if [ -d "$IOEXP_NODE" ]; then - IOEXP_HW_VERSION=$(cat ${IOEXP_NODE}/hw_version) || IOEXP_HW_VERSION="??" - IOEXP_FW_VERSION=$(cat ${IOEXP_NODE}/fw_version) || IOEXP_FW_VERSION="??" + IOEXP_HW_VERSION=$(cat ${IOEXP_NODE}/hw_version 2>/dev/null) || IOEXP_HW_VERSION="??" + IOEXP_FW_VERSION=$(cat ${IOEXP_NODE}/fw_version 2>/dev/null) || IOEXP_FW_VERSION="??" IOEXP_VERSION="HW_VERSION=${IOEXP_HW_VERSION} FW_VERSION=${IOEXP_FW_VERSION}" fi From c9bee750f1a098ac5d6e945152c5d709d6c59287 Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Mon, 10 Jul 2017 13:47:36 +0200 Subject: [PATCH 09/43] ccimx6ul: synchronize kernel defconfig Re-add USB gadget Ethernet. Signed-off-by: Diaz de Grenu, Jose --- .../recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig index 42dce6c8a..71f754fe4 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig @@ -274,6 +274,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_ETH=m CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m +CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y From 3f5d3425e2c1d1bd3ec4f1eb329614b4ffece6eb Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 10 Jul 2017 19:41:53 +0200 Subject: [PATCH 10/43] libmbim: fix runtime dependence "glibc-gconv" packages are GLIBC library specific, so add the proper override to fix the build of the package using other C libraries (e.g. MUSL). Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend b/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend index 0d3242c24..a177bc4a7 100644 --- a/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2017 Digi International Inc. -RDEPENDS_${PN} += "glibc-gconv-utf-16" +RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" From 99c8eb29800e4615c3832b3a854c9a773d02f316 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 10 Jul 2017 09:55:59 +0200 Subject: [PATCH 11/43] meta-digi-arm: firmware-qualcomm: Update WiFi US board data file The new bdf has the following checksum: cf55643c0c65987f2a46701f9f23f1f7 bdwlan30_US.bin Details at: https://confluence.digi.com/pages/viewpage.action?spaceKey=CCUL&title=BIN+File+2017.07.07 https://jira.digi.com/browse/DEL-4569 Signed-off-by: Alex Gonzalez --- .../firmware-qualcomm/bdwlan30_US.bin | Bin 8124 -> 8124 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_US.bin index a0ada33f0edf3059c2747c4e8c39f7239c413020..e923f41b675424bf1472a4f4e58d5f73d48d8108 100644 GIT binary patch delta 336 zcmdmEzsH_sk9?=lMwVsl7H8IYFs#a0A|{5;5D{U305P$S3^#_3j20Be=11%veDzWi uVq*9(56?TG`DrQ%6f(HDpyr@5>On@M3K0-tVSyS%F@psNHfxAa;Q#;u31a&I delta 336 zcmdmEzsH_sk9>B?MwVsl7Vp-0Fs#a0A|{5;5D{U305P#MU2Y5=87(M`&5zhU`0B+7 q01l3K?|K;0R1zp>oXdimgT$!E6e27F^f1IhlrUJpV6%q!6b=C8_-fYx From 4ab483ed661d395be5381b83f59d8fd9cb7cbaca Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 11 Jul 2017 13:23:26 +0200 Subject: [PATCH 12/43] meta-digi: configure recipes to use maintenance branches Updated recipes for cryptoauthlib, awsiotsdk-demo and dey-examples-cryptochip. Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 2 +- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 2 +- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index 9e2e7c12c..9eef50f36 100644 --- a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "ATMEL_CRYPTOAUTHLIB_LICENSE" LIC_FILES_CHKSUM = "file://lib/atca_cfgs.h;beginline=8;endline=40;md5=073d05cb7a4312aaff0af9186e4fa93e" -SRCBRANCH = "master" +SRCBRANCH = "dey-2.2/maint" 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)}" 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 26364cb58..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 @@ -13,7 +13,7 @@ AWS_USER_LED_ccimx6ulstarter ?= "75" AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" -SRCBRANCH = "master" +SRCBRANCH = "dey-2.2/maint" SRCREV = "${AUTOREV}" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb index e1700995b..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 @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" -SRCBRANCH = "master" +SRCBRANCH = "dey-2.2/maint" SRCREV = "${AUTOREV}" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" From 9804e3bdce57918e68bca1360a51548180bc8844 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 11 Jul 2017 09:54:49 +0200 Subject: [PATCH 13/43] README: Update for dey-2.2-r2 Signed-off-by: Arturo Buzarra --- README.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 71f1e0b8a..f41a8521e 100644 --- a/README.md +++ b/README.md @@ -51,24 +51,26 @@ hardware. Documentation is available online on the Digi documentation site: -* [Digi ConnectCore 6UL SBC Express](http://www.digi.com/resources/documentation/Digidocs/90001514/default.htm) -* [Digi ConnectCore 6UL SBC Pro](http://www.digi.com/resources/documentation/Digidocs/90001515/default.htm) -* [Digi ConnectCore 6 Jumpstart Development Kit](http://www.digi.com/resources/documentation/Digidocs/90001945-13/default.htm) +* [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) # Downloads -* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r1/images/ -* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r1/sdk/ +* 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/ # Release Changelog ## 2.2-r2 * Digi Embedded Yocto + * Use NetworkManager for ethernet, wireless (station) and cellular network interfaces + * Updated kernel version to v4.1.41 for CC6 platform + * Added support for SPI Slave mode on CC6UL platform + * Added support for Atmel Cryptochip ATEC508A using Cryptoauthlib + * Added support for AWS Greengrass core software * Support to connect to AWS IoT with AWS IoT Device SDK for embedded C. - * Added support for Digi XBee Cellular 3G Global, with P/N XBC-M5-UT-001 - * Added support for U-Blox TOBY L-200/L-210 - * Added support for Quectel EC-25 ## 2.2-r1 From b5ab28b4b49f2dd9db93b395328337d867ec772e Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 11 Jul 2017 16:58:52 +0200 Subject: [PATCH 14/43] meta-digi: update revisions for dey-2.2-r2.1 Signed-off-by: Arturo Buzarra --- 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..122e5f0d6 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 = "d14ae0b88580c50358df6266c71cea84fd7df7dd" # 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..202b1085d 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 = "d14ae0b88580c50358df6266c71cea84fd7df7dd" 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..496c37a81 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 = "a004349be88e3f2a867600ee7c2b8035b5915211" 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..40c8a1533 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 = "eaa1199a097217aa619817654e022f2605c45be6" 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..082304f7f 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 = "208884306c5cff1be494bf3d8aef134c60d83ba2" 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 9eef50f36..8eeb67dda 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 = "4211e7e12bb1c88e35a1170503f91bb1409ea581" 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 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 2064525edebd2fe2702f1146cf7a3ee8e165ad5c Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 11 Jul 2017 18:06:32 +0200 Subject: [PATCH 15/43] meta-digi: revert revisions to AUTOREV Signed-off-by: Arturo Buzarra --- 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 122e5f0d6..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 = "d14ae0b88580c50358df6266c71cea84fd7df7dd" +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 202b1085d..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 = "d14ae0b88580c50358df6266c71cea84fd7df7dd" +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 496c37a81..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 = "a004349be88e3f2a867600ee7c2b8035b5915211" +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 082304f7f..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 = "208884306c5cff1be494bf3d8aef134c60d83ba2" +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 8eeb67dda..9eef50f36 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 = "4211e7e12bb1c88e35a1170503f91bb1409ea581" +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 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 d7a9f1a6ee0418351f33a143c7296d66ac2514de Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 11 Jul 2017 18:41:11 +0200 Subject: [PATCH 16/43] build.sh: fix parsing of platform data As the platform data is only separated by spaces, the data is assigned to the incorrect variable: ccardimx28js variants: - ccardimx28js targets: e w wb web web1 dey-image-qt After this commit: ccardimx28js variants: - e w wb web web1 ccardimx28js targets: dey-image-qt Signed-off-by: Javier Viguera --- sdk/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/build.sh b/sdk/build.sh index fff800d17..b34f424bc 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -166,10 +166,10 @@ while read _pl _var _tgt; do fi fi [ -n "${DY_TARGET}" ] && _tgt="${DY_TARGET}" || true - eval "${_pl}_var=\"${_var}\"" - eval "${_pl}_tgt=\"${_tgt}\"" + eval "${_pl}_var=\"${_var//,/ }\"" + eval "${_pl}_tgt=\"${_tgt//,/ }\"" done<<-_EOF_ - ccardimx28js - e w wb web web1 dey-image-qt + ccardimx28js -,e,w,wb,web,web1 dey-image-qt ccimx6sbc DONTBUILDVARIANTS dey-image-qt ccimx6ulsbc DONTBUILDVARIANTS dey-image-qt ccimx6ulstarter DONTBUILDVARIANTS core-image-base From 03dcd12f83cde1f12a9d1582b161bc0a292f636d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 11 Jul 2017 19:33:21 +0200 Subject: [PATCH 17/43] build.sh: build 'dey-image-aws' by default for CC6/CC6UL Signed-off-by: Javier Viguera --- sdk/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/build.sh b/sdk/build.sh index b34f424bc..a26f5c656 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -170,9 +170,9 @@ while read _pl _var _tgt; do eval "${_pl}_tgt=\"${_tgt//,/ }\"" done<<-_EOF_ ccardimx28js -,e,w,wb,web,web1 dey-image-qt - ccimx6sbc DONTBUILDVARIANTS dey-image-qt - ccimx6ulsbc DONTBUILDVARIANTS dey-image-qt - ccimx6ulstarter DONTBUILDVARIANTS core-image-base + ccimx6sbc DONTBUILDVARIANTS dey-image-qt,dey-image-aws + ccimx6ulsbc DONTBUILDVARIANTS dey-image-qt,dey-image-aws + ccimx6ulstarter DONTBUILDVARIANTS core-image-base,dey-image-aws ccimx6ulsom DONTBUILDVARIANTS dey-image-mft-module-min ccimx6ulrftest DONTBUILDVARIANTS dey-image-mft-module-rf _EOF_ From d7cd1c02042d6b48026dc0145fee11cc62fb8b4c Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Tue, 11 Jul 2017 13:25:16 +0200 Subject: [PATCH 18/43] ccimx6ul: ubifs: increase max leb count for rootfs This is required to be able to use the whole RootFS partition which is 512 MiB in the 0x04 CC6UL SOM variant. The old value only allowed to manage partitions of up to 256 MiB, this new value allows for up to 1 GiB (assuming 128 KiB erase block size). https://jira.digi.com/browse/DEL-4567 Signed-off-by: Jose Diaz de Grenu --- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index de42135e9..6c1d679fd 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -42,4 +42,4 @@ KERNEL_IMAGETYPE = "zImage" MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 127" # mkfs.ubifs parameters for rootfs partition -MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047" +MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191" From 4b7cf7cd2b341f7681ed41a1af0e8abfe6f52540 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 14 Jul 2017 18:05:46 +0200 Subject: [PATCH 19/43] hostapd: cosmetic, fix overlapped messages on stop When bringing down the wireless interface used for hostapd, the messages overlap: # ifdown wlan1 Stopping HOSTAP Daemon: stopped /usr/sbin/hostapd (pid 569) hostapd. Adding the 'quiet' option to start-stop-daemon command fixes the cosmetic issue. # ifdown wlan1 Stopping HOSTAP Daemon: hostapd. Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-connectivity/hostapd/hostapd/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-connectivity/hostapd/hostapd/init b/meta-digi-dey/recipes-connectivity/hostapd/hostapd/init index cfd6eee7b..6f5942c72 100644 --- a/meta-digi-dey/recipes-connectivity/hostapd/hostapd/init +++ b/meta-digi-dey/recipes-connectivity/hostapd/hostapd/init @@ -34,7 +34,7 @@ case "$1" in ;; stop) echo -n "Stopping $DESC: " - start-stop-daemon -K --oknodo -x $DAEMON -p ${PIDFILE} + start-stop-daemon -K --oknodo -q -x $DAEMON -p ${PIDFILE} echo "$NAME." ;; restart) From 13dae1c00a1c1340007daa8fb9552e2f7674b6bc Mon Sep 17 00:00:00 2001 From: Sebastian Pastor Date: Mon, 17 Jul 2017 23:15:57 +0200 Subject: [PATCH 20/43] mca_tool: update checksums for build 1.8 Signed-off-by: Sebastian Pastor --- .../recipes-digi/mca/{mca-tool_1.7.bb => mca-tool_1.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.7.bb => mca-tool_1.8.bb} (70%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.7.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.8.bb similarity index 70% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.7.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.8.bb index 7712c6270..98613709e 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.7.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.8.bb @@ -7,8 +7,8 @@ LICENSE = "CLOSED" PKGNAME = "mca_tool" SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "f44b2547333b2900477a8b89b58d08a1" -SRC_URI[sha256sum] = "9659f591438955eab27fda7092fe4ba1d6874c276a4bc6d70689f91dc4bdccd8" +SRC_URI[md5sum] = "8e1c164eae31cd1d2e6d0de2fb844ae8" +SRC_URI[sha256sum] = "947545e53c64d06d6f38fc24803dc61438c3a32277849b8ff2450f2213581ac3" S = "${WORKDIR}/${PKGNAME}-${PV}" From 6f0b8a735674678d9aae35d8df1dc979beeadb17 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 19 Jul 2017 08:51:28 +0200 Subject: [PATCH 21/43] kernel-module-qualcomm: reduce console log level to load wireless module At the point this script is running from udev (the system log is not yet available), so to avoid debug messages from qualcomm wireless module reduce the console log level. https://jira.digi.com/browse/DEL-4570 Signed-off-by: Arturo Buzarra --- .../kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh index 71d81f3d5..42a40c3b8 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh @@ -100,6 +100,9 @@ esac ) # Load the wireless module with the params defined in modprobe.d/qualcomm.conf +# and reduce the console log level to avoid debug messages at boot time +LOGLEVEL="$(sed -ne 's,^kernel.printk[^=]*=[[:blank:]]*\(.*\)$,\1,g;T;p' /etc/sysctl.conf 2>/dev/null)" +[ -n "${LOGLEVEL}" ] && sysctl -q -w kernel.printk="${LOGLEVEL}" modprobe wlan # Verify the interface is present From 9903deaef89c6005622bbd69e05eb96a751976ba Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 18 Jul 2017 17:01:09 +0200 Subject: [PATCH 22/43] core-image-base: do not install udev-cache As we are using kernel's DEVTMPFS, using udev-cache on top of it does not add much advantage. Disabling it has the extra advantage of avoiding writing the udev-cache tarball under '/etc' (which probably won't work on a read-only system). https://jira.digi.com/browse/DEL-3780 Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-core/images/core-image-base.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-dey/recipes-core/images/core-image-base.bbappend b/meta-digi-dey/recipes-core/images/core-image-base.bbappend index 3e3caad29..4263517ac 100644 --- a/meta-digi-dey/recipes-core/images/core-image-base.bbappend +++ b/meta-digi-dey/recipes-core/images/core-image-base.bbappend @@ -17,3 +17,6 @@ SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs" # Add our dey-image tweaks to the final image (like /etc/build info) inherit dey-image + +# Do not install udev-cache +BAD_RECOMMENDATIONS += "udev-cache" From 1ac992bf52238facf5e32a6b1dd45b6904219629 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 18 Jul 2017 17:04:54 +0200 Subject: [PATCH 23/43] dey: remove some default distro features The removed distro features are mostly corner cases, not widely used, and sometimes conflict with other packages serving the same purposes. For example: * '3g' only adds ofono for cellular support, while we are using ModemManager. * 'nfc' adds 'neard' the NFC daemon (which at the moment we don't support) * 'zeroconf' adds 'avahi' package, but we are using NetworkManager instead to manage the network interfaces. * 'nfs' adds 'rpcbind' server, which is not needed at all to have an NFS mounted rootfs. Needless to say that all those packages can be added to any image without having the distro features enabled, or if preferred, you can add the distro features back in the project's local.conf. https://jira.digi.com/browse/DEL-3780 Signed-off-by: Javier Viguera --- meta-digi-dey/conf/distro/dey.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 2c5c10fe4..8f6e963f1 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -24,6 +24,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DE # Removed DISTRO_FEATURES # 'wayland' -> not supported at the moment # 'ptest' -> fails to build QT5 toolchain +DISTRO_FEATURES_DEFAULT_remove = "3g nfc nfs zeroconf" POKY_DEFAULT_DISTRO_FEATURES_remove = "ptest wayland" GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d)}" From c5b39acce02a829151bafd52c609c7fe8066275d Mon Sep 17 00:00:00 2001 From: Sebastian Pastor Date: Wed, 19 Jul 2017 20:10:53 +0200 Subject: [PATCH 24/43] mca_tool: update checksums for build 1.9 Signed-off-by: Sebastian Pastor --- .../recipes-digi/mca/{mca-tool_1.8.bb => mca-tool_1.9.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.8.bb => mca-tool_1.9.bb} (70%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.8.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.9.bb similarity index 70% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.8.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.9.bb index 98613709e..f0371a72b 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.8.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.9.bb @@ -7,8 +7,8 @@ LICENSE = "CLOSED" PKGNAME = "mca_tool" SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "8e1c164eae31cd1d2e6d0de2fb844ae8" -SRC_URI[sha256sum] = "947545e53c64d06d6f38fc24803dc61438c3a32277849b8ff2450f2213581ac3" +SRC_URI[md5sum] = "3d954ceb361efa8325c9fae280c95775" +SRC_URI[sha256sum] = "874f02bc1ad7d1768879cff563888666c70691b12404a986af2e5743b3e3e628" S = "${WORKDIR}/${PKGNAME}-${PV}" From 6e2aafd95279c1806b2bf675d92adc46db00762f Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Wed, 19 Jul 2017 13:05:58 +0200 Subject: [PATCH 25/43] networkmanager: adjust compilation options Adjust the compilation time options to save space. https://jira.digi.com/browse/DEL-4577 Signed-off-by: Isaac Hermida --- .../networkmanager/networkmanager_1.0.12.bbappend | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend index 0ce3aa24c..f744aa2d4 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend @@ -14,13 +14,16 @@ SRC_URI += " \ file://nm.wlan0.static \ " -# 'polkit' and 'consolekit' require 'x11' distro feature, so disable them for non-X11 distros -DEPENDS_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'polkit', d)}" -PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'consolekit', d)}" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '--enable-polkit=disabled', d)}" +# 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So +# disable those compile time options to be able to build for framebuffer +# based images. +DEPENDS_remove = "polkit" +EXTRA_OECONF += "--enable-polkit=disabled" +PACKAGECONFIG_remove = "consolekit" -PACKAGECONFIG_remove = "dnsmasq netconfig" -PACKAGECONFIG_append = " concheck modemmanager ppp" +# Adjust other compile time options to save space +PACKAGECONFIG_remove = "dnsmasq netconfig nss" +PACKAGECONFIG_append = " concheck gnutls modemmanager ppp" # # NetworkManager only accepts IP addresses in CIDR format From 28867d77b9c1f48973c5433c71d883d66d47e507 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Thu, 20 Jul 2017 11:38:33 +0200 Subject: [PATCH 26/43] hostapd: remove 802.11d section After January 01, 2015, the FCC does not allow the use of 802.11d in US. https://www.ecfr.gov/cgi-bin/text-idx?SID=63ad9e61e7cc924b3199396521a61158&mc=true&tpl=/ecfrbrowse/Title47/47tab_02.tpl https://apps.fcc.gov/kdb/GetAttachment.html?id=5NjjaXsjV97%2BhlMWvZ1QRw%3D%3D https://jira.digi.com/browse/DEL-4291 https://jira.digi.com/browse/DEL-4630 Signed-off-by: Isaac Hermida --- .../hostapd/hostapd/ccimx6ul/hostapd_wlan1.conf | 4 ---- .../recipes-connectivity/hostapd/hostapd/hostapd_wlan0.conf | 4 ---- 2 files changed, 8 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/hostapd/hostapd/ccimx6ul/hostapd_wlan1.conf b/meta-digi-dey/recipes-connectivity/hostapd/hostapd/ccimx6ul/hostapd_wlan1.conf index 94e4895be..3d2e87d0d 100644 --- a/meta-digi-dey/recipes-connectivity/hostapd/hostapd/ccimx6ul/hostapd_wlan1.conf +++ b/meta-digi-dey/recipes-connectivity/hostapd/hostapd/ccimx6ul/hostapd_wlan1.conf @@ -16,7 +16,3 @@ hw_mode=a channel=36 ieee80211ac=1 ieee80211n=1 - -# IEEE 802.11d - Country Code -ieee80211d=1 -country_code=US diff --git a/meta-digi-dey/recipes-connectivity/hostapd/hostapd/hostapd_wlan0.conf b/meta-digi-dey/recipes-connectivity/hostapd/hostapd/hostapd_wlan0.conf index ba479d91b..570643ccd 100644 --- a/meta-digi-dey/recipes-connectivity/hostapd/hostapd/hostapd_wlan0.conf +++ b/meta-digi-dey/recipes-connectivity/hostapd/hostapd/hostapd_wlan0.conf @@ -16,7 +16,3 @@ hw_mode=a channel=36 ieee80211ac=1 ieee80211n=1 - -# IEEE 802.11d - Country Code -ieee80211d=1 -country_code=US From 2faf4ae7f4434333d3e2775beb67ee62c901108d Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Fri, 21 Jul 2017 13:39:20 +0200 Subject: [PATCH 27/43] networkmanager: do not manage any p2p interface For P2P interfaces, some drivers (CC6UL) create auxiliar interfaces based on the parent one, like p2p-p2p0-0. This commit adds a p2p* pattern to the list of unmanaged devices so that NetworkManager doesn't try to manage P2P devices. https://jira.digi.com/browse/DEL-4649 Signed-off-by: Isaac Hermida --- .../networkmanager/networkmanager/NetworkManager.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf index 6739bb39f..d26cfb567 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf @@ -6,4 +6,4 @@ no-auto-default=type:ethernet managed=false [keyfile] -unmanaged-devices=interface-name:p2p0;interface-name:wlan1 +unmanaged-devices=interface-name:p2p*;interface-name:wlan1 From e27257c53ff3653b9e775819675ff5e0af0effaa Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 24 Jul 2017 18:05:08 +0200 Subject: [PATCH 28/43] meta-digi: Include package required for QT creator target debugging. This commit includes the Python3-Json package that is required now by QT creator python scripts when debugging an application with GDB on the target. Signed-off-by: Mike Engel --- .../nativesdk-packagegroup-qt5-toolchain-host.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend diff --git a/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend new file mode 100644 index 000000000..629cb2af8 --- /dev/null +++ b/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend @@ -0,0 +1,3 @@ +# Copyright (C) 2017, Digi International Inc. + +RDEPENDS_${PN} += "nativesdk-python3-json" \ No newline at end of file From 1224d94de7f04d3e7de2a970e46683f3bd36e175 Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Mon, 24 Jul 2017 18:41:47 +0200 Subject: [PATCH 29/43] cryptoauthlib: change repository name The name of the repository in Github is fixed, because it is a fork from the original repository. Signed-off-by: Jose Diaz de Grenu --- meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index 9eef50f36..b837549f7 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 = "${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)}" +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}" @@ -27,4 +27,4 @@ do_install() { } PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ccimx6ul)" \ No newline at end of file +COMPATIBLE_MACHINE = "(ccimx6ul)" From 4db64ea56df385da313333380a86d2cf403a9382 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 25 Jul 2017 11:28:54 +0200 Subject: [PATCH 30/43] networkmanager: update package to version 1.8.2 Use the 1.8.x stable series, as it has some desired functionality (e.g. connectivity check) and bug fixes over the default version included in Yocto. https://jira.digi.com/browse/DEL-4628 Signed-off-by: Javier Viguera --- .../networkmanager/NetworkManager.conf | 1 + ....12.bbappend => networkmanager_%.bbappend} | 0 .../networkmanager/networkmanager_1.8.2.bb | 117 ++++++++++++++++++ 3 files changed, 118 insertions(+) rename meta-digi-dey/recipes-connectivity/networkmanager/{networkmanager_1.0.12.bbappend => networkmanager_%.bbappend} (100%) create mode 100644 meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf index d26cfb567..5fc954b04 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf @@ -1,6 +1,7 @@ [main] plugins=ifupdown,keyfile no-auto-default=type:ethernet +rc-manager=file [ifupdown] managed=false diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend similarity index 100% rename from meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend rename to meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb new file mode 100644 index 000000000..71aa184a5 --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb @@ -0,0 +1,117 @@ +SUMMARY = "NetworkManager is a network management framework" +DESCRIPTION = "NetworkManager is a system network service that manages \ +your network devices and connections, attempting to keep active network \ +connectivity when available." +HOMEPAGE = "http://www.gnome.org/projects/NetworkManager/" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ + file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ + file://docs/api/html/license.html;md5=eb0c003714e5391000fdfd9c9615cccf \ +" + +DEPENDS = " \ + intltool-native \ + libnl \ + dbus \ + dbus-glib \ + dbus-glib-native \ + libgudev \ + util-linux \ + libndp \ + libnewt \ + polkit \ + jansson \ + python3-pygobject-native \ +" + +inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection + +SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz" +SRC_URI[md5sum] = "1acf7a551905ae85d9987aadbb5f7205" +SRC_URI[sha256sum] = "71a5efcd9e4c237ab57b2893ccc8f91f884ace3bec0e2bd4b31a4c9677ff1bf4" + +S = "${WORKDIR}/NetworkManager-${PV}" + +PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wifi', '', d)} \ +" +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ + --without-systemdsystemunitdir, \ + polkit \ +" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,curl" +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" +# Use full featured dhcp client instead of internal one +PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" +PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" +PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-ifnet \ + --disable-ifcfg-suse \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ + --with-nmtui=yes \ + --with-udev-dir=${base_libdir}/udev \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" +} + +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-nmtui ${PN}-nmtui-doc ${PN}-adsl" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm-glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so \ + ${libdir}/NetworkManager/conf.d \ + ${libdir}/NetworkManager/VPN \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${base_libdir}/udev/* \ + ${systemd_unitdir}/system \ +" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ +" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +RRECOMMENDS_${PN} += "iptables ${@bb.utils.contains('PACKAGECONFIG', 'dnsmasq', 'dnsmasq', '', d)}" +RCONFLICTS_${PN} = "connman" + +SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" From e7a7138439fa8123b0e53934208b17fd450f73ac Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Tue, 25 Jul 2017 12:24:37 +0200 Subject: [PATCH 31/43] networkmanager: check the PPP connection These values configure the PPP daemon to check that the connection is still alive (using an echo) and kill itself otherwise. On that event, NetworkManager takes over and tries to restore the connection. This is specially useful for modems with only one serial port, because they are not able to signal the connectivity loss to the host (the only data channel is used for the network data itself). https://jira.digi.com/browse/DEL-4653 https://jira.digi.com/browse/DEL-4650 Signed-off-by: Jose Diaz de Grenu --- .../networkmanager/networkmanager/nm.cellular | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular index f052a2fbc..b282aba1e 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular @@ -9,5 +9,9 @@ password=##CELLULAR_PASSWORD## pin=##CELLULAR_PIN## username=##CELLULAR_USER## +[ppp] +lcp-echo-failure=3 +lcp-echo-interval=5 + [ipv6] method=ignore From ae6aa1ee251d61d521012fa8208ecc4d308677ff Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 25 Jul 2017 18:25:34 +0200 Subject: [PATCH 32/43] meta-digi-dey: cosmetic, add missing newlines at end of file Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-core/images/dey-image-tiny-initramfs.bb | 2 +- .../nativesdk-packagegroup-qt5-toolchain-host.bbappend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-core/images/dey-image-tiny-initramfs.bb b/meta-digi-dey/recipes-core/images/dey-image-tiny-initramfs.bb index 5219354ed..839265d23 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-tiny-initramfs.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-tiny-initramfs.bb @@ -8,4 +8,4 @@ include dey-image-tiny.bb export IMAGE_BASENAME = "dey-image-tiny-initramfs" IMAGE_FSTYPES = "cpio.gz.u-boot.tf" -inherit image_types_uboot \ No newline at end of file +inherit image_types_uboot diff --git a/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend index 629cb2af8..e93689ad3 100644 --- a/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend +++ b/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2017, Digi International Inc. -RDEPENDS_${PN} += "nativesdk-python3-json" \ No newline at end of file +RDEPENDS_${PN} += "nativesdk-python3-json" From 087f147b5d2e743b4d9b6cc68cf8e4a3411a1db7 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 26 Jul 2017 11:09:28 +0200 Subject: [PATCH 33/43] networkmanager: fix detection of slow initialization modems Some modems (e.g. the XBee Cellular LTE Cat 1) have a long initilization process and are not available when ModemManager tries to detect them on boot. For those modems schedule a rescan a bit later after NetworkManager has been launched, so they are detected properly. https://jira.digi.com/browse/DEL-4661 Signed-off-by: Javier Viguera --- .../networkmanager/networkmanager/networkmanager-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/networkmanager-init b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/networkmanager-init index 67ef4e86d..fc210ee47 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/networkmanager-init +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/networkmanager-init @@ -8,7 +8,7 @@ case "${1}" in start) mkdir -p /var/run/NetworkManager echo -n "Starting ${DESC}: " - ${DAEMON} + ${DAEMON} && (sleep 40 && mmcli --scan-modems 1>/dev/null 2>&1) & echo "done" ;; stop) From 7ae81a4cdba7cb6abe600d60d5b41f7e4027d171 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 26 Jul 2017 11:27:30 +0200 Subject: [PATCH 34/43] modemmanager: allow to identify Digi XBee Cellular modems Adding ID_MM_PHYSDEV_UID to the udev rule that manages the XBee Cellular modems, allows to identify them when using ModemManager CLI. Before: ~# mmcli -m 0 ------------------------- System | device: '/sys/devices/platform/soc/2100000.aips-bus/21e8000.serial' | drivers: 'imx-uart' | plugin: 'Telit' | primary port: 'ttymxc1' | ports: 'ttymxc1 (at)' ------------------------- After: ~# mmcli -m 0 ------------------------- System | device: 'Digi XBee Cellular' | drivers: 'imx-uart' | plugin: 'Telit' | primary port: 'ttymxc1' | ports: 'ttymxc1 (at)' ------------------------- Signed-off-by: Javier Viguera --- .../modemmanager/78-mm-digi-xbee-cellular.rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules index 6c23a015f..e3ddda0ec 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules @@ -4,10 +4,10 @@ ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" # baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. # ConnectCore 6 SBC -DEVPATH=="/devices/soc0/soc.0/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1" -DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1" +DEVPATH=="/devices/soc0/soc.0/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" +DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" # ConnectCore 6UL SBC Pro -DEVPATH=="/devices/platform/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1" +DEVPATH=="/devices/platform/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" LABEL="mm_digi_xbee_cellular_modem_end" From f3c59206679cc0cf7fba904a4864ef668ce8c453 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 26 Jul 2017 13:31:32 +0200 Subject: [PATCH 35/43] ppp: remove specific DNS scripts NetworkManager manages the 'resolv.conf' file globally, so there is no need for pppd specific scripts for DNS. These scripts race with NM to set DNS, leading sometimes to a scenario where you have ethernet as the default gateway, but with DNS only reachable via cellular. While on it, also remove not used 'mm_cellular' configuration file. Signed-off-by: Javier Viguera --- .../ppp/ppp-2.4.7/mm_cellular | 26 ------------------- .../ppp/ppp_2.4.7.bbappend | 12 ++++----- 2 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular diff --git a/meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular b/meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular deleted file mode 100644 index 8329abef5..000000000 --- a/meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular +++ /dev/null @@ -1,26 +0,0 @@ -# Assumes that your IP address is allocated dynamically by the ISP. -noipdefault - -# Try to get the name server addresses from the ISP. -usepeerdns - -# Use this connection as the default route. -defaultroute - -# Replace default route if already exists. -replacedefaultroute - -# Makes pppd "dial again" when the connection is lost. -persist - -# Do not ask the remote to authenticate. -noauth - -# Detach 'pppd' from its controlling terminal -updetach - -# Don't use the modem control lines -local - -# Lock the device to ensure exclusive access -lock diff --git a/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend b/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend index a2520ecb4..2e65f3da4 100644 --- a/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend +++ b/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" +# Copyright (C) 2017 Digi International Inc. -SRC_URI += "file://mm_cellular" - -do_install_append () { - mkdir -p ${D}${sysconfdir}/ppp/peers - install -m 0755 ${WORKDIR}/mm_cellular ${D}${sysconfdir}/ppp/peers/mm_cellular +do_install_append() { + # NetworkManager manages the 'resolv.conf' file globally, so + # remove the 'pppd' specific scripts for DNS. + rm -f ${D}${sysconfdir}/ppp/ip-up.d/08setupdns + rm -f ${D}${sysconfdir}/ppp/ip-down.d/92removedns } From 309d7d5b9911c8eed39d9a127539755fc5a009f7 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 25 Jul 2017 10:45:53 +0200 Subject: [PATCH 36/43] README: Update dey-2.2-r2 changelog Signed-off-by: Alex Gonzalez --- README.md | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f41a8521e..17830fb50 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ 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/90001514/default.htm#concept/yocto/c_get_started_with_yocto.htm)) * Digi ConnectCore 6UL SBC Pro @@ -64,13 +66,28 @@ Documentation is available online on the Digi documentation site: ## 2.2-r2 -* Digi Embedded Yocto - * Use NetworkManager for ethernet, wireless (station) and cellular network interfaces - * Updated kernel version to v4.1.41 for CC6 platform - * Added support for SPI Slave mode on CC6UL platform - * Added support for Atmel Cryptochip ATEC508A using Cryptoauthlib - * Added support for AWS Greengrass core software - * Support to connect to AWS IoT with AWS IoT Device SDK for embedded C. +* Use NetworkManager for ethernet, wireless (station) and cellular network interfaces +* Updated kernel version to v4.1.41 for CC6 platform +* Added support for SPI Slave mode on CC6UL platform +* Added support for Atmel Cryptochip ATEC508A using Cryptoauthlib +* Network failover mechanism +* Powered by AWS certified on all supported hardware platforms including: + * AWS GreenGrass core software + * AWS IoT Device SDK for embedded C +* Updated AR6233 firmware for Radio Equipment Directive module certification +* QCA6564 WorldWide board data file available on request +* Includes MCA firmware v1.0: + * MCA analog tamper detection + * MCA ADC-based analog comparators +* Updated U-Boot to version 2015.04-r9 + * Added support for CC6UL variant 0x4 + * Added dynamic environment location and bad block handling for the environment + * TrustFence: + * Move RootFS encryption key to 'safe' partition + * Added support for four tamper interfaces + * Disable external memory boot in OTP for secure boot + * Skip initial scanning of bad blocks for faster boot on NAND + * Updated documentation ## 2.2-r1 @@ -123,6 +140,7 @@ boot a signed U-Boot only. 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 From f83b5fcbe737c9e73441ac610cda3425c6c1924b Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 26 Jul 2017 17:00:20 +0200 Subject: [PATCH 37/43] busybox: refresh defconfig file for version 1.24 No applet has been enabled or disabled, just the defconfig file has been refreshed for the current busybox version 1.24.x Signed-off-by: Javier Viguera --- .../busybox/busybox-1.24.1/defconfig | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig index f54d2445d..a18382a6f 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.23.2 -# Fri Oct 23 17:59:44 2015 +# Busybox version: 1.24.1 +# Wed Jul 26 16:56:27 2017 # CONFIG_HAVE_DOT_CONFIG=y @@ -156,6 +156,7 @@ CONFIG_BZIP2=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 +# CONFIG_FEATURE_GZIP_LEVELS is not set # CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set # CONFIG_RPM is not set @@ -183,10 +184,17 @@ CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_FEATURE_DD_STATUS=y CONFIG_HOSTID=y CONFIG_ID=y CONFIG_GROUPS=y CONFIG_SHUF=y +CONFIG_SYNC=y +CONFIG_FEATURE_SYNC_FANCY=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y @@ -195,6 +203,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +CONFIG_TRUNCATE=y CONFIG_UNLINK=y CONFIG_BASE64=y CONFIG_WHO=y @@ -211,10 +220,6 @@ CONFIG_CKSUM=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_CUT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y @@ -283,7 +288,6 @@ CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y CONFIG_STTY=y CONFIG_SUM=y -CONFIG_SYNC=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -292,6 +296,7 @@ CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y +CONFIG_UNAME_OSNAME="GNU/Linux" CONFIG_UNEXPAND=y CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y CONFIG_UNIQ=y @@ -549,7 +554,18 @@ CONFIG_FEATURE_MDEV_RENAME=y CONFIG_FEATURE_MDEV_RENAME_REGEXP=y CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_FEATURE_MOUNT_OTHERTAB=y CONFIG_REV=y +CONFIG_UEVENT=y CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y CONFIG_BLKID=y @@ -595,15 +611,6 @@ CONFIG_LSUSB=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y # CONFIG_RDEV is not set @@ -660,10 +667,15 @@ CONFIG_CROND=y CONFIG_FEATURE_CROND_D=y # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_I2CGET=y +CONFIG_I2CSET=y +CONFIG_I2CDUMP=y +CONFIG_I2CDETECT=y CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_MARKS=y CONFIG_FEATURE_LESS_REGEXP=y CONFIG_FEATURE_LESS_WINCH=y @@ -758,6 +770,13 @@ CONFIG_NC_EXTRA=y CONFIG_PING=y CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_FEATURE_WGET_OPENSSL=y +CONFIG_FEATURE_WGET_SSL_HELPER=y CONFIG_WHOIS=y CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set @@ -819,6 +838,7 @@ CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y # CONFIG_FEATURE_IP_ADDRESS is not set # CONFIG_FEATURE_IP_LINK is not set # CONFIG_FEATURE_IP_ROUTE is not set +CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_FEATURE_IP_TUNNEL is not set # CONFIG_FEATURE_IP_RULE is not set # CONFIG_FEATURE_IP_SHORT_FORMS is not set @@ -885,11 +905,6 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" CONFIG_UDPSVD=y # CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_ZCIP=y # From 2a7bc3717ef358f80375e63f83bf004f51c44b90 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 26 Jul 2017 19:55:02 +0200 Subject: [PATCH 38/43] busybox: disable 'init' for IPK package type support Busybox's init enabled at build time collide with 'sysvinit' package. This does not seem a problem when using RPM package manager, but using IPK instead, the build is broken at image creation time: Collected errors: * check_data_file_clashes: Package sysvinit wants to install file <...>/rcS But that file is already provided by package * busybox https://jira.digi.com/browse/DEL-4573 Signed-off-by: Javier Viguera --- .../busybox/busybox-1.24.1/defconfig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig index a18382a6f..0d7883385 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig @@ -449,18 +449,18 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_CALL_TELINIT=y +CONFIG_TELINIT_PATH="/sbin/telinit" +# CONFIG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set From f8972e610dcb05d6effdd1bef9e4e6f3f3a343b1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 27 Jul 2017 12:14:59 +0200 Subject: [PATCH 39/43] README.md: fix markdown not correctly rendered in GitHub Signed-off-by: Javier Viguera --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 17830fb50..7c7ec5cc9 100644 --- a/README.md +++ b/README.md @@ -174,5 +174,5 @@ When you contact Digi Technical Support, include important system details and device information to help Digi resolve the issue more quickly. 1. In the device, run the command 'sysinfo'. This generates the following file: - /tmp/.txt.gz. -2. Attach the .txt.gz file to your support ticket. + /tmp/<current timestamp>.txt.gz. +2. Attach the <current timestamp>.txt.gz file to your support ticket. From 071339a1d4be49f46808bc92aa544c44863c5c30 Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Thu, 27 Jul 2017 13:23:46 +0200 Subject: [PATCH 40/43] networkmanager: disable MAC spoofing for scanning https://jira.digi.com/browse/DEL-4681 Signed-off-by: Jose Diaz de Grenu --- .../networkmanager/networkmanager/NetworkManager.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf index 5fc954b04..10810a323 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf @@ -8,3 +8,6 @@ managed=false [keyfile] unmanaged-devices=interface-name:p2p*;interface-name:wlan1 + +[device] +wifi.scan-rand-mac-address=no From b421fb7995a984ae648a176c478370da91c50d3f Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 27 Jul 2017 14:05:29 +0200 Subject: [PATCH 41/43] qualcomm: generalize log function to pass the log level We need to pass different log levels depending on the message, so they appear in the console, so generalize the 'log' function. https://jira.digi.com/browse/DEL-4682 Signed-off-by: Javier Viguera --- .../kernel-module-qualcomm/qualcomm.sh | 19 ++++++++++--------- .../init-ifupdown-1.0/ccimx6ul/virtwlans.sh | 3 +-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh index 42a40c3b8..64812873a 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh @@ -18,7 +18,7 @@ # At this point of the boot (udev script), the system log (syslog) is not # available yet, so use the kernel log buffer from userspace. log() { - printf "<5>qca6564: $1\n" >/dev/kmsg + printf "<$1>qca6564: $2\n" >/dev/kmsg } # Do nothing if the module is already loaded @@ -60,7 +60,7 @@ case "${DTB_REGION_CODE}" in REGULATORY_DOMAIN="${DTB_REGION_CODE}";; *) if [ -n "${DTB_REGION_CODE}" ]; then - log "[WARN] Invalid region code in device tree, using OTP value" + log "5" "[WARN] Invalid region code in device tree, using OTP value" fi REGULATORY_DOMAIN="${OTP_REGION_CODE}";; esac @@ -74,19 +74,19 @@ esac BDATA_SOURCE="bdwlan30_US.bin" case "${REGULATORY_DOMAIN}" in ${US_CODE}) - log "Setting US wireless region";; + log "5" "Setting US wireless region";; ${WW_CODE}|${JP_CODE}) if [ -f "bdwlan30_World.bin" ]; then - log "Setting WW (world wide) wireless region" + log "5" "Setting WW (world wide) wireless region" BDATA_SOURCE="bdwlan30_World.bin" else - log "[WARN] No WW (worldwide) board data file, using US" + log "5" "[WARN] No WW (worldwide) board data file, using US" fi ;; "") - log "[WARN] region code not found, using US";; + log "5" "[WARN] region code not found, using US";; *) - log "[WARN] Invalid region code, using US";; + log "5" "[WARN] Invalid region code, using US";; esac # We don't want to rewrite NAND every time we boot so only @@ -108,7 +108,8 @@ modprobe wlan # Verify the interface is present if [ -d "/sys/class/net/wlan0" ]; then # Create 'wlan1' virtual interface - virtwlans.sh + VIRTWLANS_OUT="$(virtwlans.sh)" + [ -n "${VIRTWLANS_OUT}" ] && log "3" "${VIRTWLANS_OUT}" else - log "[ERROR] Loading qca6564 module" + log "3" "[ERROR] Loading qca6564 module" fi diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/virtwlans.sh b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/virtwlans.sh index 600cad8c0..304c09fc5 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/virtwlans.sh +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/virtwlans.sh @@ -21,8 +21,7 @@ if [ -s "/proc/device-tree/wireless/mac-address1" ] && [ -s "/proc/device-tree/wireless/mac-address3" ]; then : else - echo "WARNING: Using default MAC addresses for virtual interfaces, please " - echo "program them referring to the Digi U-Boot Documentation" + echo "[WARN] Using default MAC addresses for virtual interfaces, please program them referring to the Digi U-Boot Documentation" fi if [ ! -d "/sys/class/net/wlan1" ]; then From 258c7097a8d03dd32e2339fac36cf15044edaee1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 27 Jul 2017 17:49:40 +0200 Subject: [PATCH 42/43] README.md: fix links to online documentation Signed-off-by: Javier Viguera --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7c7ec5cc9..379a9e32e 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ Software for the following hardware platforms is in production support: * [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/90001514/default.htm#concept/yocto/c_get_started_with_yocto.htm)) + * [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/90001515/default.htm#concept/yocto/c_get_started_with_yocto.htm)) + * [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)) * Digi ConnectCore 6 * [Digi P/N CC-WMX-J97C-TN](http://www.digi.com/products/models/cc-wmx-j97c-tn) @@ -39,7 +39,7 @@ Software for the following hardware platforms is in production support: * 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](http://www.digi.com/resources/documentation/digidocs/90001945-13/default.htm#concept/yocto/c_get_started_with_yocto.htm%3FTocPath%3DDigi%2520Embedded%2520Yocto%7CGet%2520started%7C_____0)) + * [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) From 2c4c4dff4a220ba315b85fafc38fffe0223d233f Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 27 Jul 2017 18:10:28 +0200 Subject: [PATCH 43/43] meta-digi: update revisions for dey-2.2-r2.2 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 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..40c8a1533 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 = "eaa1199a097217aa619817654e022f2605c45be6" 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..8c7128789 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 = "f1a146c22d8c4e82ab8f3c51bf7efffa7653c458" 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"