From ef9eb285e54fcf20a1aec7ab766f0d9e6bd832fc Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Wed, 29 May 2024 13:13:17 -0700 Subject: [PATCH] meta: update -native recipes to use inherit_defer to improve compatibility with devtool. Signed-off-by: Matt Madison --- recipes-bsp/tegra-binaries/tegra-flashtools-native_36.3.0.bb | 2 +- .../tegra-binaries/tegra-helper-scripts-native_36.3.0.bb | 2 +- recipes-bsp/uefi/edk2-basetools-tegra-native_36.3.0.bb | 2 +- recipes-devtools/ccache/cuda-compiler-check-native_1.0.bb | 2 +- recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb | 2 +- recipes-l4t-workarounds/tar/tar-l4t-workaround-native_1.0.bb | 2 +- recipes-support/sbsigntool/sbsigntool-native_git.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-bsp/tegra-binaries/tegra-flashtools-native_36.3.0.bb b/recipes-bsp/tegra-binaries/tegra-flashtools-native_36.3.0.bb index 9dff5524..5aad4a1d 100644 --- a/recipes-bsp/tegra-binaries/tegra-flashtools-native_36.3.0.bb +++ b/recipes-bsp/tegra-binaries/tegra-flashtools-native_36.3.0.bb @@ -18,7 +18,7 @@ B = "${WORKDIR}/build" COMPATIBLE_MACHINE = "" -inherit native +inherit_defer native INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "tegra-helper-scripts-native" diff --git a/recipes-bsp/tegra-binaries/tegra-helper-scripts-native_36.3.0.bb b/recipes-bsp/tegra-binaries/tegra-helper-scripts-native_36.3.0.bb index 3ae593dc..3b5eedc4 100644 --- a/recipes-bsp/tegra-binaries/tegra-helper-scripts-native_36.3.0.bb +++ b/recipes-bsp/tegra-binaries/tegra-helper-scripts-native_36.3.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda INHIBIT_DEFAULT_DEPS = "1" -inherit native +inherit_defer native SRC_URI = " \ file://tegra-flash-helper.sh \ diff --git a/recipes-bsp/uefi/edk2-basetools-tegra-native_36.3.0.bb b/recipes-bsp/uefi/edk2-basetools-tegra-native_36.3.0.bb index 8e26cd5e..632c7e09 100644 --- a/recipes-bsp/uefi/edk2-basetools-tegra-native_36.3.0.bb +++ b/recipes-bsp/uefi/edk2-basetools-tegra-native_36.3.0.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-2-Clause-Patent" require edk2-firmware-core-tegra-36.3.0.inc -inherit native +inherit_defer native RDEPENDS:${PN} += "python3-core" diff --git a/recipes-devtools/ccache/cuda-compiler-check-native_1.0.bb b/recipes-devtools/ccache/cuda-compiler-check-native_1.0.bb index 509ecb2c..98ca7d3f 100644 --- a/recipes-devtools/ccache/cuda-compiler-check-native_1.0.bb +++ b/recipes-devtools/ccache/cuda-compiler-check-native_1.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://cuda-compiler-check.sh" -inherit native +inherit_defer native S = "${WORKDIR}/sources" UNPACKDIR = "${S}" diff --git a/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb b/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb index 646e5c03..d4563427 100644 --- a/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb +++ b/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb @@ -8,7 +8,7 @@ SRC_URI = "file://cuda_environment_setup.sh.in \ S = "${WORKDIR}/sources" UNPACKDIR = "${S}" -inherit nativesdk +inherit_defer nativesdk do_install() { install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d diff --git a/recipes-l4t-workarounds/tar/tar-l4t-workaround-native_1.0.bb b/recipes-l4t-workarounds/tar/tar-l4t-workaround-native_1.0.bb index acb7d489..ab94e0af 100644 --- a/recipes-l4t-workarounds/tar/tar-l4t-workaround-native_1.0.bb +++ b/recipes-l4t-workarounds/tar/tar-l4t-workaround-native_1.0.bb @@ -6,7 +6,7 @@ SRC_URI = "file://tar-wrapper.sh" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" -inherit native +inherit_defer native do_configure() { : diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb index a353e6ca..246794c6 100644 --- a/recipes-support/sbsigntool/sbsigntool-native_git.bb +++ b/recipes-support/sbsigntool/sbsigntool-native_git.bb @@ -36,7 +36,7 @@ PV = "0.9.4-git" S = "${WORKDIR}/git" inherit autotools pkgconfig -inherit native +inherit_defer native do_configure:prepend() { cd ${S}