Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sumo migration: meta-digi: replace the deprecated base_conditional function 

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2018-12-12 12:59:23 +01:00
parent 771bc38b4f
commit 5eb88b8c5d
26 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/classes/image_types_digi.bbclass
View File

@ -213,7 +213,7 @@ trustence_sign_cpio() {
} }
CONVERSIONTYPES += "tf" CONVERSIONTYPES += "tf"
CONVERSION_CMD_tf = "trustence_sign_cpio ${IMAGE_NAME}.rootfs.${type}" CONVERSION_CMD_tf = "trustence_sign_cpio ${IMAGE_NAME}.rootfs.${type}"
CONVERSION_DEPENDS_tf = "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" CONVERSION_DEPENDS_tf = "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
IMAGE_TYPES += "cpio.gz.u-boot.tf" IMAGE_TYPES += "cpio.gz.u-boot.tf"
################################################################################ ################################################################################

6
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -6,7 +6,7 @@
include conf/machine/include/ccimx6.inc include conf/machine/include/ccimx6.inc
# Wireless external module # Wireless external module
WIRELESS_MODULE_append = " ${@base_conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface # Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0" WLAN_P2P_INTERFACE ?= "p2p0"
@ -19,8 +19,8 @@ MACHINE_EXTRA_RRECOMMENDS += " \
MACHINE_FEATURES += "cryptochip" MACHINE_FEATURES += "cryptochip"
# Firmware # Firmware
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d" PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d"

4
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -6,8 +6,8 @@
include conf/machine/include/ccimx6.inc include conf/machine/include/ccimx6.inc
# Firmware # Firmware
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"
PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d" PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d"

6
meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
View File

@ -6,7 +6,7 @@
include conf/machine/include/ccimx8x.inc include conf/machine/include/ccimx8x.inc
# Wireless external module # Wireless external module
WIRELESS_MODULE_append = " ${@base_conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface # Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0" WLAN_P2P_INTERFACE ?= "p2p0"
@ -17,8 +17,8 @@ MACHINE_EXTRA_RRECOMMENDS += " \
" "
# Firmware # Firmware
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)

6
meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
View File

@ -6,7 +6,7 @@
include conf/machine/include/ccimx8x.inc include conf/machine/include/ccimx8x.inc
# Wireless external module # Wireless external module
WIRELESS_MODULE_append = " ${@base_conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface # Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0" WLAN_P2P_INTERFACE ?= "p2p0"
@ -17,8 +17,8 @@ MACHINE_EXTRA_RRECOMMENDS += " \
" "
# Firmware # Firmware
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)

6
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -14,7 +14,7 @@ UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
# Wireless external module # Wireless external module
WIRELESS_MODULE ?= "" WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@base_conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface # Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0" WLAN_P2P_INTERFACE ?= "p2p0"
@ -41,8 +41,8 @@ MACHINE_EXTRA_RRECOMMENDS_remove_use-mainline-bsp = "${@bb.utils.contains('COMBI
MACHINE_FEATURES += "wifi bluetooth cryptochip" MACHINE_FEATURES += "wifi bluetooth cryptochip"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
# mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files) # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size. # Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.

2
meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
View File

@ -45,7 +45,7 @@ FW_QCA6574_WIFI_COMMUNITY = " \
" "
FW_QUALCOMM_WIFI ?= "${FW_QCA6564_WIFI_PROPRIETARY}" FW_QUALCOMM_WIFI ?= "${FW_QCA6564_WIFI_PROPRIETARY}"
FW_QUALCOMM_WIFI_ccimx8x = "${@base_conditional('QUALCOMM_WIFI_DRIVER', 'community', '${FW_QCA6574_WIFI_COMMUNITY}', '${FW_QCA6574_WIFI_PROPRIETARY}', d)}" FW_QUALCOMM_WIFI_ccimx8x = "${@oe.utils.conditional('QUALCOMM_WIFI_DRIVER', 'community', '${FW_QCA6574_WIFI_COMMUNITY}', '${FW_QCA6574_WIFI_PROPRIETARY}', d)}"
SRC_URI = " \ SRC_URI = " \
${FW_QUALCOMM_BT} \ ${FW_QUALCOMM_BT} \

2
meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc
View File

@ -8,7 +8,7 @@ LICENSE = "CLOSED"
DEPENDS = "openssl" DEPENDS = "openssl"
SRC_URI = " \ SRC_URI = " \
${@base_conditional('TRUSTFENCE_SIGN', '1', 'file://cst-${PV}.tar.gz', '', d)} \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'file://cst-${PV}.tar.gz', '', d)} \
file://0001-gen_auth_encrypted_data-reuse-existing-DEK-file.patch \ file://0001-gen_auth_encrypted_data-reuse-existing-DEK-file.patch \
file://0002-hab4_pki_tree.sh-automate-script.patch \ file://0002-hab4_pki_tree.sh-automate-script.patch \
file://0003-openssl_helper-use-dev-urandom-as-seed-source.patch \ file://0003-openssl_helper-use-dev-urandom-as-seed-source.patch \

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
View File

@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
DEPENDS += "dtc-native u-boot-mkimage-native" DEPENDS += "dtc-native u-boot-mkimage-native"
DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
PROVIDES += "u-boot" PROVIDES += "u-boot"
@ -15,7 +15,7 @@ SRCBRANCH = "v2015.04/master"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
# Select internal or Github U-Boot repo # Select internal or Github U-Boot repo
UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
SRC_URI = " \ SRC_URI = " \
${UBOOT_GIT_URI};branch=${SRCBRANCH} \ ${UBOOT_GIT_URI};branch=${SRCBRANCH} \

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
View File

@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
SECTION = "bootloaders" SECTION = "bootloaders"
DEPENDS += "bc-native dtc-native u-boot-mkimage-native" DEPENDS += "bc-native dtc-native u-boot-mkimage-native"
DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
PROVIDES += "u-boot" PROVIDES += "u-boot"
@ -18,7 +18,7 @@ SRCREV = "${AUTOREV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
# Select internal or Github U-Boot repo # Select internal or Github U-Boot repo
UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
SRC_URI = " \ SRC_URI = " \
${UBOOT_GIT_URI};branch=${SRCBRANCH} \ ${UBOOT_GIT_URI};branch=${SRCBRANCH} \

2
meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
View File

@ -1,5 +1,5 @@
# Copyright (C) 2016 Digi International. # Copyright (C) 2016 Digi International.
RDEPENDS_${PN} += " \ RDEPENDS_${PN} += " \
${@base_conditional('TRUSTFENCE_SIGN', '1', 'nativesdk-trustfence-sign-tools nativesdk-trustfence-cst', '', d)} \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'nativesdk-trustfence-sign-tools nativesdk-trustfence-cst', '', d)} \
" "

2
meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
View File

@ -11,7 +11,7 @@ SRCREV = "${AUTOREV}"
S = "${WORKDIR}" S = "${WORKDIR}"
# Select internal or Github U-Boot repo # Select internal or Github U-Boot repo
UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
SRC_URI = " \ SRC_URI = " \
${UBOOT_GIT_URI};branch=${SRCBRANCH} \ ${UBOOT_GIT_URI};branch=${SRCBRANCH} \

8
meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
View File

@ -13,7 +13,7 @@ SRCBRANCH = "dey-2.4/master"
SRCBRANCH_ccimx8x = "dey-2.4/master_cc8x" SRCBRANCH_ccimx8x = "dey-2.4/master_cc8x"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
QCOM_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git', d)}" 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', d)}"
SRC_URI = " \ SRC_URI = " \
${QCOM_GIT_URI};branch=${SRCBRANCH} \ ${QCOM_GIT_URI};branch=${SRCBRANCH} \
@ -32,7 +32,7 @@ FILES_SDIO = " \
file://modprobe-qualcomm.conf \ file://modprobe-qualcomm.conf \
" "
SRC_URI_append = "${@base_conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , '${FILES_SDIO}', '', d)}" SRC_URI_append = "${@oe.utils.conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , '${FILES_SDIO}', '', d)}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@ -47,10 +47,10 @@ EXTRA_OEMAKE += "CONFIG_NON_QC_PLATFORM=y"
EXTRA_OEMAKE += "BUILD_DEBUG_VERSION=0" EXTRA_OEMAKE += "BUILD_DEBUG_VERSION=0"
# Flags for SDIO interface with wifi # Flags for SDIO interface with wifi
FLAGS_SDIO = "CONFIG_CLD_HL_SDIO_CORE=y" FLAGS_SDIO = "CONFIG_CLD_HL_SDIO_CORE=y"
EXTRA_OEMAKE += "${@base_conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , '${FLAGS_SDIO}', '', d)}" EXTRA_OEMAKE += "${@oe.utils.conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , '${FLAGS_SDIO}', '', d)}"
# Flags for PCI interface with wifi # Flags for PCI interface with wifi
FLAGS_PCI = "CONFIG_ROME_IF=pci CONFIG_HIF_PCI=1 CONFIG_ATH_PCIE_ACCESS_DEBUG=1 CONFIG_ATH_PCIE_MAX_PERF=1" FLAGS_PCI = "CONFIG_ROME_IF=pci CONFIG_HIF_PCI=1 CONFIG_ATH_PCIE_ACCESS_DEBUG=1 CONFIG_ATH_PCIE_MAX_PERF=1"
EXTRA_OEMAKE += "${@base_conditional('QUALCOMM_WIFI_INTERFACE', 'pci' , '${FLAGS_PCI}', '', d)}" EXTRA_OEMAKE += "${@oe.utils.conditional('QUALCOMM_WIFI_INTERFACE', 'pci' , '${FLAGS_PCI}', '', d)}"
# Flags required for QCA6574 # Flags required for QCA6574
EXTRA_OEMAKE_append_ccimx8x = " CONFIG_ARCH_MSM=n CONFIG_ARCH_QCOM=n CONFIG_ATH_11AC_TXCOMPACT=1" EXTRA_OEMAKE_append_ccimx8x = " CONFIG_ARCH_MSM=n CONFIG_ARCH_QCOM=n CONFIG_ATH_11AC_TXCOMPACT=1"

2
meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
View File

@ -9,7 +9,7 @@ SRCBRANCH_ccimx8x = "v4.9.88/master"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
# Select internal or Github Linux repo # Select internal or Github Linux repo
LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

6
meta-digi-arm/recipes-kernel/linux/linux-dey.inc
View File

@ -6,16 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
LIC_FILES_CHKSUM_use-mainline-bsp = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LIC_FILES_CHKSUM_use-mainline-bsp = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "lzop-native bc-native" DEPENDS += "lzop-native bc-native"
DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
inherit kernel fsl-kernel-localversion inherit kernel fsl-kernel-localversion
require recipes-kernel/linux/linux-dey-src.inc require recipes-kernel/linux/linux-dey-src.inc
# Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared # Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared
SRC_URI += "${@base_conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}" SRC_URI += "${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}"
do_deploy[postfuncs] += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence_sign', '', d)}" do_deploy[postfuncs] += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence_sign', '', d)}"
trustfence_sign() { trustfence_sign() {
# Set environment variables for trustfence configuration # Set environment variables for trustfence configuration

2
meta-digi-dey/classes/dey-image.bbclass
View File

@ -31,7 +31,7 @@ inherit ${@bb.utils.contains("IMAGE_FEATURES", "dey-qt", "populate_sdk_qt5", "",
# Generate ZIP installer if configured in the project's local.conf # Generate ZIP installer if configured in the project's local.conf
# #
DEY_IMAGE_INSTALLER ?= "0" DEY_IMAGE_INSTALLER ?= "0"
inherit ${@base_conditional("DEY_IMAGE_INSTALLER", "1", "dey-image-installer", "", d)} inherit ${@oe.utils.conditional("DEY_IMAGE_INSTALLER", "1", "dey-image-installer", "", d)}
# #
# Create a dey-version file when populating the toolchain/SDK # Create a dey-version file when populating the toolchain/SDK

2
meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
View File

@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
# be already generated in order to copy the public key. Forcing a dependence against # be already generated in order to copy the public key. Forcing a dependence against
# 'virtual/kernel' ensures that the keys are already generated as they are needed to sign the # 'virtual/kernel' ensures that the keys are already generated as they are needed to sign the
# kernel artifacts. # kernel artifacts.
DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'virtual/kernel openssl-native', '', d)}" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'virtual/kernel openssl-native', '', d)}"
SRC_URI = " \ SRC_URI = " \
file://recovery-initramfs-init \ file://recovery-initramfs-init \

2
meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb
View File

@ -22,7 +22,7 @@ INITSCRIPT_PARAMS = "start 99 5 ."
do_install () { do_install () {
install -m 0755 -d ${D}${sysconfdir}/default install -m 0755 -d ${D}${sysconfdir}/default
AUTOGETTY_ENABLE='${@base_conditional( "TRUSTFENCE_CONSOLE_DISABLE", "1", "1", "0", d )}' AUTOGETTY_ENABLE='${@oe.utils.conditional( "TRUSTFENCE_CONSOLE_DISABLE", "1", "1", "0", d )}'
install -m 0644 ${WORKDIR}/autogetty ${D}${sysconfdir}/default/autogetty install -m 0644 ${WORKDIR}/autogetty ${D}${sysconfdir}/default/autogetty
sed -i -e "s/##ENABLED##/${AUTOGETTY_ENABLE}/g" ${D}${sysconfdir}/default/autogetty sed -i -e "s/##ENABLED##/${AUTOGETTY_ENABLE}/g" ${D}${sysconfdir}/default/autogetty

2
meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
View File

@ -13,7 +13,7 @@ SRCREV = "${AUTOREV}"
CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh"
CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git"
CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" 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};branch=${SRCBRANCH}"

2
meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
View File

@ -20,7 +20,7 @@ SRCREV = "${AUTOREV}"
CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"
CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" 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};branch=${SRCBRANCH}"

2
meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
View File

@ -13,7 +13,7 @@ SRCREV = "${AUTOREV}"
CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"
CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" 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};branch=${SRCBRANCH}"

2
meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb
View File

@ -13,7 +13,7 @@ SRCREV = "${AUTOREV}"
LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
LIBDIGIAPIX_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git" LIBDIGIAPIX_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"
LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}"
SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}" SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}"

2
meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb
View File

@ -11,7 +11,7 @@ SRC_URI = "file://opengles"
S = "${WORKDIR}/opengles" S = "${WORKDIR}/opengles"
EXTRA_OEMAKE = "EGL_FLAVOUR=${@base_conditional('HAVE_GUI', '1' , 'x11', 'fb', d)}" EXTRA_OEMAKE = "EGL_FLAVOUR=${@oe.utils.conditional('HAVE_GUI', '1' , 'x11', 'fb', d)}"
do_install () { do_install () {
oe_runmake DEST_DIR="${D}" install oe_runmake DEST_DIR="${D}" install

2
meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
View File

@ -14,7 +14,7 @@ SRCREV = "${AUTOREV}"
LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh"
LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protocol=git" LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protocol=git"
LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}"
SRC_URI = " \ SRC_URI = " \
${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \

2
meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb
View File

@ -5,6 +5,6 @@ SUMMARY = "DEY trustfence packagegroup"
inherit packagegroup inherit packagegroup
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
${@base_conditional('TRUSTFENCE_CONSOLE_DISABLE', '1', 'auto-serial-console', '', d)} \ ${@oe.utils.conditional('TRUSTFENCE_CONSOLE_DISABLE', '1', 'auto-serial-console', '', d)} \
" "
do_package[vardeps] += "TRUSTFENCE_CONSOLE_DISABLE" do_package[vardeps] += "TRUSTFENCE_CONSOLE_DISABLE"

2
meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend
View File

@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
LIBSOC_URI_STASH = "${DIGI_MTK_GIT}dey/libsoc.git;protocol=ssh" LIBSOC_URI_STASH = "${DIGI_MTK_GIT}dey/libsoc.git;protocol=ssh"
LIBSOC_URI_GITHUB = "git://github.com/jackmitch/libsoc.git;protocol=git" LIBSOC_URI_GITHUB = "git://github.com/jackmitch/libsoc.git;protocol=git"
LIBSOC_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBSOC_URI_STASH}', '${LIBSOC_URI_GITHUB}', d)}" LIBSOC_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBSOC_URI_STASH}', '${LIBSOC_URI_GITHUB}', d)}"
SRCREV = "dc62bb1f04c13d0423078b1af2bb439c62023d6c" SRCREV = "dc62bb1f04c13d0423078b1af2bb439c62023d6c"
SRC_URI = " \ SRC_URI = " \