13 files changed, 9 insertions, 29 deletions

diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 9ed3f1f5f..947a31280 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 553e2013c..054cb1fb9 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 13793132a..053239365 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 8a0c0bbeb..f55ca7084 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 d2316fe00..50d8cca62 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 33c348ae9..62dd737cb 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 ba1561618..9c5ce8f17 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 5b3b47756..70386dc0d 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 efccc286d..e7ae8556e 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 c8a2a3450..2f5ba04ee 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 4e3911168..521bd7948 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 5d28ae84a..7243a345c 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 af8982b9c..cc226bd9a 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/"