From b747b01501d19a160612711b0bdc1cee0c24f670 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 28 Jun 2025 18:02:29 +0200 Subject: [PATCH] global: whinlatter updates for WORKDIR/UNPACKDIR and git fetch location The series [1] changed the way sources are fetched/unpacked and S needs to follow that. Additionally for git repos it moved away from having 'git/' as the checkout directory. This has been partly tested by building weston based image for imx6/imx6ull/imx7/imx8/imx8mm/imx8mp/imx95 based images. E.g. none of the recipes specific for qoriq is built time tested. As walnascar is no longer compatible with master/whinlatter drop it from LAYERSERIES_COMPAT. [1] https://lore.kernel.org/openembedded-core/20250616095000.2918921-1-alex.kanavin@gmail.com/ Signed-off-by: Max Krummenacher --- classes/fsl-eula-unpack.bbclass | 2 +- conf/layer.conf | 2 +- .../recipes-bsp/imx-oei/imx-oei_1.0.0.bb | 2 -- .../imx-system-manager_1.0.0.bb | 2 -- .../recipes-dpaa/fmc/fmc_git.bb | 2 -- recipes-bsp/atf/qoriq-atf-2.6.inc | 3 --- recipes-bsp/boot-format/boot-format_git.bb | 1 - recipes-bsp/ddr-phy/ddr-phy_git.bb | 2 -- .../dp-firmware-cadence_22.04.bb | 2 +- .../firmware-imx/firmware-ele-imx_2.0.1.bb | 2 +- recipes-bsp/firmware-imx/firmware-imx-8.27.inc | 2 +- .../firmware-imx/firmware-nxp-wifi_1.1.bb | 2 -- .../firmware-imx/firmware-sof-imx_2.3.0.bb | 2 +- .../firmware-upower/firmware-upower_1.3.1.bb | 2 +- recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb | 2 -- recipes-bsp/imx-atf/imx-atf_2.10.bb | 2 -- recipes-bsp/imx-kobs/imx-kobs_git.bb | 1 - recipes-bsp/imx-lib/imx-lib_git.bb | 2 -- recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 2 -- .../imx-sc-firmware/imx-sc-firmware_1.18.0.bb | 2 +- recipes-bsp/imx-seco/imx-seco-libs_git.bb | 2 -- recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb | 2 +- .../imx-secure-enclave/imx-secure-enclave_git.bb | 2 -- recipes-bsp/imx-test/imx-test_git.bb | 2 -- recipes-bsp/imx-uuc/imx-uuc_git.bb | 2 -- .../imx-vpu-hantro-vc_1.10.1.bb | 2 +- .../imx-vpu-hantro-daemon_1.5.0.bb | 2 +- .../imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb | 2 +- recipes-bsp/inphi/inphi_git.bb | 2 -- recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb | 2 +- recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb | 2 +- .../libimxdmabuffer/libimxdmabuffer_1.1.3.bb | 3 --- recipes-bsp/ls2-phy/ls2-phy_git.bb | 2 -- recipes-bsp/mc-utils/mc-utils_git.bb | 2 -- recipes-bsp/mxsldr/mxsldr_git.bb | 2 -- recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb | 2 -- recipes-bsp/qe-ucode/qe-ucode_git.bb | 2 -- recipes-bsp/rcw/rcw_git.bb | 2 -- .../u-boot/u-boot-fslc-common_2025.01.inc | 1 - recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc | 1 - recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb | 1 - recipes-bsp/uefi/uefi_git.bb | 2 -- recipes-devtools/devregs/devregs_git.bb | 2 -- .../imx-usb-loader/imx-usb-loader_git.bb | 2 -- recipes-devtools/qemu/qemu-qoriq_4.2.bb | 2 -- recipes-devtools/qoriq-cst/qoriq-cst_git.bb | 2 -- recipes-devtools/utp-com/utp-com_git.bb | 2 -- recipes-devtools/uuu/uuu_git.bb | 2 -- .../spir/spirv-headers_1.3.275.0.imx.bb | 1 - .../spir/spirv-tools_1.3.275.0.imx.bb | 1 - .../vulkan/vulkan-headers_1.3.275.0.imx.bb | 2 -- .../vulkan/vulkan-loader_1.3.275.0.imx.bb | 2 -- .../vulkan/vulkan-tools_1.3.275.0.imx.bb | 2 -- .../vulkan-validation-layers_1.3.275.0.imx.bb | 2 -- recipes-dpaa/eth-config/eth-config_git.bb | 2 -- recipes-dpaa/flib/flib_git.bb | 2 -- recipes-dpaa/fm-ucode/fm-ucode_git.bb | 2 -- recipes-dpaa/fmlib/fmlib_git.bb | 2 -- recipes-dpaa2/aiopsl/aiopsl_git.bb | 2 -- recipes-dpaa2/dce/dce_git.bb | 2 -- recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb | 2 -- .../management-complex_10.39.0.bb | 2 -- recipes-dpaa2/restool/restool_git.bb | 2 -- recipes-dpaa2/spc/spc_git.bb | 2 -- recipes-extended/crconf/crconf_git.bb | 2 -- recipes-extended/dpdk/dpdk-20.11.inc | 2 -- recipes-extended/dpdk/dpdk.inc | 2 -- recipes-extended/jailhouse/jailhouse-imx_git.bb | 1 - recipes-extended/libpkcs11/libpkcs11_git.bb | 2 -- recipes-extended/odp/odp.inc | 1 - recipes-extended/ofp/ofp_git.bb | 2 -- recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb | 2 -- .../pktgen-dpdk/pktgen-dpdk_21.05.0.bb | 2 -- .../secure-obj/secure-obj-module_git.bb | 2 +- recipes-extended/secure-obj/secure-obj_git.bb | 2 -- recipes-extended/skmm-ep/skmm-ep_git.bb | 2 -- recipes-extended/testfloat/testfloat_2a.bb | 2 +- recipes-extended/tsntool/tsntool_git.bb | 2 -- recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb | 2 +- recipes-fsl/mcore-demos/imx-mcore-demos.inc | 2 +- recipes-graphics/drm/libdrm_2.4.123.imx.bb | 2 -- recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb | 2 +- recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | 2 -- .../imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb | 2 +- recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | 2 -- .../imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb | 2 -- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- recipes-graphics/mali/mali-imx_r53.0.bb | 2 +- .../wayland/wayland-protocols_1.37.imx.bb | 2 -- recipes-graphics/wayland/weston_10.0.5.imx.bb | 1 - recipes-graphics/wayland/weston_14.0.1.imx.bb | 1 - recipes-graphics/xwayland/xwayland_24.1.6.imx.bb | 2 +- recipes-kernel/ceetm/ceetm_git.bb | 2 -- .../kernel-modules/kernel-module-ar_git.bb | 2 -- ...kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb | 2 -- .../kernel-module-imx-gpu-viv_6.4.11.p3.0.bb | 4 ++-- .../kernel-modules/kernel-module-ipc.inc | 2 -- .../kernel-module-isp-vvcam_4.2.2.25.1.bb | 6 +++--- .../kernel-modules/kernel-module-ls-debug_git.bb | 2 -- .../kernel-modules/kernel-module-nxp-wlan_git.bb | 2 -- .../kernel-module-uio-seville_0.1.bb | 2 +- recipes-kernel/linux/linux-imx-headers_6.12.bb | 2 -- recipes-kernel/linux/linux-imx.inc | 2 -- recipes-kernel/linux/linux-qoriq.inc | 8 +++----- recipes-kernel/skmm-host/skmm-host_git.bb | 2 -- .../ethos-u-driver-stack_24.05.bb | 2 -- .../ethos-u-firmware_24.05.bb | 2 -- recipes-multimedia/alsa/imx-alsa-plugins_git.bb | 2 -- .../gstreamer/gst-examples_1.24.7.imx.bb | 2 +- .../gstreamer/gstreamer1.0-libav_1.24.7.imx.bb | 2 +- .../gstreamer1.0-plugins-bad_1.24.7.imx.bb | 2 +- .../gstreamer1.0-plugins-base_1.24.7.imx.bb | 2 +- .../gstreamer1.0-plugins-good_1.24.7.imx.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb | 2 -- .../gstreamer1.0-plugins-ugly_1.24.0.imx.bb | 2 +- .../gstreamer/gstreamer1.0-python_1.24.0.imx.bb | 2 +- .../gstreamer1.0-rtsp-server_1.24.0.imx.bb | 2 +- .../gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb | 2 +- .../gstreamer/gstreamer1.0_1.24.7.imx.bb | 2 +- .../gstreamer/imx-gst1.0-plugin_git.bb | 2 -- recipes-multimedia/imx-codec/imx-codec_4.9.3.bb | 2 +- recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb | 2 +- .../imx-opencl-converter_0.7.0.bb | 2 +- .../imx-parser/imx-parser_4.9.3.bb | 2 +- .../imx-vpuwrap/imx-vpuwrap_git.bb | 2 -- .../libimxvpuapi/libimxvpuapi2_2.3.1.bb | 2 -- .../libimxvpuapi/libimxvpuapi_git.bb | 2 -- .../tinycompress/tinycompress_1.2.5.bb | 2 -- recipes-security/optee-imx/optee-client-fslc.inc | 2 -- recipes-security/optee-imx/optee-os-fslc.inc | 1 - recipes-security/optee-imx/optee-test-fslc.inc | 1 - .../optee-qoriq/optee-client.nxp.inc | 1 - recipes-security/optee-qoriq/optee-os.nxp.inc | 1 - recipes-security/optee-qoriq/optee-test.nxp.inc | 1 - recipes-security/smw/keyctl-caam_git.bb | 2 -- recipes-security/smw/smw_git.bb | 2 +- recipes-support/opencv/opencv_4.6.0.imx.bb | 16 +++++++--------- 137 files changed, 54 insertions(+), 232 deletions(-) diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index 5b165e48..54b25b3a 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -166,7 +166,7 @@ python fsl_bin_do_unpack() { localdata = bb.data.createCopy(d) - rootdir = localdata.getVar('WORKDIR', True) + rootdir = localdata.getVar('UNPACKDIR', True) fetcher = bb.fetch2.Fetch(src_uri, localdata) found = 0 diff --git a/conf/layer.conf b/conf/layer.conf index 2ad2dc1e..4b0a5f77 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "freescale-layer" BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_freescale-layer = "5" -LAYERSERIES_COMPAT_freescale-layer = "walnascar whinlatter" +LAYERSERIES_COMPAT_freescale-layer = "whinlatter" LAYERDEPENDS_freescale-layer = "core" # Add the Freescale-specific licenses into the metadata diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb index d0713875..df704dc9 100644 --- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb +++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb @@ -11,8 +11,6 @@ IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https" SRCBRANCH = "master" SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678" -S = "${WORKDIR}/git" - inherit deploy PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb index eceaaa67..55826b01 100644 --- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb +++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb @@ -16,8 +16,6 @@ IMX_SYSTEM_MANAGER_SRC ?= "git://github.com/nxp-imx/imx-sm.git;protocol=https" SRCBRANCH = "master" SRCREV = "709deccd9338399eb39b5cf99a60eab4fa60d539" -S = "${WORKDIR}/git" - require imx-system-manager.inc PACKAGECONFIG ??= "m2" diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 2219a6c0..227b6291 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -9,8 +9,6 @@ DEPENDS = "libxml2 fmlib tclap" SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" SRCREV = "5b9f4b16a864e9dfa58cdcc860be278a7f66ac18" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \ TCLAP_HEADER_PATH="${STAGING_INCDIR}" ' diff --git a/recipes-bsp/atf/qoriq-atf-2.6.inc b/recipes-bsp/atf/qoriq-atf-2.6.inc index d5ef5e75..7a752ee9 100644 --- a/recipes-bsp/atf/qoriq-atf-2.6.inc +++ b/recipes-bsp/atf/qoriq-atf-2.6.inc @@ -7,6 +7,3 @@ ATF_BRANCH ?= "lf_v2.6" ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https" SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}" SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75" - -S = "${WORKDIR}/git" - diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb index 0916b45b..6b53e228 100644 --- a/recipes-bsp/boot-format/boot-format_git.bb +++ b/recipes-bsp/boot-format/boot-format_git.bb @@ -7,7 +7,6 @@ SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/boot-format;protocol=https;nobra file://flags.patch" SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550" -S = "${WORKDIR}/git" EXTRA_OEMAKE = 'CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"' do_install(){ diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb index 8ea92502..5cfeb935 100644 --- a/recipes-bsp/ddr-phy/ddr-phy_git.bb +++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb @@ -7,8 +7,6 @@ inherit deploy SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1;protocol=https" SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba" -S = "${WORKDIR}/git" - REGLEX = "lx2160a" DEPENDS += "qoriq-atf-tools-native" diff --git a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb index 01e3a2a6..79fff49e 100644 --- a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb +++ b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb @@ -8,7 +8,7 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-8.16.bin;fsl-eula=true" SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84" -S = "${WORKDIR}/firmware-imx-8.16" +S = "${UNPACKDIR}/firmware-imx-8.16" do_install () { install -d ${D}/boot diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb index d9a6218e..b785613a 100644 --- a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb +++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb @@ -11,7 +11,7 @@ SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" IMX_SRCREV_ABBREV = "19b6ee2" SRC_URI[sha256sum] = "14ad172ed70d2f16decca4b55e508dad32923390a298f10a598e8bc7778b6b66" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" do_compile[noexec] = "1" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc index 022289d3..20a66a1e 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc +++ b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc @@ -11,6 +11,6 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=tr IMX_SRCREV_ABBREV = "5af0ceb" SRC_URI[sha256sum] = "61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f" -S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}" inherit fsl-eula-unpack diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb index fe520ea8..59ce30d0 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb @@ -13,8 +13,6 @@ SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRC SRCBRANCH = "lf-6.12.3_1.0.0" SRCREV = "eef7ef94bc44cacd3b068f66658ef33391547daa" -S = "${WORKDIR}/git" - inherit allarch CLEANBROKEN = "1" diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb index 6e6f90ca..7c502276 100644 --- a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb +++ b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444" SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz" SRC_URI[sha256sum] = "eb86c90aec92b3b376e7afca6aa5db4767b5d8868553595907ba37665329f16b" -S = "${WORKDIR}/sof-imx-${PV}" +S = "${UNPACKDIR}/sof-imx-${PV}" inherit allarch diff --git a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb index 7592a629..2b5a9f50 100644 --- a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb +++ b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -S = "${WORKDIR}/${PN}-${PV}" +S = "${UNPACKDIR}/${PN}-${PV}" inherit fsl-eula-unpack pkgconfig deploy diff --git a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb index 3883c024..260b0100 100644 --- a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb +++ b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb @@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/fsl-tlu;protocol=https;nobranch=1" SRCREV = "8837cce3c86b30c0931c319e9e1a8ca622ae5354" -S = "${WORKDIR}/git" - do_install() { install -d ${D}${sbindir}/fsl_tlu find . -type f -exec cp {} ${D}${sbindir}/fsl_tlu/ \; diff --git a/recipes-bsp/imx-atf/imx-atf_2.10.bb b/recipes-bsp/imx-atf/imx-atf_2.10.bb index 13478bbe..7448c28c 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.10.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.10.bb @@ -12,8 +12,6 @@ SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANC SRCBRANCH = "lf_v2.10" SRCREV = "78a14c75a06dea39036c44ae0f9d23acc7bcaef2" -S = "${WORKDIR}/git" - inherit deploy ATF_PLATFORM ??= "INVALID" diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb index bdb02475..4f0ed79a 100644 --- a/recipes-bsp/imx-kobs/imx-kobs_git.bb +++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb @@ -12,7 +12,6 @@ SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \ file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \ " SRCREV = "ff13a99a22aa73cca0e09a33c2ebb6a94ad698da" -S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index cff0313e..a5df492d 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -17,8 +17,6 @@ SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANC SRCBRANCH = "lf-6.12.3_1.0.0" SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547" -S = "${WORKDIR}/git" - inherit use-imx-headers PLATFORM:mx6q-nxp-bsp = "IMX6Q" diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index ad464aee..3389b5b5 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -8,7 +8,5 @@ SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCB SRCBRANCH = "lf-6.12.3_1.0.0" SRCREV = "9e60b1f7a87a6397cf8db10e07293075f489e974" -S = "${WORKDIR}/git" - BOOT_TOOLS = "imx-boot-tools" SYSROOT_DIRS += "/boot" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb index 1354356b..42e8f6e1 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb @@ -12,7 +12,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" SRC_URI[sha256sum] = "392f1e5cdf1c8d7ed75409a2c46b00a332ace677f0e2700b587fe9ae800a1ff3" IMX_SRCREV_ABBREV = "654907b" -S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" BOARD_TYPE ?= "mek" SC_FIRMWARE_NAME ?= "INVALID" diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 353dcb91..fe366aac 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -16,8 +16,6 @@ SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRA file://0001-Fix-return-value-of-void-functions.patch" SRCREV = "273553f207425f773400be7a7f3a7c425d892d6f" -S = "${WORKDIR}/git" - TARGET_CC_ARCH += "${LDFLAGS}" do_install () { diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb index 352fc49e..2710297d 100644 --- a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb +++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb @@ -13,7 +13,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" SRC_URI[sha256sum] = "bd8dc01966076836aabff53f2463295294166595006e1db430db21b6ffa6b667" IMX_SRCREV_ABBREV = "0333596" -S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" do_compile[noexec] = "1" diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb index cebfbdf9..525824f7 100644 --- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb +++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb @@ -14,8 +14,6 @@ SRCREV = "dffbb844e86f4a49058ffbb40548474059969c27" PV = "lf-6.6.52_2.2.0" -S = "${WORKDIR}/git" - EXTRA_OEMAKE += "PLAT=ele" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 0a093469..46a00d4f 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -23,8 +23,6 @@ SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRAN SRCBRANCH = "lf-6.12.3_1.0.0" SRCREV = "92a497313016bfa536d561e13fcbad2d273ded4c" -S = "${WORKDIR}/git" - inherit module-base use-imx-headers INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb index 754e68eb..d373e27e 100644 --- a/recipes-bsp/imx-uuc/imx-uuc_git.bb +++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb @@ -12,8 +12,6 @@ PV = "0.5.1+git${SRCPV}" SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master" SRCREV = "25f65e10368aa07056f9536e88ed911ac7f38f99" -S = "${WORKDIR}/git" - do_install() { oe_runmake 'DESTDIR=${D}' install } diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb index 5aaf92c5..68c2a497 100644 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb @@ -14,7 +14,7 @@ IMX_SRCREV_ABBREV = "c0244a1" SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" # SCR is the location and name of the Software Content Register file # relative to ${D}${D_SUBDIR}. diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb index ac42b687..940b9fa4 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb @@ -11,7 +11,7 @@ IMX_SRCREV_ABBREV = "3200e68" SRC_URI[sha256sum] = "e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" PLATFORM:mx8mm-nxp-bsp = "IMX8MM" PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb index 3a171942..d766e019 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb @@ -15,7 +15,7 @@ IMX_SRCREV_ABBREV = "194a305" SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" inherit fsl-eula-unpack use-imx-headers diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb index 4deacb58..5c2e4197 100644 --- a/recipes-bsp/inphi/inphi_git.bb +++ b/recipes-bsp/inphi/inphi_git.bb @@ -7,8 +7,6 @@ inherit deploy SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;nobranch=1;protocol=https" SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695" -S = "${WORKDIR}/git" - do_install () { install -d ${D}/boot cp -fr ${S}/in112525-phy-ucode.txt ${D}/boot diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb index 550250b2..aebb28bb 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb @@ -12,7 +12,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" SRC_URI[sha256sum] = "49d1b3691d18e2ba5f43a6e2c59ac16767b6e077a118cafec7f51293d6bf30f3" -S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" do_compile[noexec] = "1" diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb index 25ffdd8a..28ab57b7 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb @@ -9,7 +9,7 @@ SRC_URI = " \ ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \ " IMX_SRCREV_ABBREV = "327f21d" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" SRC_URI[sha256sum] = "f57c6fe1c2dd1c8e5991a625d0b3a1dbfdfe6d39a1a116a904d543faa0f4f6f0" diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb index 5b04b1e2..b1cd3d86 100644 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb @@ -13,9 +13,6 @@ SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};pr file://run-ptest \ " - -S = "${WORKDIR}/git" - inherit pkgconfig waf use-imx-headers ptest EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \ diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb index c13a05a1..60ab5e18 100644 --- a/recipes-bsp/ls2-phy/ls2-phy_git.bb +++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb @@ -7,8 +7,6 @@ inherit deploy SRC_URI = "git://github.com/nxp/qoriq-firmware-cortina.git;nobranch=1;protocol=https" SRCREV = "9143c2a3adede595966583c00ca4edc99ec698cf" -S = "${WORKDIR}/git" - do_install () { install -d ${D}/boot cp -fr ${S}/* ${D}/boot diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb index 69630720..9e9f8d40 100644 --- a/recipes-bsp/mc-utils/mc-utils_git.bb +++ b/recipes-bsp/mc-utils/mc-utils_git.bb @@ -10,8 +10,6 @@ inherit deploy SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1" SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc" -S = "${WORKDIR}/git" - MC_CFG ?= "" MC_CFG:ls1088a = "ls1088a" MC_CFG:ls2088a = "ls2088a" diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb index 17da814f..9fc6338c 100644 --- a/recipes-bsp/mxsldr/mxsldr_git.bb +++ b/recipes-bsp/mxsldr/mxsldr_git.bb @@ -13,8 +13,6 @@ SRC_URI = "git://git.denx.de/mxsldr.git;branch=master \ PV = "0.0.0+git${SRCPV}" -S = "${WORKDIR}/git" - inherit pkgconfig do_compile() { diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb index bb542e8c..ddbb2031 100644 --- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb +++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb @@ -10,8 +10,6 @@ inherit deploy SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1;protocol=https" SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234" -S = "${WORKDIR}/git" - do_install () { install -d ${D}${nonarch_base_libdir}/firmware install -d ${D}/boot/engine-pfe-bin diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb index 9b76d24a..582fb1e4 100644 --- a/recipes-bsp/qe-ucode/qe-ucode_git.bb +++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb @@ -8,8 +8,6 @@ inherit deploy SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1;protocol=https" SRCREV = "c89d7843943fd3bd52aa5f1ff7a91200a2f7f63b" -S = "${WORKDIR}/git" - do_install () { install -d ${D}/boot install -m 644 ${B}/*.bin ${D}/boot diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index be166f44..b73dd975 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb @@ -10,8 +10,6 @@ inherit deploy siteinfo SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1" SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4" -S = "${WORKDIR}/git" - export PYTHON = "${USRBINPATH}/python3" M = "${@d.getVar('MACHINE').replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc index 13402850..9cc6b958 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc @@ -16,5 +16,4 @@ SRCBRANCH = "2025.01+fslc" PV = "2025.01+fslc+git${SRCPV}" CVE_PRODUCT = "denx:u-boot" -S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc index 01e3bbca..9640ba1d 100644 --- a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc +++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc @@ -18,7 +18,6 @@ DEPENDS += " \ xxd-native \ " -S = "${WORKDIR}/git" B = "${WORKDIR}/build" inherit fsl-u-boot-localversion diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb index bd495af9..c765cd2d 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb @@ -17,7 +17,6 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1" SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477" -S = "${WORKDIR}/git" B = "${WORKDIR}/build" PV:append = "+fslgit" LOCALVERSION = "+fsl" diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb index 268b5b1d..c0222a81 100644 --- a/recipes-bsp/uefi/uefi_git.bb +++ b/recipes-bsp/uefi/uefi_git.bb @@ -8,8 +8,6 @@ inherit deploy SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https" SRCREV = "55789d536850e00c6f2284fb28eaf21712cd276b" -S = "${WORKDIR}/git" - do_install () { if [ -d ${B}/${MACHINE} ]; then install -d ${D}/uefi diff --git a/recipes-devtools/devregs/devregs_git.bb b/recipes-devtools/devregs/devregs_git.bb index f24cb0f6..9d2155e1 100644 --- a/recipes-devtools/devregs/devregs_git.bb +++ b/recipes-devtools/devregs/devregs_git.bb @@ -8,6 +8,4 @@ SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=https;branch=ma PV = "1.0+${SRCPV}" -S = "${WORKDIR}/git" - inherit autotools diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb index deffd853..c14fd955 100644 --- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb +++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb @@ -10,8 +10,6 @@ SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;br PV = "1.0+${SRCPV}" -S = "${WORKDIR}/git" - do_install () { oe_runmake DESTDIR=${D} install } diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb index 5ac774ed..20ba6b53 100644 --- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb +++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb @@ -17,8 +17,6 @@ SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \ SRCREV = "14fda5a42df6c72e890d6a97ff88c5852172604b" -S = "${WORKDIR}/git" - python() { d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', '')) pkgs = d.getVar('PACKAGES').split() diff --git a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb index bcb4f8bf..95bf4eb6 100644 --- a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb +++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb @@ -21,8 +21,6 @@ SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \ " SRCREV = "e96dead3c339f6addb1600249be67e1884cdbcc5" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"' CFLAGS:append = ' -Wno-deprecated-declarations' diff --git a/recipes-devtools/utp-com/utp-com_git.bb b/recipes-devtools/utp-com/utp-com_git.bb index 85c80acb..364c91bc 100644 --- a/recipes-devtools/utp-com/utp-com_git.bb +++ b/recipes-devtools/utp-com/utp-com_git.bb @@ -11,8 +11,6 @@ SRC_URI = " \ PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git" - do_configure[noexec] = "1" do_compile () { diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb index e48698a8..c242c191 100644 --- a/recipes-devtools/uuu/uuu_git.bb +++ b/recipes-devtools/uuu/uuu_git.bb @@ -11,8 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5" inherit cmake pkgconfig -S = "${WORKDIR}/git" - DEPENDS = "libusb zlib bzip2 openssl zstd libtinyxml2" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb index 598a8fc2..caaf2cd3 100644 --- a/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb +++ b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb @@ -13,7 +13,6 @@ PE = "1" # The tags versions should always be sdk-x.y.z, as this is what # upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" inherit cmake diff --git a/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb index 05c6de1b..6b0c0a3f 100644 --- a/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb +++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb @@ -16,7 +16,6 @@ PE = "1" # The tags versions should always be sdk-x.y.z, as this is what # upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" inherit cmake diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb index aacec8ca..24630d0d 100644 --- a/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb @@ -13,8 +13,6 @@ SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40" -S = "${WORKDIR}/git" - inherit cmake FILES:${PN} += "${datadir}/vulkan" diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb index 7caed672..089b46b3 100644 --- a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb @@ -12,8 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https" SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229" -S = "${WORKDIR}/git" - REQUIRED_DISTRO_FEATURES = "vulkan" inherit cmake features_check pkgconfig diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb index f86912c9..f5fe8523 100644 --- a/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https" SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664" -S = "${WORKDIR}/git" - inherit cmake features_check pkgconfig ANY_OF_DISTRO_FEATURES = "x11 wayland" REQUIRED_DISTRO_FEATURES = "vulkan" diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb index 23958910..3068dd18 100644 --- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb @@ -11,8 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https" SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2" -S = "${WORKDIR}/git" - REQUIRED_DISTRO_FEATURES = "vulkan" DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries" diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb index aee2e234..858442af 100644 --- a/recipes-dpaa/eth-config/eth-config_git.bb +++ b/recipes-dpaa/eth-config/eth-config_git.bb @@ -8,8 +8,6 @@ PR = "r2" SRC_URI = "git://github.com/nxp-qoriq/eth-config;protocol=https;nobranch=1" SRCREV = "00fa9c6db5813735676b30b1516e30a460d61b28" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = "D=${D}" do_install() { diff --git a/recipes-dpaa/flib/flib_git.bb b/recipes-dpaa/flib/flib_git.bb index f1ebd87f..b7eafe62 100644 --- a/recipes-dpaa/flib/flib_git.bb +++ b/recipes-dpaa/flib/flib_git.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9f6d1afdf6b0f6b3ba65c25ba589ee53" SRC_URI = "git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1" SRCREV = "cbb31427466649c07d2ac2739a41bb42f5f6be7c" -S = "${WORKDIR}/git" - do_install(){ oe_runmake install DESTDIR=${D} } diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb index 22f04d01..77305958 100644 --- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb +++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb @@ -10,8 +10,6 @@ inherit deploy SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1;protocol=https" SRCREV = "41d603a1ad78e0bb61365500828d9f484bf9bf10" -S = "${WORKDIR}/git" - REGLEX ?= "${MACHINE}" REGLEX:t1023 = "t1024" REGLEX:t1040 = "t1040" diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb index 71ad3df1..02790d47 100644 --- a/recipes-dpaa/fmlib/fmlib_git.bb +++ b/recipes-dpaa/fmlib/fmlib_git.bb @@ -8,8 +8,6 @@ PR = "r1" SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1" SRCREV = "9fb916f255214013aa6003496c47bab0b5add2d9" -S = "${WORKDIR}/git" - CFLAGS += "-fmacro-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1 \ -fdebug-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1" diff --git a/recipes-dpaa2/aiopsl/aiopsl_git.bb b/recipes-dpaa2/aiopsl/aiopsl_git.bb index 68f7a8de..b57e33af 100644 --- a/recipes-dpaa2/aiopsl/aiopsl_git.bb +++ b/recipes-dpaa2/aiopsl/aiopsl_git.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=faf479bdc4702d8033049f97e153f876" BASEDEPENDS = "" -S = "${WORKDIR}/git" - SRC_URI = "git://github.com/nxp-qoriq/aiopsl;protocol=https;nobranch=1" SRCREV = "87d83d8e99770325cc7ad9e10965c9959e7cb828" diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb index 7beeb90f..219050b0 100644 --- a/recipes-dpaa2/dce/dce_git.bb +++ b/recipes-dpaa2/dce/dce_git.bb @@ -12,8 +12,6 @@ SRCREV_qbman = "2f92993a9f34e5221d6b36c63b9e30ef703e9ac3" SRCREV_FORMAT = "default_qbman" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' do_install () { diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb index befc769e..853dda9d 100644 --- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb +++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \ " SRCREV = "6ead470dde043f3ca67f1ba19b313dd64ec199e1" -S = "${WORKDIR}/git" - TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" KERNEL_PATH="${STAGING_KERNEL_DIR}"' diff --git a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb index 5097e71f..3b5ae98e 100644 --- a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb +++ b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb @@ -9,8 +9,6 @@ INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;nobranch=1" SRCREV = "7d82686272f8a60b803818bbc7c5396819ee3b06" -S = "${WORKDIR}/git" - REGLEX:ls2088a = "ls2088a" REGLEX:ls2080a = "ls2080a" REGLEX:ls1088a = "ls1088a" diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index d9e3b630..0ea40ec6 100644 --- a/recipes-dpaa2/restool/restool_git.bb +++ b/recipes-dpaa2/restool/restool_git.bb @@ -7,8 +7,6 @@ SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \ " SRCREV = "8c45e04363bf2a984a87b24d1dac80a286dd40d8" -S = "${WORKDIR}/git" - inherit bash-completion EXTRA_OEMAKE = 'CC="${CC}" MANPAGE= EXTRA_CFLAGS="-O2 -Wno-missing-field-initializers -Wno-missing-braces -Wno-maybe-uninitialized -Wno-date-time"' diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb index c54484be..93630a20 100644 --- a/recipes-dpaa2/spc/spc_git.bb +++ b/recipes-dpaa2/spc/spc_git.bb @@ -7,8 +7,6 @@ DEPENDS = "libxml2 fmlib tclap" SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1" SRCREV = "b8d69580e5c6aeeb9f1354ee2faed6e0134eaef4" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \ TCLAP_HEADER_PATH="${STAGING_INCDIR}" ' diff --git a/recipes-extended/crconf/crconf_git.bb b/recipes-extended/crconf/crconf_git.bb index 755365d6..ed76351e 100644 --- a/recipes-extended/crconf/crconf_git.bb +++ b/recipes-extended/crconf/crconf_git.bb @@ -8,8 +8,6 @@ EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}' SBINDIR='${sbindir}' MANDIR='${mandir} SRC_URI = "git://git.code.sf.net/p/crconf/code;protocol=https;nobranch=1" SRCREV = "c2b9595d739a9515a86ff3b1980b5cfdfcc42d68" -S = "${WORKDIR}/git" - do_install () { oe_runmake install DESTDIR=${D} } diff --git a/recipes-extended/dpdk/dpdk-20.11.inc b/recipes-extended/dpdk/dpdk-20.11.inc index 90b4c405..66bcda2f 100644 --- a/recipes-extended/dpdk/dpdk-20.11.inc +++ b/recipes-extended/dpdk/dpdk-20.11.inc @@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4 SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1" SRCREV = "f74b8bd5ab1c6ff76e956fc202a56aea2d200270" -S = "${WORKDIR}/git" - COMPATIBLE_MACHINE = "(qoriq-arm64)" CVE_PRODUCT = "data_plane_development_kit" diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index f2ab1370..eabd1865 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -26,8 +26,6 @@ export RTE_TARGET = "${DPDK_RTE_TARGET}" export RTE_OUTPUT = "${S}/${RTE_TARGET}" export MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net" -S = "${WORKDIR}/git" - EXTRA_OEMAKE += 'ETHTOOL_LIB_PATH="${S}/examples/ethtool/lib/${RTE_TARGET}" RTE_SDK="${S}" \ OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \ RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" EXAMPLES_BUILD_DIR="${RTE_TARGET}" \ diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index 2d0f2ff5..a955c8fd 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -33,7 +33,6 @@ DEPENDS = " \ inherit module bash-completion deploy setuptools3 -S = "${WORKDIR}/git" B = "${S}" JH_ARCH = "arm64" diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb index ca9f87ee..347a8ef9 100644 --- a/recipes-extended/libpkcs11/libpkcs11_git.bb +++ b/recipes-extended/libpkcs11/libpkcs11_git.bb @@ -9,8 +9,6 @@ SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741" DEPENDS = "openssl secure-obj" -S = "${WORKDIR}/git" - WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" export CROSS_COMPILE_HOST = "${CROSS_COMPILE}" export CROSS_COMPILE_TA = "${CROSS_COMPILE}" diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc index 0c90d0c5..34bd5138 100644 --- a/recipes-extended/odp/odp.inc +++ b/recipes-extended/odp/odp.inc @@ -22,6 +22,5 @@ SRCREV_qbman = "75ff61a7ca6acdbdbb780161b053cbcbc990f1be" SRCREV_rta = "bbab28b03ae21c52ce913f8b052acf53bd24ff5d" SRCREV_FORMAT = "default_qbman_rta" -S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1088a)" diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb index 47e54315..0f90dc5b 100644 --- a/recipes-extended/ofp/ofp_git.bb +++ b/recipes-extended/ofp/ofp_git.bb @@ -10,8 +10,6 @@ SRC_URI = "git://github.com/nxp-qoriq/ofp;protocol=https;nobranch=1" SRCREV = "fe66f4659f7d356f7aa73a8fb32fcf67c6cf1108" -S = "${WORKDIR}/git" - inherit autotools-brokensep pkgconfig PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb index 20d06dd6..a21bc69c 100644 --- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb +++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb @@ -10,8 +10,6 @@ inherit python3native pkgconfig SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1" SRCREV = "f2c0744d2f68c4cd2840d6e409d7b0520e4caf99" -S = "${WORKDIR}/git" - do_configure() { export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR} ${S}/boot.sh diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb index f04e1e9f..485f763b 100644 --- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb +++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb @@ -9,8 +9,6 @@ SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=https;nobranch=1 \ " SRCREV = "3a09aa916597fb9a97ee8eec50044cbdb9c4abde" -S = "${WORKDIR}/git" - DPAA_VER ?= "dpaa" export RTE_TARGET = "arm64-${DPAA_VER}-linuxapp-gcc" export RTE_SDK = "${RECIPE_SYSROOT}/usr/share/dpdk" diff --git a/recipes-extended/secure-obj/secure-obj-module_git.bb b/recipes-extended/secure-obj/secure-obj-module_git.bb index 1e5709b6..c6bbc41d 100644 --- a/recipes-extended/secure-obj/secure-obj-module_git.bb +++ b/recipes-extended/secure-obj/secure-obj-module_git.bb @@ -6,6 +6,6 @@ DEPENDS += "virtual/kernel" inherit module -S = "${WORKDIR}/git/securekeydev" +S = "${UNPACKDIR}/${BP}/securekeydev" EXTRA_OEMAKE += 'KERNEL_SRC="${STAGING_KERNEL_DIR}"' diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb index 64f59f47..4d197f57 100644 --- a/recipes-extended/secure-obj/secure-obj_git.bb +++ b/recipes-extended/secure-obj/secure-obj_git.bb @@ -2,8 +2,6 @@ require secure-obj.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -S = "${WORKDIR}/git" - DEPENDS:remove = " python3-pycryptodomex-native" DEPENDS:append = " python3-cryptography-native optee-os-qoriq-tadevkit" RDEPENDS:{PN} += "secure-obj-module" diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb index c08c9492..72638766 100644 --- a/recipes-extended/skmm-ep/skmm-ep_git.bb +++ b/recipes-extended/skmm-ep/skmm-ep_git.bb @@ -12,8 +12,6 @@ SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch= " SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = 'ARCH=${TARGET_ARCH} MACHINE=${MACHINE} EXTRA_LDFLAGS="${LDFLAGS}"' export LIBEDIT_CFLAGS = "`pkg-config --cflags libedit`" diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb index c5ea96a5..45e9365d 100644 --- a/recipes-extended/testfloat/testfloat_2a.bb +++ b/recipes-extended/testfloat/testfloat_2a.bb @@ -13,7 +13,7 @@ SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \ SRC_URI[TestFloat.sha256sum] = "84d14aa42adefbda2ec9708b42946f7fa59f93689b042684bd027863481f8e4e" SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515d56c5f18f2febf81" -S = "${WORKDIR}/TestFloat-2a" +S = "${UNPACKDIR}/TestFloat-2a" do_unpack2(){ mv ${UNPACKDIR}/SoftFloat-2b ${S}/SoftFloat-2b diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb index 2ad4a0c4..f70e64e2 100644 --- a/recipes-extended/tsntool/tsntool_git.bb +++ b/recipes-extended/tsntool/tsntool_git.bb @@ -16,8 +16,6 @@ SRC_URI:append = " \ file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \ " -S = "${WORKDIR}/git" - do_configure[depends] += "virtual/kernel:do_shared_workdir" do_compile:prepend() { diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb index 6791553b..489e6f8a 100644 --- a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb +++ b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb @@ -6,7 +6,7 @@ require imx-mcore-demos.inc LIC_FILES_CHKSUM:mx7d-nxp-bsp = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a" SRC_URI = "${FSL_MIRROR}/${SOC}-m4-freertos-${PV}.bin;fsl-eula=true" -S = "${WORKDIR}/${SOC}-m4-freertos-${PV}" +S = "${UNPACKDIR}/${SOC}-m4-freertos-${PV}" SRC_URI[sha256sum] = "cc00d3b936d49b2794a2a99e10129437e70caba3fd26b8379b8c50dd22f73254" diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos.inc b/recipes-fsl/mcore-demos/imx-mcore-demos.inc index b8e74710..9b9553fc 100644 --- a/recipes-fsl/mcore-demos/imx-mcore-demos.inc +++ b/recipes-fsl/mcore-demos/imx-mcore-demos.inc @@ -35,7 +35,7 @@ MCORE_TYPE:mx95-nxp-bsp = "m7" SRC_URI = "${FSL_MIRROR}/${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true" -S = "${WORKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}" +S = "${UNPACKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}" SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt" diff --git a/recipes-graphics/drm/libdrm_2.4.123.imx.bb b/recipes-graphics/drm/libdrm_2.4.123.imx.bb index 81b97782..e4208cff 100644 --- a/recipes-graphics/drm/libdrm_2.4.123.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.123.imx.bb @@ -16,8 +16,6 @@ IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https" SRCBRANCH = "libdrm-imx-2.4.123" SRCREV = "c7c4953161a0f8f2cc7bee70284bf3263c9cfcf5" -S = "${WORKDIR}/git" - DEFAULT_PREFERENCE = "-1" COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb index 77f01d79..bf0a127c 100644 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb @@ -23,7 +23,7 @@ IMX_SRCREV_ABBREV:imxmali = "8d2a88d" IMX_SRC_URI_NAME:imxmali = "v2" SRC_URI[v2.sha256sum] = "eb7108256cb55d996c07f6941d0d4a76beaf73458494b2c902d907bc8228eeeb" -S = "${WORKDIR}/${IMX_BIN_NAME}" +S = "${UNPACKDIR}/${IMX_BIN_NAME}" inherit fsl-eula-unpack diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 884b41ff..1f62398f 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb @@ -12,8 +12,6 @@ GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" SRCBRANCH = "imx_2.3" SRCREV = "7d12c50c07d73650b4c97906ce917aff429238f8" -S = "${WORKDIR}/git" - inherit pkgconfig PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb index 1b9d04f6..3c8784d0 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb @@ -15,7 +15,7 @@ IMX_SRCREV_ABBREV = "c600d03" SRC_URI[aarch64.sha256sum] = "e6c336c0b876efab7598a2d7817111772284487f646d5d83c400692f2cdfebe3" SRC_URI[arm.sha256sum] = "6e1a42f2c570582b8038d1b5c86dbdcd645e75cc10a1db23e716f662d1c1329f" -S = "${WORKDIR}/${IMX_BIN_NAME}" +S = "${UNPACKDIR}/${IMX_BIN_NAME}" inherit fsl-eula-unpack diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index 7184539e..9fd170ad 100644 --- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb @@ -15,8 +15,6 @@ IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" SRCBRANCH = "imx_2.3" SRCREV = "f3aabbcb7977a0a17c962c62b02bc829855f8edf" -S = "${WORKDIR}/git" - inherit use-imx-headers EXTRA_OEMAKE = "PLATFORM=IMX93 INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}" diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb index 18fad56e..5dea367a 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb @@ -9,8 +9,6 @@ SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_1 " SRCREV = "522cb2981289b7ba20d6dd4b4bf75097e079815b" -S = "${WORKDIR}/git" - inherit cmake pkgconfig perlnative python3native PACKAGECONFIG ??= " \ diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index b9fe6bb8..88081cc6 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -73,7 +73,7 @@ inherit fsl-eula-unpack FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" -S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" PACKAGECONFIG ?= "" diff --git a/recipes-graphics/mali/mali-imx_r53.0.bb b/recipes-graphics/mali/mali-imx_r53.0.bb index 65b91f55..74d9d0fa 100644 --- a/recipes-graphics/mali/mali-imx_r53.0.bb +++ b/recipes-graphics/mali/mali-imx_r53.0.bb @@ -7,7 +7,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" SRC_URI[sha256sum] = "67a008bc64af4f3d9ad91465af3c0c3ac90ff8dcbcdaed96036eccc62880c7a3" IMX_SRCREV_ABBREV = "f2226b0" -S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" inherit fsl-eula-unpack diff --git a/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb index 393278bc..f360706b 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb @@ -14,8 +14,6 @@ WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;pro SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}" SRCREV = "831a5389062e56dcb1aac4a5419e55e3002aafaf" -S = "${WORKDIR}/git" - UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" # NOTE: For i.MX drop allarch since the recipe is SOCARCH diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb index 2c74481a..a8440cf2 100644 --- a/recipes-graphics/wayland/weston_10.0.5.imx.bb +++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb @@ -166,7 +166,6 @@ SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.pat file://0001-g2d-renderer.c-Include-sys-stat.h.patch" SRCBRANCH = "weston-imx-10.0.5" SRCREV = "7129417ae04de57f9596ccf27f74ef967660a64f" -S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/recipes-graphics/wayland/weston_14.0.1.imx.bb b/recipes-graphics/wayland/weston_14.0.1.imx.bb index f6697470..96bde0fe 100644 --- a/recipes-graphics/wayland/weston_14.0.1.imx.bb +++ b/recipes-graphics/wayland/weston_14.0.1.imx.bb @@ -169,7 +169,6 @@ SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} " WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https" SRCBRANCH = "weston-imx-14.0.1" SRCREV = "0fd5d3ab75346e525b565039a7b8bf5d9008be78" -S = "${WORKDIR}/git" SRC_URI:remove = "file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch" diff --git a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb index 36d5cb72..1d7ee80f 100644 --- a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb +++ b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz" BP_ORIGINAL = "${BPN}-24.1.6" SRC_URI[sha256sum] = "737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7" -S = "${WORKDIR}/${BP_ORIGINAL}" +S = "${UNPACKDIR}/${BP_ORIGINAL}" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb index 9ed3f1f5..947a3128 100644 --- a/recipes-kernel/ceetm/ceetm_git.bb +++ b/recipes-kernel/ceetm/ceetm_git.bb @@ -9,8 +9,6 @@ SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \ " DEPENDS = "iproute2" -S = "${WORKDIR}/git" - export IPROUTE2_DIR = "${STAGING_DIR_TARGET}" WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" export CROSS_COMPILE = "${WRAP_TARGET_PREFIX}" diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb index 553e2013..054cb1fb 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb @@ -7,8 +7,6 @@ inherit module SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/auto-resp;branch=nxp/sdk-v2.0.x;protocol=https" SRCREV = "9a74743167dcfcfbca5056eedbff9a52337c9712" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}" export KERNEL_PATH diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb index 13793132..05323936 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb @@ -12,8 +12,6 @@ PV .= "+git${SRCPV}" SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c" SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" -S = "${WORKDIR}/git" - inherit module KERNEL_MODULE_AUTOLOAD = "galcore" diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb index 8a0c0bbe..f55ca708 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb @@ -7,14 +7,14 @@ allowing flexibility to use a newer graphics release with an older kernel." LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ +SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${S}/src \ file://Add-makefile.patch" KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" SRCBRANCH = "lf-6.12.y" LOCALVERSION = "-6.12.3-1.0.0" SRCREV = "d8c9f00d41b313a1ac122530524a62604c6871c9" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BP}" inherit module diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc index d2316fe0..50d8cca6 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc +++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc @@ -8,8 +8,6 @@ inherit module qoriq_build_64bit_kernel SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;protocol=https;nobranch=1" SRCREV = "74d662707558290f070f9589177db730444bc435" -S = "${WORKDIR}/git" - do_configure[depends] += "virtual/kernel:do_shared_workdir" do_compile:prepend () { cd ${S}/kernel diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb index 33c348ae..62dd737c 100644 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb @@ -9,14 +9,14 @@ ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" SRCBRANCH = "lf-6.12.y_1.0.0" SRCREV = "78d717bb22819df9d988ef1b4e3cca1acf61095d" -S = "${WORKDIR}/git/vvcam/v4l2" +S = "${UNPACKDIR}/${BP}/vvcam/v4l2" inherit module MODULES_MODULE_SYMVERS_LOCATION = "dwe" DEBUG_PREFIX_MAP:prepend = " \ - -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ - -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} " + -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} " COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb index ba156161..9c5ce8f1 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb @@ -10,8 +10,6 @@ inherit module autotools-brokensep SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ls-dbg;branch=nxp/master;protocol=https" SRCREV = "40501f6659e880d38508cdd34a4df2d348d1c68e" -S = "${WORKDIR}/git" - EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}" EXTRA_OEMAKE += 'SYSROOT="${D}"' diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb index 5b3b4775..70386dc0 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb @@ -16,8 +16,6 @@ SRC_URI = " \ " SRCREV = "0396cfb38ad73a3d587cd0f8c139b47801e70891" -S = "${WORKDIR}/git" - inherit module EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" diff --git a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb index efccc286..e7ae8556 100644 --- a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb +++ b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb @@ -7,6 +7,6 @@ SRCREV = "0f31fbcbe9ab1ab9c424da34f70c82314b16f8de" inherit module -S = "${WORKDIR}/git/uio-driver" +S = "${UNPACKDIR}/${BP}/uio-driver" COMPATIBLE_MACHINE = "(t1040|t1042)" diff --git a/recipes-kernel/linux/linux-imx-headers_6.12.bb b/recipes-kernel/linux/linux-imx-headers_6.12.bb index c8a2a345..2f5ba04e 100644 --- a/recipes-kernel/linux/linux-imx-headers_6.12.bb +++ b/recipes-kernel/linux/linux-imx-headers_6.12.bb @@ -15,8 +15,6 @@ SRCBRANCH = "lf-6.12.y" LOCALVERSION = "-lts-${SRCBRANCH}" SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a" -S = "${WORKDIR}/git" - do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index 4e391116..521bd794 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -19,8 +19,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH}" -S = "${WORKDIR}/git" - # Tell to kernel class that we would like to use our defconfig to configure the kernel. # Otherwise, the --allnoconfig would be used per default which leads to mis-configured # kernel. diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index 5d28ae84..7243a345 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -5,8 +5,6 @@ SUMMARY = "Linux Kernel for NXP QorIQ platforms" SECTION = "kernel" LICENSE = "GPL-2.0-only" -S = "${WORKDIR}/git" - DEPENDS:append = " libgcc" # not put Images into /boot of rootfs, install kernel-image if needed RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" @@ -44,13 +42,13 @@ do_merge_delta_config() { for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then oe_runmake -C ${S} O=${B} ${deltacfg} - elif [ -f "${WORKDIR}/${deltacfg}" ]; then - ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} + elif [ -f "${UNPACKDIR}/${deltacfg}" ]; then + ${S}/scripts/kconfig/merge_config.sh -m .config ${UNPACKDIR}/${deltacfg} elif [ -f "${deltacfg}" ]; then ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} fi done - cp .config ${WORKDIR}/defconfig + cp .config ${UNPACKDIR}/defconfig } addtask merge_delta_config before do_kernel_localversion after do_patch diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb index af8982b9..cc226bd9 100644 --- a/recipes-kernel/skmm-host/skmm-host_git.bb +++ b/recipes-kernel/skmm-host/skmm-host_git.bb @@ -8,8 +8,6 @@ inherit module qoriq_build_64bit_kernel SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-host;protocol=https;nobranch=1" SRCREV = "d5912ebdb8d3b29b1e2df52710e8821d1ce3eb80" -S = "${WORKDIR}/git" - EXTRA_OEMAKE = 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' FILES:${PN} += "/etc/skmm/ /usr/bin/" diff --git a/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb index e77bcf85..ae762cb9 100644 --- a/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb +++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb @@ -13,8 +13,6 @@ ETHOS_U_SRC ?= "git://github.com/nxp-imx/ethos-u-driver-stack-imx.git;protocol=h SRCBRANCH = "lf-6.12.3_1.0.0" SRCREV = "a80c51d77c91f1a8266afc5d8056fb981de4b504" -S = "${WORKDIR}/git" - inherit cmake setuptools3 SETUPTOOLS_BUILD_ARGS = "build_ext --library-dirs ${B}/driver_library" diff --git a/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb b/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb index 10afa617..1f16dce9 100644 --- a/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb +++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb @@ -12,8 +12,6 @@ ETHOS_U_FIRMWARE_SRC ?= "git://github.com/nxp-imx/ethos-u-firmware.git;protocol= SRCBRANCH = "lf-6.12.3_1.0.0" SRCREV = "3dbedc11bd2a4ba56af9fbe9d285b5bf13f1a088" -S = "${WORKDIR}/git" - ETHOS_U_FIRMWARE = "ethosu_firmware" ETHOS_U_FIRMWARE:imx93-9x9-lpddr4-qsb = "ethosu_firmware_9x9" ETHOS_U_FIRMWARE:imx93-11x11-lpddr4x-evk = "ethosu_firmware_11x11" diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb index 7ad815b1..e87a4702 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb @@ -23,8 +23,6 @@ SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=$ SRCBRANCH = "MM_04.09.03_2412_L6.12.y" SRCREV = "eaf0900662d6381bcc433165219280cca1752890" -S = "${WORKDIR}/git" - CFLAGS:append = " -I${STAGING_INCDIR_IMX}" PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}" diff --git a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb index 3830846b..9db0051a 100644 --- a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb @@ -17,7 +17,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;b SRCREV = "0f1e984e41ce8d6d0758265d35e8b10d5815fde2" -S = "${WORKDIR}/git/subprojects/gst-examples" +S = "${UNPACKDIR}/${BP}/subprojects/gst-examples" inherit meson pkgconfig features_check diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb index accca06a..bf61d419 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz" SRC_URI[sha256sum] = "c3e4179ba183c2d3101edf87ff70dd07e728c766a5fee34e6ecded76ca5802df" -S = "${WORKDIR}/gst-libav-${@get_gst_ver('${PV}')}" +S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb index 7f5cd0b3..7aa22436 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb @@ -190,7 +190,7 @@ GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protoc SRCBRANCH = "MM_04.09.03_2412_L6.12.y" SRCREV = "7bb1254fcb0a0dcb1ecb4ac21efbc5068151943d" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BP}" inherit use-imx-headers diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb index 6859d26b..ed6e0243 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb @@ -121,7 +121,7 @@ GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;prot SRCBRANCH = "MM_04.09.03_2412_L6.12.y" SRCREV = "858ae5a1fb2bd2692ca7ebbd5bde2eee14e1842d" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BP}" inherit use-imx-headers diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb index 933adb5e..28044ccd 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb @@ -114,7 +114,7 @@ GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;prot SRCBRANCH = "MM_04.09.03_2412_L6.12.y" SRCREV = "626a972e9ef448f1017cfad07a3486a0fb340a0d" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BP}" COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb index f09a5bc7..cc2cedfd 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb @@ -18,8 +18,6 @@ SRCBRANCH ?= "master" SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387" SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" -S = "${WORKDIR}/git" - inherit pkgconfig meson use-imx-headers # libg2d on i.MX8 SoCs with a DPU is emulated via the DPU. diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb index 55bb975b..23b8c72c 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb @@ -16,7 +16,7 @@ SRC_URI = " \ " SRC_URI[sha256sum] = "c5d1cbdf71ab0c675bca236f70edfa1feb3f813fd4bfff563308f466d8805ca5" -S = "${WORKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}" +S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}" DEPENDS += "gstreamer1.0-plugins-base" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb index 0ba9a1ae..cac54e88 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb @@ -18,7 +18,7 @@ RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" PNREAL = "gst-python" -S = "${WORKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}" +S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}" EXTRA_OEMESON += "\ -Dtests=disabled \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb index c866d233..58255b99 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ SRC_URI[sha256sum] = "5b0fa6b12ba95b1d336a4b274cbe19e982aa3e6819f1d97bfd8e0102b103ed9b" -S = "${WORKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}" +S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}" inherit meson pkgconfig upstream-version-is-even gobject-introspection diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb index dde7b5b1..3993730e 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb @@ -13,7 +13,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-1.24.0.tar. SRC_URI[sha256sum] = "6b1f3b91ca65dedc67dc67a25dc1d1e464f11825a27ab9c7ac7c1bda67f03596" -S = "${WORKDIR}/${REALPN}-${@get_gst_ver('${PV}')}" +S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${PV}')}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" inherit meson pkgconfig features_check upstream-version-is-even diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb index 8daeed66..a5fc8844 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb @@ -103,7 +103,7 @@ GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" SRCBRANCH = "MM_04.09.03_2412_L6.12.y" SRCREV = "e0d37a7d773a502956f54eced8cd701ec7fa5ff5" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BP}" PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled" diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index a96b5b31..d7ac9b47 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb @@ -42,8 +42,6 @@ SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch= SRCBRANCH = "MM_04.09.03_2412_L6.12.y" SRCREV = "370510ef8137874339df18a2a35ec1d04d98fa0b" -S = "${WORKDIR}/git" - inherit meson pkgconfig use-imx-headers PLATFORM:mx6-nxp-bsp = "MX6" diff --git a/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb b/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb index b435dacd..5e42e692 100644 --- a/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb +++ b/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb @@ -17,7 +17,7 @@ IMX_SRCREV_ABBREV = "394336b" inherit fsl-eula-unpack autotools pkgconfig -S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" PACKAGECONFIG ??= "${PACKAGECONFIG_VPU}" # Support Chips&Media VPU only diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb index 4e42110b..96656f85 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb @@ -9,7 +9,7 @@ inherit fsl-eula-unpack autotools pkgconfig IMX_SRCREV_ABBREV = "ea4fe3f" SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" SRC_URI[sha256sum] = "fc6e6a7c2417730b39eeddc26606c3d58a8f5d0a1521f44bbbd505657046858b" diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb index 07ea662c..84f3ee6a 100644 --- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb +++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb @@ -10,7 +10,7 @@ IMX_SRCREV_ABBREV = "ad0094a" SRC_URI[sha256sum] = "d23ad4234f34ffcfb37d77c91345b935894937913a68995223d2f9f421eade46" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" inherit fsl-eula-unpack autotools pkgconfig meson FILES:${PN} += "${datadir}/" diff --git a/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb index 15df0aeb..d770b66e 100644 --- a/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb +++ b/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb @@ -15,7 +15,7 @@ RCONFLICTS:${PN} = "libfslparser" SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" IMX_SRCREV_ABBREV = "c296eb2" -S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" SRC_URI[sha256sum] = "997a7f79f291ef4b3c8dd3ba6f2f32c430c63feb4bb29d923f71da0d1ccf20a9" diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb index 98e9ea4d..39729f71 100644 --- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb +++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb @@ -17,8 +17,6 @@ SRC_URI = " \ SRCBRANCH = "MM_04.09.03_2412_L6.12.y" SRCREV = "d8703ee3245797111ad21c52982efa8b6db33241" -S = "${WORKDIR}/git" - inherit autotools pkgconfig CFLAGS += " -Wno-error=implicit-function-declaration" diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb index 2b2dbdfd..cce4e56a 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb @@ -14,8 +14,6 @@ SRCBRANCH ?= "master" SRCREV = "37095a854aa176bb763a25ce98ceb6a787501271" SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https" -S = "${WORKDIR}/git" - inherit waf pkgconfig use-imx-headers python3native IMX_PLATFORM:mx6-nxp-bsp = "imx6" diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb index 9391a5fb..55063db1 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb @@ -12,8 +12,6 @@ SRCBRANCH ?= "v1" SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e" SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https" -S = "${WORKDIR}/git" - inherit waf pkgconfig python3native COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)" diff --git a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb index f37e786b..48edf076 100644 --- a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb +++ b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb @@ -13,6 +13,4 @@ SRCREV = "f3ba6e5c2126f2fb07e3d890f990d50c3e204e67" EXTRA_OECONF:append = " --enable-pcm" -S = "${WORKDIR}/git" - inherit autotools pkgconfig diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc index 455bdd78..2c1a0f45 100644 --- a/recipes-security/optee-imx/optee-client-fslc.inc +++ b/recipes-security/optee-imx/optee-client-fslc.inc @@ -18,8 +18,6 @@ SRC_URI = " \ UPSTREAM_CHECK_GITTAGREGEX = "^(?P\d+(\.\d+)+)$" -S = "${WORKDIR}/git" - EXTRA_OECMAKE = " \ -DBUILD_SHARED_LIBS=ON \ -DCFG_TEE_FS_PARENT_PATH='${localstatedir}/lib/tee' \ diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc index c1f1f48f..56c0f3e1 100644 --- a/recipes-security/optee-imx/optee-os-fslc.inc +++ b/recipes-security/optee-imx/optee-os-fslc.inc @@ -19,7 +19,6 @@ DEPENDS:append:toolchain-clang = " compiler-rt" SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https" -S = "${WORKDIR}/git" B = "${WORKDIR}/build" EXTRA_OEMAKE += " \ diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc index 0fb5f878..ed64c87f 100644 --- a/recipes-security/optee-imx/optee-test-fslc.inc +++ b/recipes-security/optee-imx/optee-test-fslc.inc @@ -18,7 +18,6 @@ SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \ file://run-ptest \ " -S = "${WORKDIR}/git" B = "${WORKDIR}/build" EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ diff --git a/recipes-security/optee-qoriq/optee-client.nxp.inc b/recipes-security/optee-qoriq/optee-client.nxp.inc index c3933a24..a7e51a29 100644 --- a/recipes-security/optee-qoriq/optee-client.nxp.inc +++ b/recipes-security/optee-qoriq/optee-client.nxp.inc @@ -13,7 +13,6 @@ SRCREV = "7c9c423d00e96bf51debd5fe10fd70dce83be5cc" FILESEXTRAPATHS:prepend := "${THISDIR}/optee-client:" SRC_URI += "file://tee-supplicant.service" -S = "${WORKDIR}/git" B = "${WORKDIR}/build" OPTEE_ARCH ?= "arm32" diff --git a/recipes-security/optee-qoriq/optee-os.nxp.inc b/recipes-security/optee-qoriq/optee-os.nxp.inc index 5b90b937..989da06d 100644 --- a/recipes-security/optee-qoriq/optee-os.nxp.inc +++ b/recipes-security/optee-qoriq/optee-os.nxp.inc @@ -12,7 +12,6 @@ DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-pycrypt SRC_URI = "git://github.com/nxp-qoriq/optee_os.git;protocol=https;nobranch=1" SRCREV = "735d98806dc26fbeeecad7f5e60ffeab8170c67e" -S = "${WORKDIR}/git" B = "${WORKDIR}/build.${PLATFORM_FLAVOR}" PLATFORM_FLAVOR ?= "${MACHINE}" diff --git a/recipes-security/optee-qoriq/optee-test.nxp.inc b/recipes-security/optee-qoriq/optee-test.nxp.inc index 14a42ac5..17108ff3 100644 --- a/recipes-security/optee-qoriq/optee-test.nxp.inc +++ b/recipes-security/optee-qoriq/optee-test.nxp.inc @@ -12,7 +12,6 @@ inherit python3native cmake SRC_URI = "git://github.com/nxp-qoriq/optee_test.git;protocol=https;nobranch=1" SRCREV = "69722dab8c1f2683e30e0ee3b536053367e37aad" -S = "${WORKDIR}/git" B = "${WORKDIR}/build" TA_DEV_KIT_DIR ?= "${STAGING_INCDIR}/optee/export-user_ta" diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb index 25a5f656..66ff7ecb 100644 --- a/recipes-security/smw/keyctl-caam_git.bb +++ b/recipes-security/smw/keyctl-caam_git.bb @@ -11,8 +11,6 @@ SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCB SRCREV = "81dc06cdb9c4d0d4ba10459d85af9a8603774948" -S = "${WORKDIR}/git" - TARGET_CC_ARCH += "${LDFLAGS}" do_install () { diff --git a/recipes-security/smw/smw_git.bb b/recipes-security/smw/smw_git.bb index 3c1d0490..dbb59d2f 100644 --- a/recipes-security/smw/smw_git.bb +++ b/recipes-security/smw/smw_git.bb @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/nxp-imx/imx-smw.git;protocol=https;branch=release/ve SRCREV_smw = "f0570b3e8cb5f68d54edc4f9dd7cb984f6f604ed" SRCREV_psa = "463cb95ada820bc6f758d50066cf8c0ed5cc3a02" SRCREV_FORMAT = "smw_psa" -S = "${WORKDIR}/git/smw" +S = "${UNPACKDIR}/git/smw" inherit cmake python3native diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb index 303273b1..8a0ca2c1 100644 --- a/recipes-support/opencv/opencv_4.6.0.imx.bb +++ b/recipes-support/opencv/opencv_4.6.0.imx.bb @@ -47,12 +47,12 @@ IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ - git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=git/ipp;name=ipp;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ - git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=master;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/ipp;name=ipp;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/boostdesc;name=boostdesc;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vgg;name=vgg;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/face;name=face;protocol=https \ + git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/wechat_qrcode;name=wechat-qrcode;protocol=https \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ @@ -64,11 +64,9 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" -S = "${WORKDIR}/git" - # OpenCV wants to download more files during configure. We download these in # do_fetch and construct a source cache in the format it expects -OPENCV_DLDIR = "${WORKDIR}/downloads" +OPENCV_DLDIR = "${UNPACKDIR}/downloads" do_unpack_extra() { tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S}