From 82c8812822e27a80b7ac87cb2ff99884be88816b Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 21 Jan 2022 13:09:07 -0800 Subject: base-pdi: Move COMPATIBLE_MACHINE to .* Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb | 2 +- meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb index 4e940642..aa2c550e 100644 --- a/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb +++ b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb @@ -5,7 +5,7 @@ LICENSE = "CLOSED" PROVIDES = "virtual/base-pdi" COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:versal = "versal" +COMPATIBLE_MACHINE:versal = ".*" PACKAGE_ARCH ?= "${MACHINE_ARCH}" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb index e35c0e30..4e02cb40 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb @@ -4,19 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda INHIBIT_DEFAULT_DEPS = "1" -python () { - # The device trees must be populated in the deploy directory to correctly - # detect them and their names. This means that this recipe needs to depend - # on those deployables just like the image recipe does. - deploydeps = ["virtual/kernel"] - for i in (d.getVar("EXTRA_IMAGEDEPENDS") or "").split(): - if i != d.getVar("BPN"): - deploydeps.append(i) - - # add as DEPENDS since the targets might not have do_deploy tasks - if len(deploydeps) != 0: - d.appendVar("DEPENDS", " " + " ".join(deploydeps)) -} +DEPENDS:append := "virtual/kernel ${@oe.utils.str_filter_out(d.getVar("BPN"), d.getVar("EXTRA_IMAGEDEPENDS"), d)}" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:zynq = ".*" -- cgit v1.2.3-54-g00ecf