From 8a81b2cb2537eb24fe14038cdca2ba29d4a942ef Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Mon, 8 Jan 2018 11:35:32 +0100 Subject: [PATCH] rocko migration: trustfence: fix dependencies https://jira.digi.com/browse/DEL-5518 Signed-off-by: Jose Diaz de Grenu --- meta-digi-arm/classes/image_types_digi.bbclass | 1 + meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../packagegroup/nativesdk-packagegroup-sdk-host.bbappend | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 3 +++ meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 3 +-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 1f1311c2d..39b5992ad 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -207,6 +207,7 @@ trustence_sign_cpio() { } CONVERSIONTYPES += "tf" CONVERSION_CMD_tf = "trustence_sign_cpio ${IMAGE_NAME}.rootfs.${type}" +CONVERSION_DEPENDS_tf = "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" IMAGE_TYPES += "cpio.gz.u-boot.tf" ################################################################################ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index c652af018..904ef6aac 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 Digi International +# Copyright (C) 2012-2018 Digi International require u-boot.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" DEPENDS += "dtc-native u-boot-mkimage-native" -DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', '', d)}" +DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" PROVIDES += "u-boot" diff --git a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend index febf7cc7a..77b7c7a3e 100644 --- a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend +++ b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend @@ -1,5 +1,5 @@ # Copyright (C) 2016 Digi International. RDEPENDS_${PN} += " \ - nativesdk-trustfence-sign-tools \ + ${@base_conditional('TRUSTFENCE_SIGN', '1', 'nativesdk-trustfence-sign-tools', '', d)} \ " diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index 3b93c3537..5c8cf61c9 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -1,7 +1,10 @@ +# Copyright (C) 2017-2018 Digi International SUMMARY = "TrustFence signing and encryption scripts" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +DEPENDS = "trustfence-cst-native coreutils-native" + SRCBRANCH = "v2015.04/master" SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 1f7eb809e..cae58b921 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -1,11 +1,10 @@ -# Copyright (C) 2013 Digi International +# Copyright (C) 2013-2018 Digi International SUMMARY = "Linux kernel for Digi boards" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" DEPENDS += "lzop-native bc-native" -DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', '', d)}" DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" inherit kernel fsl-kernel-localversion