From b74a8cee54bbffd3e5ceb61f7e937a138727f946 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 29 Oct 2020 09:56:55 +0100 Subject: [PATCH 01/24] u-boot: boot script: allow to disable Wi-Fi/BT overlays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check a U-Boot env variable (disable_wifi/disable_bt) for easily disabling Wi-Fi and/or Bluetooth overlays. Signed-off-by: Hector Palacios รง https://jira.digi.com/browse/DEL-7297 --- .../recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt | 4 ++-- .../u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt | 4 ++-- .../recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt index 413f0e3f5..78414f805 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt @@ -24,11 +24,11 @@ if test -n "${module_ram}"; then setexpr module_has_bt ${hwid_2} \& 20000 setexpr module_has_bt ${module_has_bt} / 20000 - if test "${module_has_bt}" = "1"; then + if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then setenv overlays _ov_som_bt_ccimx8mn.dtbo,${overlays} fi - if test "${module_has_wifi}" = "1"; then + if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then setenv overlays _ov_som_wifi_ccimx8mn.dtbo,${overlays} fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt index 875d874de..278914bcd 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt @@ -20,11 +20,11 @@ if test -n "${module_ram}"; then setexpr module_has_bt ${hwid_3} \& 2 setexpr module_has_bt ${module_has_bt} / 2 - if test "${module_has_bt}" = "1"; then + if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays} fi - if test "${module_has_wifi}" = "1"; then + if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays} fi else diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt index eb6de7f06..481c8cc2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt @@ -20,11 +20,11 @@ if test -n "${module_ram}"; then setexpr module_has_bt ${hwid_3} \& 2 setexpr module_has_bt ${module_has_bt} / 2 - if test "${module_has_bt}" = "1"; then + if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays} fi - if test "${module_has_wifi}" = "1"; then + if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays} fi else From 3041f3a2f7468811731fda28c4582417864fd716 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 16 Nov 2020 10:00:28 +0100 Subject: [PATCH 02/24] u-boot-dey: ccimx6ulstarter: fix typo in installer script Signed-off-by: Mike Engel --- .../u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt index 7c009c37d..c896fffc6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt @@ -21,7 +21,7 @@ fi # Determine U-Boot file to program basing on module variant if test -n "${module_variant}"; then - if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a; then + if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter.imx; elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter1GB.imx; From 0c44a150d0403856c9b66569dc2d8e449f219188 Mon Sep 17 00:00:00 2001 From: Francisco Gil Martinez Date: Fri, 20 Nov 2020 11:43:23 +0100 Subject: [PATCH 03/24] ccimx8x: add dt overlay for pcie modems Signed-off-by: Francisco Gil Martinez --- meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 3fb369cdc..29296580b 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -21,6 +21,7 @@ KERNEL_DEVICETREE ?= " \ digi/_ov_board_lvds1_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_parallel-camera_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_pcie-card_ccimx8x-sbc-pro.dtbo \ + digi/_ov_board_pcie-modem_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_v1-v3_ccimx8x-sbc-pro.dtbo \ digi/_ov_som_bt_ccimx8x.dtbo \ digi/_ov_som_mca-keypad_ccimx8x.dtbo \ From a95b3ad60252f636dea9edca8d83fed34d5a67a7 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 16 Dec 2020 14:26:17 +0100 Subject: [PATCH 04/24] trustfence-cst: build CST using libcrypto from SDK CST was being built linking to the openssl libcrypto library from the host. When the openssl version in the host didn't match the version in the SDK, the SDK build failed like this: Error: Problem 1: package nativesdk-packagegroup-sdk-host-1.0-r12.0.x86_64_nativesdk requires nativesdk-trustfence-cst, but none of the providers can be installed - conflicting requests - nothing provides libcrypto.so.1.0.0()(64bit) needed by nativesdk-trustfence-cst-3.3.1-r0.0.x86_64_nativesdk - nothing provides libcrypto.so.1.0.0(OPENSSL_1.0.0)(64bit) needed by nativesdk-trustfence-cst-3.3.1-r0.0.x86_64_nativesdk - nothing provides libcrypto.so.1.0.0(OPENSSL_1.0.1)(64bit) needed by nativesdk-trustfence-cst-3.3.1-r0.0.x86_64_nativesdk Problem 2: package nativesdk-packagegroup-qt5-toolchain-host-1.0-r0.0.x86_64_nativesdk requires nativesdk-packagegroup-sdk-host, but none of the providers can be installed - package nativesdk-packagegroup-sdk-host-1.0-r12.0.x86_64_nativesdk requires nativesdk-trustfence-cst, but none of the providers can be installed - conflicting requests - nothing provides libcrypto.so.1.0.0()(64bit) needed by nativesdk-trustfence-cst-3.3.1-r0.0.x86_64_nativesdk - nothing provides libcrypto.so.1.0.0(OPENSSL_1.0.0)(64bit) needed by nativesdk-trustfence-cst-3.3.1-r0.0.x86_64_nativesdk - nothing provides libcrypto.so.1.0.0(OPENSSL_1.0.1)(64bit) needed by nativesdk-trustfence-cst-3.3.1-r0.0.x86_64_nativesdk Fix that by adding the native dependencies include and lib folders to the CST build. Also add openssl-native as a dependency for the SDK build, otherwise it wont link to the SDK libcrypto library. Additionally, to allow running CST in a host machine where the openssl version does not match the version in the SDK, libcrypto library is statically linked. https://jira.digi.com/browse/DEL-7346 Signed-off-by: Gonzalo Ruiz --- .../trustfence-cst/trustfence-cst.inc | 7 ++++- ...7-Makefile-statically-link-libcrypto.patch | 27 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst/0007-Makefile-statically-link-libcrypto.patch diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc index dae46cd48..e7e038103 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc @@ -10,7 +10,9 @@ DEPENDS = "openssl byacc flex" # Explicitly add byacc-native as a dependency when building the package for the # SDK, otherwise, it won't get installed in the sysroot, causing a compilation # error. -DEPENDS_append_class-nativesdk = " byacc-native" +# Explicitly add openssl-native for the SDK build to correctly link to the +# openssl libraries in the native dependencies folder. +DEPENDS_append_class-nativesdk = " byacc-native openssl-native" SRC_URI = " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'file://cst-${PV}.tgz', '', d)} \ @@ -20,6 +22,7 @@ SRC_URI = " \ file://0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch \ file://0005-ahab_pki_tree.sh-automate-script.patch \ file://0006-ahab_pki_tree.sh-use-a-random-password-for-the-defau.patch \ + file://0007-Makefile-statically-link-libcrypto.patch \ " # Usually local files (with file:// protocol) are not checked for @@ -36,6 +39,8 @@ python() { S = "${WORKDIR}/cst-${PV}/" do_compile() { + export LDLIBPATH=-L${WORKDIR}/recipe-sysroot-native/usr/lib + export COPTIONS=-I${WORKDIR}/recipe-sysroot-native/usr/include cd ${S}/code/cst oe_runmake OSTYPE=linux64 clean oe_runmake OSTYPE=linux64 rel_bin diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst/0007-Makefile-statically-link-libcrypto.patch b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst/0007-Makefile-statically-link-libcrypto.patch new file mode 100644 index 000000000..8cdde4006 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst/0007-Makefile-statically-link-libcrypto.patch @@ -0,0 +1,27 @@ +From: Gonzalo Ruiz +Date: Tue, 15 Dec 2020 17:01:45 +0100 +Subject: [PATCH] Makefile: statically link libcrypto + +Statically link libcrypto so the host machine does not require to have +installed the same openssl version that was used to build the binaries. + +This requires dynamically linking the libpthread and libdl libraries. + +Signed-off-by: Gonzalo Ruiz +--- + code/cst/code/build/make/gcc.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/code/cst/code/build/make/gcc.mk b/code/cst/code/build/make/gcc.mk +index 0394f5a..cc57f6b 100755 +--- a/code/cst/code/build/make/gcc.mk ++++ b/code/cst/code/build/make/gcc.mk +@@ -28,7 +28,7 @@ COPTIONS += -std=c99 -D_POSIX_C_SOURCE=200809L -Wall -Werror -pedantic -fPIC -g + #============================================================================== + LDOPTIONS += -g + +-LDLIBS := -lcrypto ++LDLIBS := -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -lpthread -ldl + + # Archiver flags + #============================================================================== From abacf26dab566f74c4def7d04607271cea5e04d3 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 21 Dec 2020 14:04:17 +0100 Subject: [PATCH 05/24] machine: ccimx8x-sbc-express: build 512MB 16bit U-Boot This machine was not building the 512MB 16bit U-Boot. While on it, and for consistency, re-order to make the 2GB 32bit the default (same as the SBC Pro), since the SBC Express was discontinued as a product. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-7363 --- meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index c2599b41d..5aba0390b 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -7,9 +7,10 @@ include conf/machine/include/ccimx8x.inc # U-Boot configurations # Last one is the default (the one the symlinks point at) -UBOOT_CONFIG ??= "ccimx8x_sbc_express2GB ccimx8x_sbc_express1GB" +UBOOT_CONFIG ??= "ccimx8x_sbc_express512MB ccimx8x_sbc_express1GB ccimx8x_sbc_express2GB" UBOOT_CONFIG[ccimx8x_sbc_express2GB] = "ccimx8x_sbc_express2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" +UBOOT_CONFIG[ccimx8x_sbc_express512MB] = "ccimx8x_sbc_express512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" KERNEL_DEVICETREE ?= " \ digi/ccimx8x-sbc-express.dtb \ From 2caec3176a43f4a706d72b8bef6615f05ae75d8d Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 21 Dec 2020 14:06:28 +0100 Subject: [PATCH 06/24] ccimx8x: update install script with selected U-Boot for variants CC8X SOMs code the RAM size on the OTP bits so this fall-back table shouldn't be necessary, but update it with latest variants just in case. Signed-off-by: Hector Palacios --- .../ccimx8x-sbc-express/install_linux_fw_sd.txt | 14 ++++++++++++++ .../ccimx8x-sbc-pro/install_linux_fw_sd.txt | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt index 602b5f84c..aff2f0fb2 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt @@ -50,6 +50,18 @@ else setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x05"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; + elif test "${module_variant}" = "0x06"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x07"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x08"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x09"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x0A"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; + elif test "${module_variant}" = "0x0B"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; fi fi fi @@ -69,6 +81,8 @@ else echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-2GB_32bit.bin"; echo " - For a DualX CPU with 1GB LPDDR4, run:"; echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin"; + echo " - For a DualX CPU with 512MB LPDDR4, run:"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-512MB_16bit.bin"; echo ""; echo "2. Run the install script again."; echo ""; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt index f5f4d3365..9a52749a4 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt @@ -52,6 +52,16 @@ else setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x06"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x07"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x08"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x09"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x0A"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; + elif test "${module_variant}" = "0x0B"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; fi fi fi From ae012f7069a5382e295e65fb0b90ed629b48df7e Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 28 Dec 2020 14:54:38 +0100 Subject: [PATCH 07/24] ccimx8x: update USB install script with selected U-Boot for variants A similar change was done in the dey-3.0/maint branch for the uSD installation scripts, but since USB scripts were added in dey-3.0/master, apply the same to them as well. Signed-off-by: Gabriel Valcazar --- .../ccimx8x-sbc-express/install_linux_fw_usb.txt | 12 ++++++++++++ .../ccimx8x-sbc-pro/install_linux_fw_usb.txt | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt index 06c2d0cdb..4b14444fe 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt @@ -50,6 +50,18 @@ else setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x05"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; + elif test "${module_variant}" = "0x06"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x07"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x08"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x09"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x0A"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; + elif test "${module_variant}" = "0x0B"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; fi fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt index 6ee27817a..b13687ecc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt @@ -52,6 +52,16 @@ else setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x06"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x07"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x08"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin; + elif test "${module_variant}" = "0x09"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512MB_16bit.bin; + elif test "${module_variant}" = "0x0A"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; + elif test "${module_variant}" = "0x0B"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; fi fi fi From 52335e8ed54b7f0fa2b12da30a6ebd05f580b59e Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 17 Dec 2020 11:22:28 +0100 Subject: [PATCH 08/24] sdk: build.sh: remove dey-image-webkit from all default build target lists The buildserver uses this default value when building framebuffer images. Since the WebKit is not yet compatible with framebuffer images, the builds fail. Remove dey-image-webkit from the default target lists. Signed-off-by: Gabriel Valcazar --- sdk/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/build.sh b/sdk/build.sh index 538dc0927..8b7ff28b2 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -174,11 +174,11 @@ while read _pl _var _tgt; do eval "${_pl//-/_}_var=\"${_var//,/ }\"" eval "${_pl//-/_}_tgt=\"${_tgt//,/ }\"" done<<-_EOF_ - ccimx8mn-dvk DONTBUILDVARIANTS dey-image-qt,dey-image-webkit,dey-image-aws - ccimx8x-sbc-pro DONTBUILDVARIANTS dey-image-qt,dey-image-webkit,dey-image-aws - ccimx8x-sbc-express DONTBUILDVARIANTS dey-image-qt,dey-image-webkit,dey-image-aws - ccimx6qpsbc DONTBUILDVARIANTS dey-image-qt,dey-image-webkit,dey-image-aws - ccimx6sbc DONTBUILDVARIANTS dey-image-qt,dey-image-webkit,dey-image-aws + ccimx8mn-dvk DONTBUILDVARIANTS dey-image-qt,dey-image-aws + ccimx8x-sbc-pro DONTBUILDVARIANTS dey-image-qt,dey-image-aws + ccimx8x-sbc-express DONTBUILDVARIANTS dey-image-qt,dey-image-aws + ccimx6qpsbc DONTBUILDVARIANTS dey-image-qt,dey-image-aws + 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 From c124a019a430c63bbc511e69bcd2eddb126eea10 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 4 Jan 2021 12:49:19 +0100 Subject: [PATCH 09/24] imx-boot: remove "sync" call in the ccimx8mn's do_compile() function This command isn't essential and might not be available on all systems, so remove it. Use the "oflag=sync" dd parameter instead. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index 92ac322b1..db851ca82 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -72,7 +72,7 @@ maintain a custom recipe." cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin # Create dummy DEK blob if [ "${TRUSTFENCE_DEK_PATH}" != "0" ]; then - dd if=/dev/zero of=${BOOT_STAGING}/dek_blob_fit_dummy.bin bs=96 count=1 && sync + dd if=/dev/zero of=${BOOT_STAGING}/dek_blob_fit_dummy.bin bs=96 count=1 oflag=sync fi } From 1e5cafeb7945401794765ef55ccf89f95ba3361c Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 7 Jan 2021 12:33:30 +0100 Subject: [PATCH 10/24] uboot: update fw install scripts to remove source fs from commands The 'source file system' was removed as an argument from the 'update' command in U-Boot v2020.04. For platforms using such version, remove it from the update fw scripts. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DUB-983 --- .../u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt | 12 ++++++++---- .../u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt | 12 ++++++++---- .../ccimx6ulstarter/install_linux_fw_sd.txt | 12 ++++++++---- .../ccimx6ulstarter/install_linux_fw_usb.txt | 12 ++++++++---- .../u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt | 12 ++++++++---- .../u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt | 12 ++++++++---- .../ccimx8x-sbc-express/install_linux_fw_sd.txt | 12 ++++++++---- .../ccimx8x-sbc-express/install_linux_fw_usb.txt | 12 ++++++++---- .../ccimx8x-sbc-pro/install_linux_fw_sd.txt | 12 ++++++++---- .../ccimx8x-sbc-pro/install_linux_fw_usb.txt | 12 ++++++++---- 10 files changed, 80 insertions(+), 40 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt index 29a729932..91ee9db95 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt @@ -82,7 +82,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -107,7 +111,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part linux; - update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -120,7 +124,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part recovery; - update recovery mmc ${INSTALL_MMCDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -133,7 +137,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part rootfs; - update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt index f55c8de92..ad510b9ab 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt @@ -82,7 +82,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot usb ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -108,7 +112,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part linux; - update linux usb ${INSTALL_USBDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -121,7 +125,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part recovery; - update recovery usb ${INSTALL_USBDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -134,7 +138,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part rootfs; - update rootfs usb ${INSTALL_USBDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt index c896fffc6..8cee2a0e4 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt @@ -82,7 +82,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -107,7 +111,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part linux; - update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -120,7 +124,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part recovery; - update recovery mmc ${INSTALL_MMCDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -133,7 +137,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part rootfs; - update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt index 8df1b0a20..23978ea81 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt @@ -82,7 +82,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot usb ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -108,7 +112,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part linux; - update linux usb ${INSTALL_USBDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -121,7 +125,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part recovery; - update recovery usb ${INSTALL_USBDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -134,7 +138,7 @@ setenv bootcmd " echo \"\"; echo \"\"; nand erase.part rootfs; - update rootfs usb ${INSTALL_USBDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt index b662264ff..72a9df115 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt @@ -53,7 +53,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -93,7 +97,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -105,7 +109,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - update recovery mmc ${INSTALL_MMCDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -117,7 +121,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt index 1bc47ae82..406e884e5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt @@ -53,7 +53,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot usb ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -94,7 +98,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - update linux usb ${INSTALL_USBDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -106,7 +110,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - update recovery usb ${INSTALL_USBDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -118,7 +122,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - update rootfs usb ${INSTALL_USBDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt index aff2f0fb2..158ec7d46 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt @@ -124,7 +124,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -164,7 +168,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -176,7 +180,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - update recovery mmc ${INSTALL_MMCDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -188,7 +192,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt index 4b14444fe..4f4903cc5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt @@ -122,7 +122,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot usb ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -163,7 +167,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - update linux usb ${INSTALL_USBDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -175,7 +179,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - update recovery usb ${INSTALL_USBDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -187,7 +191,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - update rootfs usb ${INSTALL_USBDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt index 9a52749a4..ea90967d8 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt @@ -124,7 +124,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -164,7 +168,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -176,7 +180,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - update recovery mmc ${INSTALL_MMCDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -188,7 +192,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt index b13687ecc..110a9c252 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt @@ -124,7 +124,11 @@ echo "" echo ">> Installing U-Boot boot loader (target will reset)" echo "" echo "" -update uboot usb ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} +if test $? -eq 1; then + # Use old-style update with source file system argument + update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} +fi if test $? -eq 1; then echo "[ERROR] Failed to update U-Boot boot loader!"; echo ""; @@ -165,7 +169,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - update linux usb ${INSTALL_USBDEV} fat ${INSTALL_LINUX_FILENAME}; + update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; @@ -177,7 +181,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - update recovery usb ${INSTALL_USBDEV} fat ${INSTALL_RECOVERY_FILENAME}; + update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; echo \"\"; @@ -189,7 +193,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - update rootfs usb ${INSTALL_USBDEV} fat ${INSTALL_ROOTFS_FILENAME}; + update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; echo \"\"; From 6c7bd330a466e583f8fd921696b549c2f23fde27 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 5 Jan 2021 09:22:22 +0100 Subject: [PATCH 11/24] trustfence-sign-artifact: add support for ccimx8x encryption Add support to sign and encrypt OS artifacts for AHAB devices. https://jira.digi.com/browse/DEL-7371 Signed-off-by: Arturo Buzarra --- .../trustfence-sign-tools/encrypt_ahab | 29 +++++++ .../trustfence-sign-artifact.sh | 76 +++++++++++-------- .../trustfence/trustfence-sign-tools_git.bb | 4 +- 3 files changed, 75 insertions(+), 34 deletions(-) create mode 100644 meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab new file mode 100644 index 000000000..9e40c7e3a --- /dev/null +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab @@ -0,0 +1,29 @@ +# The syntax for this file is documented in the AHAB Code Signing Tool +# User's Guide which is included in the CST package distributed by NXP +[Header] + Target = AHAB + Version = 1.0 + +[Install SRK] + # SRK table generated by srktool + File = "%srk_table%" + # Public key certificate in PEM format + Source = "%cert_img%" + # Index of the public key certificate within the SRK table (0 .. 3) + Source index = %key_index% + # Type of SRK set (NXP or OEM) + Source set = OEM + # bitmask of the revoked SRKs + Revocations = 0x%key_index% + +[Authenticate Data] + # Binary to be signed generated by mkimage + File = "%kernel-img%" + # Offsets = Container header Signature block (printed out by mkimage) + Offsets = %container_offset% %block_offset% + +[Install Secret Key] + Key = "%dek_path%" + Key Length = %dek_len% + #Key Identifier = 0x1234CAFE + Image Indexes = 0xFFFFFFFF diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 1d4247756..45e1b1b26 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -3,7 +3,7 @@ # # trustfence-sign-artifact.sh # -# Copyright (C) 2016-2020 by Digi International Inc. +# Copyright (C) 2016-2021 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -122,29 +122,31 @@ if [ -z "${CONFIG_RAM_START}" ]; then exit 1 fi +# Get DEK key +if [ -n "${CONFIG_DEK_PATH}" ]; then + if [ ! -f "${CONFIG_DEK_PATH}" ]; then + if [ "${PLATFORM}" = "ccimx8mn" ]; then + echo "DEK not found. Generating random 128 bit DEK." + [ -d $(dirname ${CONFIG_DEK_PATH}) ] || mkdir -p $(dirname ${CONFIG_DEK_PATH}) + dd if=/dev/urandom of="${CONFIG_DEK_PATH}" bs=16 count=1 >/dev/null 2>&1 + else + echo "DEK not found. Generating random 256 bit DEK." + [ -d $(dirname ${CONFIG_DEK_PATH}) ] || mkdir -p $(dirname ${CONFIG_DEK_PATH}) + dd if=/dev/urandom of="${CONFIG_DEK_PATH}" bs=32 count=1 >/dev/null 2>&1 + fi + fi + dek_size="$((8 * $(stat -L -c %s ${CONFIG_DEK_PATH})))" + if [ "${dek_size}" != "128" ] && [ "${dek_size}" != "192" ] && [ "${dek_size}" != "256" ]; then + echo "Invalid DEK size: ${dek_size} bits. Valid sizes are 128, 192 and 256 bits" + exit 1 + fi + ENCRYPT="true" +fi + if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then # Negative offset with respect to CONFIG_RAM_START in which U-Boot # copies the DEK blob. DEK_BLOB_OFFSET="0x100" - if [ -n "${CONFIG_DEK_PATH}" ]; then - if [ ! -f "${CONFIG_DEK_PATH}" ]; then - if [ "${PLATFORM}" = "ccimx8mn" ]; then - echo "DEK not found. Generating random 128 bit DEK." - [ -d $(dirname ${CONFIG_DEK_PATH}) ] || mkdir -p $(dirname ${CONFIG_DEK_PATH}) - dd if=/dev/urandom of="${CONFIG_DEK_PATH}" bs=16 count=1 >/dev/null 2>&1 - else - echo "DEK not found. Generating random 256 bit DEK." - [ -d $(dirname ${CONFIG_DEK_PATH}) ] || mkdir -p $(dirname ${CONFIG_DEK_PATH}) - dd if=/dev/urandom of="${CONFIG_DEK_PATH}" bs=32 count=1 >/dev/null 2>&1 - fi - fi - dek_size="$((8 * $(stat -L -c %s ${CONFIG_DEK_PATH})))" - if [ "${dek_size}" != "128" ] && [ "${dek_size}" != "192" ] && [ "${dek_size}" != "256" ]; then - echo "Invalid DEK size: ${dek_size} bits. Valid sizes are 128, 192 and 256 bits" - exit 1 - fi - ENCRYPT="true" - fi fi # Default values @@ -280,7 +282,7 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then -e "s,%key_index%,${CONFIG_KEY_INDEX},g" \ "${SCRIPT_PATH}/csf_templates/sign_hab" > csf_descriptor fi -else +elif [ "${CONFIG_SIGN_MODE}" = "AHAB" ]; then # Other constants KERNEL_START_OFFSET="0x0" KERNEL_SIG_BLOCK_OFFSET="0x90" @@ -299,17 +301,25 @@ else SRK_CERT_KEY_IMG="$(echo ${CONFIG_SIGN_KEYS_PATH}/crts/SRK${CONFIG_KEY_INDEX_1}*crt.pem | sed s/\ /\,/g)" - sed -e "s,%srk_table%,${SRK_TABLE},g" \ - -e "s,%cert_img%,${SRK_CERT_KEY_IMG},g" \ - -e "s,%kernel-img%,${KERNEL_NAME},g" \ - -e "s,%key_index%,${CONFIG_KEY_INDEX},g" \ - -e "s,%container_offset%,${container_header_offset},g" \ - -e "s,%block_offset%,${signature_block_offset},g" \ - "${SCRIPT_PATH}/csf_templates/sign_ahab" > csf_descriptor - + # Generate actual CSF descriptor file from template if [ "${ENCRYPT}" = "true" ]; then - echo "[ERROR] Environment encryption is not supported." - exit 1 + sed -e "s,%srk_table%,${SRK_TABLE},g" \ + -e "s,%cert_img%,${SRK_CERT_KEY_IMG},g" \ + -e "s,%kernel-img%,${KERNEL_NAME},g" \ + -e "s,%key_index%,${CONFIG_KEY_INDEX},g" \ + -e "s,%container_offset%,${container_header_offset},g" \ + -e "s,%block_offset%,${signature_block_offset},g" \ + -e "s,%dek_path%,${CONFIG_DEK_PATH},g" \ + -e "s,%dek_len%,${dek_size},g" \ + "${SCRIPT_PATH}/csf_templates/encrypt_ahab" > csf_descriptor + else + sed -e "s,%srk_table%,${SRK_TABLE},g" \ + -e "s,%cert_img%,${SRK_CERT_KEY_IMG},g" \ + -e "s,%kernel-img%,${KERNEL_NAME},g" \ + -e "s,%key_index%,${CONFIG_KEY_INDEX},g" \ + -e "s,%container_offset%,${container_header_offset},g" \ + -e "s,%block_offset%,${signature_block_offset},g" \ + "${SCRIPT_PATH}/csf_templates/sign_ahab" > csf_descriptor fi fi @@ -350,8 +360,8 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then cat csf.bin >> "${TARGET}" objcopy -I binary -O binary --pad-to "${sig_len}" --gap-fill="${GAP_FILLER}" "${TARGET}" -else - # Sign the image +elif [ "${CONFIG_SIGN_MODE}" = "AHAB" ]; then + # Sign and encrypt the image CURRENT_PATH="$(pwd)" cst -o "${TARGET}" -i "${CURRENT_PATH}/csf_descriptor" >/dev/null if [ $? -ne 0 ]; then diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index de5c09fad..97cee424b 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2020 Digi International +# Copyright (C) 2017-2021 Digi International SUMMARY = "TrustFence signing and encryption scripts" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" @@ -20,6 +20,7 @@ SRC_URI = " \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ file://sign_ahab;name=artifact-ahab-sign \ + file://encrypt_ahab;name=artifact-ahab-encrypt \ " do_configure[noexec] = "1" @@ -29,6 +30,7 @@ do_install() { install -d ${D}${bindir}/csf_templates if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then install -m 0755 sign_ahab ${D}${bindir}/csf_templates/ + install -m 0755 encrypt_ahab ${D}${bindir}/csf_templates/ elif [ "${TRUSTFENCE_SIGN_MODE}" = "HAB" ]; then install -m 0755 sign_hab ${D}${bindir}/csf_templates/ install -m 0755 encrypt_hab ${D}${bindir}/csf_templates/ From 39baff1e60b59d86c17ee31b62a30b74c9026956 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 13 Jan 2021 10:00:15 +0100 Subject: [PATCH 12/24] trustfence: add new TRUSTFENCE_SRK_REVOKE_MASK variable In order to revoke SRKs in platforms with AHAB we need to set a mask during the signing/encryption process. Create new TRUSTFENCE_SRK_REVOKE_MASK variable to export the SRK_REVOKE_MASK variable required by the imx-boot signing script. The revoke mask is not necessary for signing/encryption of other artifacts, so set it by default to 0x0. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 1 + .../recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools/sign_ahab | 2 +- meta-digi-dey/classes/trustfence.bbclass | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index db851ca82..575485ec2 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -213,6 +213,7 @@ do_deploy_append () { [ -n "${TRUSTFENCE_KEY_INDEX}" ] && export CONFIG_KEY_INDEX="${TRUSTFENCE_KEY_INDEX}" [ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}" [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" + [ -n "${TRUSTFENCE_SRK_REVOKE_MASK}" ] && export SRK_REVOKE_MASK="${TRUSTFENCE_SRK_REVOKE_MASK}" # Sign U-boot image if [ "${UBOOT_RAM_COMBINATIONS}" = "" ]; then diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab index 9e40c7e3a..f7df7b86c 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/encrypt_ahab @@ -14,7 +14,7 @@ # Type of SRK set (NXP or OEM) Source set = OEM # bitmask of the revoked SRKs - Revocations = 0x%key_index% + Revocations = 0x0 [Authenticate Data] # Binary to be signed generated by mkimage diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/sign_ahab b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/sign_ahab index 1b59802f2..0d43a64b3 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/sign_ahab +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/sign_ahab @@ -14,7 +14,7 @@ # Type of SRK set (NXP or OEM) Source set = OEM # bitmask of the revoked SRKs - Revocations = 0x%key_index% + Revocations = 0x0 [Authenticate Data] # Binary to be signed generated by mkimage diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass index 664c14060..6ec8d054e 100644 --- a/meta-digi-dey/classes/trustfence.bbclass +++ b/meta-digi-dey/classes/trustfence.bbclass @@ -23,6 +23,7 @@ TRUSTFENCE_SIGN ?= "1" TRUSTFENCE_SIGN_KEYS_PATH ?= "default" TRUSTFENCE_DEK_PATH ?= "default" TRUSTFENCE_ENCRYPT_ENVIRONMENT ?= "1" +TRUSTFENCE_SRK_REVOKE_MASK ?= "0x0" # Trustfence initramfs image recipe TRUSTFENCE_INITRAMFS_IMAGE ?= "dey-image-trustfence-initramfs" From 95be080ab29bd6af97f9a0f7bf40653e977f16c9 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 14 Jan 2021 16:29:52 +0100 Subject: [PATCH 13/24] weston: apply g2d backend workarounds to both the ccimx6 and ccimx6qp These changes were originally applied to the ccimx6 to fix a trailing effect in the desktop, but we've recently discovered an HDMI hotplug issue on the ccimx6qp that is also solved when using the g2d backend. Apply the workarounds to both platforms. https://jira.digi.com/browse/DEL-7380 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend | 3 ++- meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend index 74739dbf6..2b3e593bd 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend @@ -17,7 +17,8 @@ INI_UNCOMMENT_ASSIGNMENTS_append_mx8mp = " \ " # Digi: use g2d on ccimx6sbc to fix desktop window issue -INI_UNCOMMENT_ASSIGNMENTS_append_ccimx6sbc = " \ +# Also needed to workaround an HDMI hotplug issue on the ccimx6qpsbc +INI_UNCOMMENT_ASSIGNMENTS_append_ccimx6 = " \ use-g2d=1 \ " diff --git a/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend index ddc30ee6d..f70bfd5b1 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2020 Digi International. -SRC_URI_append_ccimx6sbc = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch" +SRC_URI_append_ccimx6 = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch" From fddaee85b98ed300036cedd729e9530526a3fcf8 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 18 Jan 2021 11:55:28 +0100 Subject: [PATCH 14/24] update-fw scripts: fix error path after sucessful update On commit 1e5cafeb7945401794765ef55ccf89f95ba3361c a fall-back update command was introduced in case the newest command fails. If the newest command succeeds, however, the 'test' command for error doesn't match (there is no error) and the return code of such test is "1". On the next check for errors, this results on an error, when we really mean to continue because the first command was successful. Move the second error check inside the error path of the first attempt. Reported-by: Francisco Gil Signed-off-by: Hector Palacios --- .../u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt | 12 ++++++------ .../u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt | 12 ++++++------ .../ccimx6ulstarter/install_linux_fw_sd.txt | 12 ++++++------ .../ccimx6ulstarter/install_linux_fw_usb.txt | 12 ++++++------ .../u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt | 12 ++++++------ .../u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt | 12 ++++++------ .../ccimx8x-sbc-express/install_linux_fw_sd.txt | 12 ++++++------ .../ccimx8x-sbc-express/install_linux_fw_usb.txt | 12 ++++++------ .../ccimx8x-sbc-pro/install_linux_fw_sd.txt | 12 ++++++------ .../ccimx8x-sbc-pro/install_linux_fw_usb.txt | 12 ++++++------ 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt index 91ee9db95..dae64bf27 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt @@ -86,12 +86,12 @@ update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt index ad510b9ab..9ed3f9107 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt @@ -86,12 +86,12 @@ update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt index 8cee2a0e4..eea78e59b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt @@ -86,12 +86,12 @@ update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt index 23978ea81..86b2a1a2b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt @@ -86,12 +86,12 @@ update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt index 72a9df115..5045af94b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt @@ -57,12 +57,12 @@ update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt index 406e884e5..40ed7a52a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt @@ -57,12 +57,12 @@ update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt index 158ec7d46..3a79ca257 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt @@ -128,12 +128,12 @@ update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt index 4f4903cc5..caf034dcd 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt @@ -126,12 +126,12 @@ update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt index ea90967d8..6a43e5bb8 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt @@ -128,12 +128,12 @@ update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt index 110a9c252..dc297581e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt @@ -128,12 +128,12 @@ update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} if test $? -eq 1; then # Use old-style update with source file system argument update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} -fi -if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; + if test $? -eq 1; then + echo "[ERROR] Failed to update U-Boot boot loader!"; + echo ""; + echo "Aborted."; + exit; + fi fi # Set 'bootcmd' to the second part of the script that will From 698584d0472be8f59b6cd09ad889babf9fc05c2f Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 18 Jan 2021 16:22:40 +0100 Subject: [PATCH 15/24] meta-digi: prepare for dey-3.0-r3.1 Signed-off-by: Arturo Buzarra --- README.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 67197f667..cdad0dcbb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Digi Embedded Yocto (DEY) 3.0 -## Release 3.0-r2 +## Release 3.0-r3 This document provides information about Digi Embedded Yocto, Digi International's professional embedded Yocto development environment. @@ -93,17 +93,30 @@ Documentation is available online at https://www.digi.com/resources/documentatio # Downloads -* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/3.0/r2/images/ -* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/3.0/r2/sdk/ +* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/3.0/r3/images/ +* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/3.0/r3/sdk/ # Release Changelog +## 3.0-r3 + +* Updated BSP to NXP release rel_imx_5.4.47_2.2.0. +* Updated U-Boot to version 2020.04-r2 for ConnectCore 6UL, ConnectCore 8M Nano + and ConnectCore 8X. +* TrustFence: add support for encrypted artifacts on ConnectCore 8M Nano and + ConnectCore 8X. +* TrustFence: add support for SRK revocation on ConnectCore 8X. +* Added support to install firmware from a USB stick. +* Added WebKit image recipe to platforms with XWayland backend. +* Other minor fixes. + + ## 3.0-r2 * Updated BSP to NXP release rel_imx_5.4.24_2.1.0. * Added support to ConnectCore 6 and ConnectCore 6 Plus (kernel v5.4). * Updated U-Boot to version 2020.04-r1 for ConnectCore 8X. -* TrustFence: added secure console and U-Boot environment encryption support. +* TrustFence: added secure console and U-Boot environment encryption support to ConnectCore 8X and 8M Nano. * Added MCA keypad support for ConnectCore 8X and 8M Nano. * Fix SoftAP on 5GHz on ConnectCore 6UL. From c22e8faf907264fc56ca1e0adba2afface2560dd Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 18 Jan 2021 18:30:50 +0100 Subject: [PATCH 16/24] meta-digi: update revisions for dey-3.0-r3.1 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 5f459663d..9b6d9ba44 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 243ff2143..2b6620908 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "73b1ab4b7a8f8433e56f8fc995001c84458deb11" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 77298bf4e..5a58fa7af 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 97cee424b..7ff14b0bf 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 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 @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 0774cb146..5792c02f8 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b1bc2d463121ffde0af3714b0fbd5d59175e1979" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 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 = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 4e66757e4..8d4c2118b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "35b859e87ac3baf635b933c8a74c531218435d8d" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 9d977bb28..3d4fc4cb8 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8989ca6609ece6c1c53657141f0b2da08ff6e3d5" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From de2e9e40ad417e1486fb1af1cdb1ac767f6440a6 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 18 Jan 2021 18:37:09 +0100 Subject: [PATCH 17/24] meta-digi: revert revisions to AUTOREV This reverts commit c22e8faf907264fc56ca1e0adba2afface2560dd. --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 9b6d9ba44..5f459663d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 2b6620908..243ff2143 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "73b1ab4b7a8f8433e56f8fc995001c84458deb11" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 5a58fa7af..77298bf4e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 7ff14b0bf..97cee424b 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2020.04/maint" -SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 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 @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 5792c02f8..0774cb146 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" -SRCREV = "b1bc2d463121ffde0af3714b0fbd5d59175e1979" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 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 = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +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=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 8d4c2118b..4e66757e4 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "35b859e87ac3baf635b933c8a74c531218435d8d" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 3d4fc4cb8..9d977bb28 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "8989ca6609ece6c1c53657141f0b2da08ff6e3d5" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From ee29d0ffcddd0b59d78b2dcc46ef46ac58e6e075 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 19 Jan 2021 13:18:22 +0100 Subject: [PATCH 18/24] install_fw: cc6ul: erase 'update' partition unconditionally When manually changing the partition table, it could happen that a UBI volume already exists in the 'update' partition. If not erased, the system may find the old UBI volume (with wrong geometry information) and try to mount it which will result in failure. Signed-off-by: Hector Palacios --- .../u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt | 2 ++ .../u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh | 4 ++++ 6 files changed, 16 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt index dae64bf27..3ef1c09ea 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt @@ -100,6 +100,7 @@ fi # - Update the 'linux' partition # - Update the 'recovery' partition # - Update the 'rootfs' partition +# - Erase the 'update' partition # - Configure recovery to wipe 'update' partition # - Run 'recovery' and let the system boot after setenv bootcmd " @@ -145,6 +146,7 @@ setenv bootcmd " exit; fi; echo \"\"; + nand erase.part update; setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt index 9ed3f9107..f1e1b405a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt @@ -100,6 +100,7 @@ fi # - Update the 'linux' partition # - Update the 'recovery' partition # - Update the 'rootfs' partition +# - Erase the 'update' partition # - Configure recovery to wipe 'update' partition # - Run 'recovery' and let the system boot after setenv bootcmd " @@ -146,6 +147,7 @@ setenv bootcmd " exit; fi; echo \"\"; + nand erase.part update; setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh index 36f1f37d8..78408f70a 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh @@ -119,6 +119,7 @@ nand_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000 # - Update the 'linux' partition # - Update the 'recovery' partition # - Update the 'rootfs' partition +# - Erase the 'update' partition uuu fb: ucmd setenv bootcmd " env default -a; saveenv; @@ -152,6 +153,9 @@ nand_update "recovery" "${INSTALL_RECOVERY_FILENAME}" 15000 # Update Rootfs nand_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" 90000 +# Erase the 'Update' partition +uuu fb: ucmd nand erase.part update + # Configure u-boot to boot into recovery mode uuu fb: ucmd setenv boot_recovery yes uuu fb: ucmd setenv recovery_command wipe_update diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt index eea78e59b..74482a704 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt @@ -100,6 +100,7 @@ fi # - Update the 'linux' partition # - Update the 'recovery' partition # - Update the 'rootfs' partition +# - Erase the 'update' partition # - Configure recovery to wipe 'update' partition # - Run 'recovery' and let the system boot after setenv bootcmd " @@ -145,6 +146,7 @@ setenv bootcmd " exit; fi; echo \"\"; + nand erase.part update; setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt index 86b2a1a2b..885440ee1 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt @@ -100,6 +100,7 @@ fi # - Update the 'linux' partition # - Update the 'recovery' partition # - Update the 'rootfs' partition +# - Erase the 'update' partition # - Configure recovery to wipe 'update' partition # - Run 'recovery' and let the system boot after setenv bootcmd " @@ -146,6 +147,7 @@ setenv bootcmd " exit; fi; echo \"\"; + nand erase.part update; setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh index afa42cf22..89346f19c 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh @@ -119,6 +119,7 @@ nand_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000 # - Update the 'linux' partition # - Update the 'recovery' partition # - Update the 'rootfs' partition +# - Erase the 'update' partition uuu fb: ucmd setenv bootcmd " env default -a; saveenv; @@ -152,6 +153,9 @@ nand_update "recovery" "${INSTALL_RECOVERY_FILENAME}" 15000 # Update Rootfs nand_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" 90000 +# Erase the 'Update' partition +uuu fb: ucmd nand erase.part update + # Configure u-boot to boot into recovery mode uuu fb: ucmd setenv boot_recovery yes uuu fb: ucmd setenv recovery_command wipe_update From bc843e239d4ccad86f6ceb61714ce2474ec7f00f Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 21 Jan 2021 12:56:46 +0100 Subject: [PATCH 19/24] meta-digi: update revisions for dey-3.0-r3.2 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 5f459663d..9b6d9ba44 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 243ff2143..2b6620908 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "73b1ab4b7a8f8433e56f8fc995001c84458deb11" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 77298bf4e..5a58fa7af 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 97cee424b..7ff14b0bf 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 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 @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 0774cb146..63f311bad 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b19c068819baf957f169b865d024131a9b31ab54" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 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 = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 4e66757e4..8d4c2118b 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "35b859e87ac3baf635b933c8a74c531218435d8d" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 9d977bb28..3d4fc4cb8 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8989ca6609ece6c1c53657141f0b2da08ff6e3d5" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 61497fb2dd7e9e283d32bd32e14a841ce58a7568 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 21 Jan 2021 12:57:49 +0100 Subject: [PATCH 20/24] meta-digi: revert revisions to AUTOREV This reverts commit bc843e239d4ccad86f6ceb61714ce2474ec7f00f. --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 9b6d9ba44..5f459663d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 2b6620908..243ff2143 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "73b1ab4b7a8f8433e56f8fc995001c84458deb11" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 5a58fa7af..77298bf4e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 7ff14b0bf..97cee424b 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2020.04/maint" -SRCREV = "e135e76d1472fece5b280a2f960aec63e324d8e1" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 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 @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 63f311bad..0774cb146 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" -SRCREV = "b19c068819baf957f169b865d024131a9b31ab54" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 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 = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +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=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 8d4c2118b..4e66757e4 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "35b859e87ac3baf635b933c8a74c531218435d8d" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 3d4fc4cb8..9d977bb28 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "8989ca6609ece6c1c53657141f0b2da08ff6e3d5" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 426592665056dd7e2d9b846df41ff519cbe143cc Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 22 Jan 2021 13:25:15 +0100 Subject: [PATCH 21/24] u-boot: remove 2018.03 recipe, replaced by v2020.04 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb deleted file mode 100644 index dd3b5a540..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2019,2020 Digi International - -require digi-u-boot.inc - -SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" - -COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" From 3a011775b1580464643fcc108da0d50e5ad26730 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 22 Jan 2021 13:27:36 +0100 Subject: [PATCH 22/24] cosmetic: digi-defaults.inc: update Linux/U-Boot version table Update the ccimx8m and cc6ul supported U-Boot version. Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 6eecb5dd9..dad951872 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -16,9 +16,9 @@ LINUXLIBCVERSION ?= "5.4%" # ------------------------------------------------- # ccimx6 5.4 2017.03 # ccimx6qp 5.4 2017.03 -# ccimx6ul 5.4 2017.03 +# ccimx6ul 5.4 2020.04 # ccimx8x 5.4 2020.04 (packaged in imx-boot) -# ccimx8mn 5.4 2018.03 (packaged in imx-boot) +# ccimx8mn 5.4 2020.04 (packaged in imx-boot) # # Help variables used in recipes From 34d495bc77ea9a781a373b6bfa1468caa293cf1a Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 22 Jan 2021 13:45:56 +0100 Subject: [PATCH 23/24] README: add MCA LED support for ConnectCore 8X and 8M Nano platforms Signed-off-by: Arturo Buzarra --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cdad0dcbb..97a8bb3d0 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ Documentation is available online at https://www.digi.com/resources/documentatio * TrustFence: add support for SRK revocation on ConnectCore 8X. * Added support to install firmware from a USB stick. * Added WebKit image recipe to platforms with XWayland backend. +* Added MCA LED support for ConnectCore 8X and 8M Nano. * Other minor fixes. From a6e4079eb986afa04188ebd7510faf94ac600a7f Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 25 Jan 2021 11:20:54 +0100 Subject: [PATCH 24/24] dnsmasq: update to v2.83 Aside from code improvements, this version includes fixes for the following vulnerabilities: * CVE-2020-25681 * CVE-2020-25682 * CVE-2020-25683 * CVE-2020-25684 * CVE-2020-25685 * CVE-2020-25686 * CVE-2020-25687 While at it, remove files that were inherited from an older vulnerability fix. These files consist of scripts, patches and configuration files that already exist in the original meta-openembedded recipe directory. Remake lua.patch, since the diff context has changed in v2.83. https://jira.digi.com/browse/DEL-7389 Signed-off-by: Gabriel Valcazar --- .../recipes-support/dnsmasq/dnsmasq/lua.patch | 10 +- .../recipes-support/dnsmasq/dnsmasq_2.83.bb | 10 + .../recipes-support/dnsmasq/files/99_dnsmasq | 1 - .../files/dnsmasq-noresolvconf.service | 15 - .../dnsmasq/files/dnsmasq-resolvconf-helper | 62 ---- .../dnsmasq/files/dnsmasq-resolvconf.service | 17 - .../dnsmasq/files/dnsmasq.conf | 298 ------------------ .../dnsmasq/files/dnsmasq.resolvconf | 84 ----- .../recipes-support/dnsmasq/files/init | 117 ------- 9 files changed, 15 insertions(+), 599 deletions(-) create mode 100644 meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/files/99_dnsmasq delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service delete mode 100755 meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.conf delete mode 100755 meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.resolvconf delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/files/init diff --git a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch index 0991dd8b9..b8d1062a2 100644 --- a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch +++ b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -1,7 +1,7 @@ From be1b3d2d0f1608cba5efee73d6aac5ad0709041b Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Tue, 9 Sep 2014 10:24:58 -0400 -Subject: [PATCH] Upstream-status: Inappropriate [OE specific] +Subject: [PATCH] Upstream-Status: Inappropriate [OE specific] Signed-off-by: Christopher Larson Signed-off-by: Paul Eggleton @@ -14,7 +14,7 @@ diff --git a/Makefile b/Makefile index 73ea23e..ed3eeb9 100644 --- a/Makefile +++ b/Makefile -@@ -59,8 +59,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI +@@ -60,8 +60,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2` ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack` ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack` @@ -22,9 +22,9 @@ index 73ea23e..ed3eeb9 100644 -lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` +lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua` +lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua` - nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed` - nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed` - gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp` + nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags 'nettle hogweed' \ + HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle` + nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs 'nettle hogweed' \ -- 2.9.5 diff --git a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb new file mode 100644 index 000000000..db7ee0df2 --- /dev/null +++ b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb @@ -0,0 +1,10 @@ +require recipes-support/dnsmasq/dnsmasq.inc + +# To avoid duplicating files, re-use the original ones from meta-openembedded. +FILESEXTRAPATHS_prepend := "${COREBASE}/../meta-openembedded/meta-networking/recipes-support/${PN}/files:" + +SRC_URI[dnsmasq-2.83.md5sum] = "c87d5af020d12984d2ab9fbf04e2dcca" +SRC_URI[dnsmasq-2.83.sha256sum] = "6b67955873acc931bfff61a0a1e0dc239f8b52e31df50e9164d3a4537571342f" +SRC_URI += "\ + file://lua.patch \ +" diff --git a/meta-digi-dey/recipes-support/dnsmasq/files/99_dnsmasq b/meta-digi-dey/recipes-support/dnsmasq/files/99_dnsmasq deleted file mode 100644 index f52ce4e8f..000000000 --- a/meta-digi-dey/recipes-support/dnsmasq/files/99_dnsmasq +++ /dev/null @@ -1 +0,0 @@ -d root root 0755 /run/dnsmasq none diff --git a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service b/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service deleted file mode 100644 index 0c64fab00..000000000 --- a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=DNS forwarder and DHCP server -After=network.target - -[Service] -Type=forking -PIDFile=/run/dnsmasq.pid -ExecStartPre=/usr/bin/dnsmasq --test -ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service -ExecStop=/bin/kill $MAINPID -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target - diff --git a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper b/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper deleted file mode 100644 index db54d467e..000000000 --- a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# -# Borrowing heavily from the dnsmasq initscript's version of support for -# resolvconf, intended for use in systemd-only configurations. -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/dnsmasq -NAME=dnsmasq - -# Most configuration options in /etc/default/dnsmasq are deprecated -# but still honoured. -if [ -r /etc/default/$NAME ]; then - . /etc/default/$NAME -fi - -start_resolvconf() -{ - # If interface "lo" is explicitly disabled in /etc/default/dnsmasq - # Then dnsmasq won't be providing local DNS, so don't add it to - # the resolvconf server set. - for interface in $DNSMASQ_EXCEPT - do - [ $interface = lo ] && return - done - - if [ -x /sbin/resolvconf ] ; then - echo "nameserver 127.0.0.1" | - /sbin/resolvconf -a lo.$NAME - fi - return 0 -} - -stop_resolvconf() -{ - if [ -x /sbin/resolvconf ] ; then - /sbin/resolvconf -d lo.$NAME - fi - return 0 -} - -case "$1" in - start) - start_resolvconf - exit 0 - ;; - stop) - stop_resolvconf - exit 0 - ;; - restart) - stop_resolvconf - start_resolvconf - exit 0 - ;; - *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart}" >&2 - exit 3 - ;; -esac - -exit 0 - diff --git a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service deleted file mode 100644 index 2980f7def..000000000 --- a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=DNS forwarder and DHCP server -After=network.target - -[Service] -Type=forking -PIDFile=/run/dnsmasq.pid -ExecStartPre=/usr/bin/dnsmasq --test -ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service -ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start -ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop -ExecStop=/bin/kill $MAINPID -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target - diff --git a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.conf deleted file mode 100755 index 9e5ab9f81..000000000 --- a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.conf +++ /dev/null @@ -1,298 +0,0 @@ -# Configuration file for dnsmasq. -# -# Format is one option per line, legal options are the same -# as the long options legal on the command line. See -# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details. - -# Listen on this specific port instead of the standard DNS port -# (53). Setting this to zero completely disables DNS function, -# leaving only DHCP and/or TFTP. -#port=5353 - -# Change these lines if you want dnsmasq to serve MX records. -# Only one of mx-host and mx-target need be set, the other defaults -# to the name of the host running dnsmasq. -#mx-host= -#mx-target= -#selfmx -#localmx - -# The following two options make you a better netizen, since they -# tell dnsmasq to filter out queries which the public DNS cannot -# answer, and which load the servers (especially the root servers) -# uneccessarily. If you have a dial-on-demand link they also stop -# these requests from bringing up the link uneccessarily. - -# Never forward plain names (with a dot or domain part) -domain-needed -# Never forward addresses in the non-routed address spaces. -bogus-priv - - -# Uncomment this to filter useless windows-originated DNS requests -# which can trigger dial-on-demand links needlessly. -# Note that (amongst other things) this blocks all SRV requests, -# so don't use it if you use eg Kerberos. -#filterwin2k - -# Change this line if you want dns to get its upstream servers from -# somewhere other that /etc/resolv.conf -#resolv-file= - -# By default, dnsmasq will send queries to any of the upstream -# servers it knows about and tries to favour servers to are known -# to be up. Uncommenting this forces dnsmasq to try each query -# with each server strictly in the order they appear in -# /etc/resolv.conf -#strict-order - -# If you don't want dnsmasq to read /etc/resolv.conf or any other -# file, getting its servers for this file instead (see below), then -# uncomment this -#no-resolv - -# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv -# files for changes and re-read them then uncomment this. -#no-poll - -# Add other name servers here, with domain specs if they are for -# non-public domains. -#server=/localnet/192.168.0.1 - -# Add local-only domains here, queries in these domains are answered -# from /etc/hosts or DHCP only. -#local=/localnet/ - -# Add domains which you want to force to an IP address here. -# The example below send any host in doubleclick.net to a local -# webserver. -#address=/doubleclick.net/127.0.0.1 - -# You no longer (as of version 1.7) need to set these to enable -# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the -# "dip" group to achieve this. -#user= -#group= - -# If you want dnsmasq to listen for requests only on specified interfaces -# (and the loopback) give the name of the interface (eg eth0) here. -# Repeat the line for more than one interface. -#interface= -# Or you can specify which interface _not_ to listen on -#except-interface= -# Or which to listen on by address (remember to include 127.0.0.1 if -# you use this.) -#listen-address=127.0.0.1 - -# On systems which support it, dnsmasq binds the wildcard address, -# even when it is listening on only some interfaces. It then discards -# requests that it shouldn't reply to. This has the advantage of -# working even when interfaces come and go and change address. If you -# want dnsmasq to really bind only the interfaces it is listening on, -# uncomment this option. About the only time you may need this is when -# running another nameserver on the same machine. -#bind-interfaces - -# If you don't want dnsmasq to read /etc/hosts, uncomment the -# following line. -#no-hosts -# or if you want it to read another file, as well as /etc/hosts, use -# this. -#addn-hosts=/etc/banner_add_hosts - -# Set this (and domain: see below) if you want to have a domain -# automatically added to simple names in a hosts-file. -#expand-hosts - -# Set the domain for dnsmasq. this is optional, but if it is set, it -# does the following things. -# 1) Allows DHCP hosts to have fully qualified domain names, as long -# as the domain part matches this setting. -# 2) Sets the "domain" DHCP option thereby potentially setting the -# domain of all systems configured by DHCP -# 3) Provides the domain part for "expand-hosts" -#domain=thekelleys.org.uk - -# Uncomment this to enable the integrated DHCP server, you need -# to supply the range of addresses available for lease and optionally -# a lease time. If you have more than one network, you will need to -# repeat this for each network on which you want to supply DHCP -# service. -#dhcp-range=192.168.0.50,192.168.0.150,12h -#dhcp-range=10.0.0.10,10.0.0.200,2h - -# This is an example of a DHCP range where the netmask is given. This -# is needed for networks we reach the dnsmasq DHCP server via a relay -# agent. If you don't know what a DHCP relay agent is, you probably -# don't need to worry about this. -#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h - -# This is an example of a DHCP range with a network-id, so that -# some DHCP options may be set only for this network. -#dhcp-range=red,192.168.0.50,192.168.0.150 - -# Supply parameters for specified hosts using DHCP. There are lots -# of valid alternatives, so we will give examples of each. Note that -# IP addresses DO NOT have to be in the range given above, they just -# need to be on the same network. The order of the parameters in these -# do not matter, it's permissble to give name,adddress and MAC in any order - -# Always allocate the host with ethernet address 11:22:33:44:55:66 -# The IP address 192.168.0.60 -#dhcp-host=11:22:33:44:55:66,192.168.0.60 - -# Always set the name of the host with hardware address -# 11:22:33:44:55:66 to be "fred" -#dhcp-host=11:22:33:44:55:66,fred - -# Always give the host with ethernet address 11:22:33:44:55:66 -# the name fred and IP address 192.168.0.60 and lease time 45 minutes -#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m - -# Give the machine which says it's name is "bert" IP address -# 192.168.0.70 and an infinite lease -#dhcp-host=bert,192.168.0.70,infinite - -# Always give the host with client identifier 01:02:02:04 -# the IP address 192.168.0.60 -#dhcp-host=id:01:02:02:04,192.168.0.60 - -# Always give the host with client identifier "marjorie" -# the IP address 192.168.0.60 -#dhcp-host=id:marjorie,192.168.0.60 - -# Enable the address given for "judge" in /etc/hosts -# to be given to a machine presenting the name "judge" when -# it asks for a DHCP lease. -#dhcp-host=judge - -# Never offer DHCP service to a machine whose ethernet -# address is 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,ignore - -# Ignore any client-id presented by the machine with ethernet -# address 11:22:33:44:55:66. This is useful to prevent a machine -# being treated differently when running under different OS's or -# between PXE boot and OS boot. -#dhcp-host=11:22:33:44:55:66,id:* - -# Send extra options which are tagged as "red" to -# the machine with ethernet address 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,net:red - -# Send extra options which are tagged as "red" to any machine whose -# DHCP vendorclass string includes the substring "Linux" -#dhcp-vendorclass=red,Linux - -# Send extra options which are tagged as "red" to any machine one -# of whose DHCP userclass strings includes the substring "accounts" -#dhcp-userclass=red,accounts - -# If this line is uncommented, dnsmasq will read /etc/ethers and act -# on the ethernet-address/IP pairs found there just as if they had -# been given as --dhcp-host options. Useful if you keep -# MAC-address/host mappings there for other purposes. -#read-ethers - -# Send options to hosts which ask for a DHCP lease. -# See RFC 2132 for details of available options. -# Note that all the common settings, such as netmask and -# broadcast address, DNS server and default route, are given -# sane defaults by dnsmasq. You very likely will not need any -# any dhcp-options. If you use Windows clients and Samba, there -# are some options which are recommended, they are detailed at the -# end of this section. -# For reference, the common options are: -# subnet mask - 1 -# default router - 3 -# DNS server - 6 -# broadcast address - 28 - -# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 -#dhcp-option=42,192.168.0.4,10.10.0.5 - -# Set the NTP time server address to be the same machine as -# is running dnsmasq -#dhcp-option=42,0.0.0.0 - -# Set the NIS domain name to "welly" -#dhcp-option=40,welly - -# Set the default time-to-live to 50 -#dhcp-option=23,50 - -# Set the "all subnets are local" flag -#dhcp-option=27,1 - -# Send the etherboot magic flag and then etherboot options (a string). -#dhcp-option=128,e4:45:74:68:00:00 -#dhcp-option=129,NIC=eepro100 - -# Specify an option which will only be sent to the "red" network -# (see dhcp-range for the declaration of the "red" network) -#dhcp-option=red,42,192.168.1.1 - -# The following DHCP options set up dnsmasq in the same way as is specified -# for the ISC dhcpcd in -# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt -# adapted for a typical dnsmasq installation where the host running -# dnsmasq is also the host running samba. -# you may want to uncomment them if you use Windows clients and Samba. -#dhcp-option=19,0 # option ip-forwarding off -#dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s) -#dhcp-option=45,0.0.0.0 # netbios datagram distribution server -#dhcp-option=46,8 # netbios node type -#dhcp-option=47 # empty netbios scope. - - -# Set the boot filename and tftpd server name and address -# for BOOTP. You will only need this is you want to -# boot machines over the network. -#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3 - -# Set the limit on DHCP leases, the default is 150 -#dhcp-lease-max=150 - -# The DHCP server needs somewhere on disk to keep its lease database. -# This defaults to a sane location, but if you want to change it, use -# the line below. -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases - -# Set the cachesize here. -#cache-size=150 - -# If you want to disable negative caching, uncomment this. -#no-negcache - -# Normally responses which come form /etc/hosts and the DHCP lease -# file have Time-To-Live set as zero, which conventionally means -# do not cache further. If you are happy to trade lower load on the -# server for potentially stale date, you can set a time-to-live (in -# seconds) here. -#local-ttl= - -# If you want dnsmasq to detect attempts by Verisign to send queries -# to unregistered .com and .net hosts to its sitefinder service and -# have dnsmasq instead return the correct NXDOMAIN response, uncomment -# this line. You can add similar lines to do the same for other -# registries which have implemented wildcard A records. -#bogus-nxdomain=64.94.110.11 - -# If you want to fix up DNS results from upstream servers, use the -# alias option. This only works for IPv4. -# This alias makes a result of 1.2.3.4 appear as 5.6.7.8 -#alias=1.2.3.4,5.6.7.8 -# and this maps 1.2.3.x to 5.6.7.x -#alias=1.2.3.0,5.6.7.0,255.255.255.0 - -# For debugging purposes, log each DNS query as it passes through -# dnsmasq. -#log-queries - -# Include a another lot of configuration options. -#conf-file=/etc/dnsmasq.more.conf - - - - - diff --git a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.resolvconf b/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.resolvconf deleted file mode 100755 index 06cd25cec..000000000 --- a/meta-digi-dey/recipes-support/dnsmasq/files/dnsmasq.resolvconf +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# -# Script to update the resolver list for dnsmasq -# -# N.B. Resolvconf may run us even if dnsmasq is not (yet) running. -# If dnsmasq is installed then we go ahead and update the resolver list -# in case dnsmasq is started later. -# -# Assumption: On entry, PWD contains the resolv.conf-type files. -# -# This file is part of the dnsmasq package. -# - -set -e - -RUN_DIR="/run/dnsmasq" -RSLVRLIST_FILE="${RUN_DIR}/resolv.conf" -TMP_FILE="${RSLVRLIST_FILE}_new.$$" -MY_NAME_FOR_RESOLVCONF="dnsmasq" - -[ -x /usr/bin/dnsmasq ] || exit 0 -[ -x /lib/resolvconf/list-records ] || exit 1 - -PATH=/bin:/sbin - -report_err() { echo "$0: Error: $*" >&2 ; } - -# Stores arguments (minus duplicates) in RSLT, separated by spaces -# Doesn't work properly if an argument itself contains whitespace -uniquify() -{ - RSLT="" - while [ "$1" ] ; do - for E in $RSLT ; do - [ "$1" = "$E" ] && { shift ; continue 2 ; } - done - RSLT="${RSLT:+$RSLT }$1" - shift - done -} - -if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then - report_err "Failed trying to create directory $RUN_DIR" - exit 1 -fi - -RSLVCNFFILES="" -for F in $(/lib/resolvconf/list-records --after "lo.$MY_NAME_FOR_RESOLVCONF") ; do - case "$F" in - "lo.$MY_NAME_FOR_RESOLVCONF") - # Omit own record - ;; - lo.*) - # Include no more records after one for a local nameserver - RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F" - break - ;; - *) - RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F" - ;; - esac -done - -NMSRVRS="" -if [ "$RSLVCNFFILES" ] ; then - uniquify $(sed -n -e 's/^[[:space:]]*nameserver[[:space:]]\+//p' $RSLVCNFFILES) - NMSRVRS="$RSLT" -fi - -# Dnsmasq uses the mtime of $RSLVRLIST_FILE, with a resolution of one second, -# to detect changes in the file. This means that if a resolvconf update occurs -# within one second of the previous one then dnsmasq may fail to notice the -# more recent change. To work around this problem we sleep one second here -# if necessary in order to ensure that the new mtime is different. -if [ -f "$RSLVRLIST_FILE" ] && [ "$(stat -c %X "$RSLVRLIST_FILE")" = "$(date +%s)" ] ; then - sleep 1 -fi - -clean_up() { rm -f "$TMP_FILE" ; } -trap clean_up EXIT -: >| "$TMP_FILE" -for N in $NMSRVRS ; do echo "nameserver $N" >> "$TMP_FILE" ; done -mv -f "$TMP_FILE" "$RSLVRLIST_FILE" - diff --git a/meta-digi-dey/recipes-support/dnsmasq/files/init b/meta-digi-dey/recipes-support/dnsmasq/files/init deleted file mode 100644 index 51c95dfed..000000000 --- a/meta-digi-dey/recipes-support/dnsmasq/files/init +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -DAEMON=/usr/bin/dnsmasq -NAME=dnsmasq -DESC="DNS forwarder and DHCP server" -ARGS="-7 /etc/dnsmasq.d" - -test -f $DAEMON || exit 0 - -set -e - -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi - -DNSMASQ_CONF="/etc/dnsmasq.conf" -test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*" - -test -z "${PIDFILE}" && PIFILE="/run/dnsmasq.pid" - -if [ -z "$IGNORE_RESOLVCONF" ] -then - egrep -h -q '^no-resolv' ${DNSMASQ_CONF} && IGNORE_RESOLVCONF="yes" -fi - -# RESOLV_CONF: -# If the resolvconf package is installed then use the resolv conf file -# that it provides as the default. Otherwise use /etc/resolv.conf as -# the default. -# -# If IGNORE_RESOLVCONF is set in /etc/default/dnsmasq or an explicit -# filename is set there then this inhibits the use of the resolvconf-provided -# information. -# -# Note that if the resolvconf package is installed it is not possible to -# override it just by configuration in /etc/dnsmasq.conf, it is necessary -# to set IGNORE_RESOLVCONF=yes in /etc/default/dnsmasq. - -test -z "$RESOLV_CONF" -a "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf && \ - RESOLV_CONF=/run/dnsmasq/resolv.conf - -start_resolvconf() -{ - if [ "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf ] - then - echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.$NAME - fi - : -} - -stop_resolvconf() -{ - if [ "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf ] - then - /sbin/resolvconf -d lo.$NAME - fi - : -} - -case "$1" in - start) - echo -n "starting $DESC: $NAME... " - test -d /var/lib/misc/ || mkdir /var/lib/misc/ - start-stop-daemon -S -x $DAEMON -- $ARGS \ - ${RESOLV_CONF:+ -r $RESOLV_CONF} \ - ${PIDFILE:+ -x $PIDFILE} - test $? -eq 0 && start_resolvconf - echo "done." - ;; - stop) - echo -n "stopping $DESC: $NAME... " - stop_resolvconf - start-stop-daemon -K -x $DAEMON - echo "done." - ;; - status) - echo -n "dnsmasq " - start-stop-daemon -q -K -t -x $DAEMON - RET=$? - if [ "$RET" = "0" ]; then - PID=`cat ${PIDFILE}` - echo "($PID) is running" - else - echo "is not running" - exit $RET - fi - ;; - restart) - echo "restarting $DESC: $NAME... " - $0 stop - $0 start - echo "done." - ;; - reload) - echo -n "reloading $DESC: $NAME... " - killall -HUP $(basename ${DAEMON}) - echo "done." - ;; - systemd-start-resolvconf) - start_resolvconf - ;; - systemd-stop-resolvconf) - stop_resolvconf - ;; - systemd-exec) - test -d /var/lib/misc/ || mkdir /var/lib/misc/ - exec $DAEMON --keep-in-foreground $ARGS \ - ${RESOLV_CONF:+ -r $RESOLV_CONF} \ - ${PIDFILE:+ -x $PIDFILE} - ;; - *) - echo "Usage: $0 {start|stop|status|restart|reload}" - exit 1 - ;; -esac - -exit 0