Adapt to S/UNPACKDIR changes

Remove or update S definitions as required to work with oe-core
S/UNPACKDIR changes.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

5 files changed, 1 insertions, 5 deletions

diff --git a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb
index bd3182d..4a06124 100644
--- a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb
+++ b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/xdp-project/xdp-tools.git;branch=v1.2;protocol=https
 
 SRCREV = "57a139f9bf6ef644f9c1deb4f7df4bb4c76d6179"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/recipes-extended/dpdk/dpdk-kmods_git.bb b/recipes-extended/dpdk/dpdk-kmods_git.bb
index b7c540f..29754b1 100644
--- a/recipes-extended/dpdk/dpdk-kmods_git.bb
+++ b/recipes-extended/dpdk/dpdk-kmods_git.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://dpdk.org/git/dpdk-kmods;protocol=https;branch=main \
            "
 SRCREV = "e721c733cd24206399bebb8f0751b0387c4c1595"
 
-S = "${WORKDIR}/git/linux/igb_uio"
+S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}/linux/igb_uio"
 
 PV = "1.0"
 
diff --git a/recipes-extended/dpdk/dpdk-module_22.11.7.bb b/recipes-extended/dpdk/dpdk-module_22.11.7.bb
index 01b1db8..1ce396c 100644
--- a/recipes-extended/dpdk/dpdk-module_22.11.7.bb
+++ b/recipes-extended/dpdk/dpdk-module_22.11.7.bb
@@ -8,7 +8,6 @@ SRC_URI += " \
 STABLE = "-stable"
 BRANCH = "22.11"
 SRCREV = "077a7044cc5b2533410f691c8db6fb4f6667b1ca"
-S = "${WORKDIR}/git"
 
 inherit module
 
diff --git a/recipes-extended/dpdk/dpdk_22.11.7.bb b/recipes-extended/dpdk/dpdk_22.11.7.bb
index 9767fef..e69a2df 100644
--- a/recipes-extended/dpdk/dpdk_22.11.7.bb
+++ b/recipes-extended/dpdk/dpdk_22.11.7.bb
@@ -7,7 +7,6 @@ SRC_URI += " \
 STABLE = "-stable"
 BRANCH = "22.11"
 SRCREV = "077a7044cc5b2533410f691c8db6fb4f6667b1ca"
-S = "${WORKDIR}/git"
 
 # kernel module is provide by dpdk-module recipe, so disable here
 EXTRA_OEMESON = " -Denable_kmods=false \
diff --git a/recipes-extended/dpdk/dpdk_23.11.1.bb b/recipes-extended/dpdk/dpdk_23.11.1.bb
index c2d6a97..b5aab21 100644
--- a/recipes-extended/dpdk/dpdk_23.11.1.bb
+++ b/recipes-extended/dpdk/dpdk_23.11.1.bb
@@ -8,7 +8,6 @@ SRC_URI += " file://0001-config-meson-get-cpu_instruction_set-from-meson-opti.pa
 STABLE = "-stable"
 BRANCH = "23.11"
 SRCREV = "a6ec5765cf83d3d58cbd6d4ed5b92b4a06f8a808"
-S = "${WORKDIR}/git"
 
 def get_cpu_instruction_set(bb, d):
     import re