7 files changed, 3 insertions, 43 deletions

diff --git a/recipes-dpaa2/aiopsl/aiopsl_git.bb b/recipes-dpaa2/aiopsl/aiopsl_git.bb
index 68f7a8ded..b57e33afd 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 7beeb90fe..a40b1672e 100644
--- a/recipes-dpaa2/dce/dce_git.bb
+++ b/recipes-dpaa2/dce/dce_git.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf"
 
 SRC_URI = "git://github.com/nxp-qoriq/dce;protocol=https;nobranch=1 \
-      git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \
+      git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/lib/qbman_userspace \
       file://0001-support-user-merge.patch \
 "
 SRCREV = "88ef2e8c3845532ee64cea4349fd38fb2bd5f807"
@@ -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 befc769ef..853dda9d7 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 5097e71f2..3b5ae98ed 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/files/disable-manpage-generation.patch b/recipes-dpaa2/restool/files/disable-manpage-generation.patch
deleted file mode 100644
index 34f2ae2d0..000000000
--- a/recipes-dpaa2/restool/files/disable-manpage-generation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5392152e704ff001c41de03445d668227237a87e Mon Sep 17 00:00:00 2001
-From: Ting Liu <ting.liu@nxp.com>
-Date: Fri, 15 Oct 2021 09:36:04 +0530
-Subject: [PATCH] disable manpage generation
-
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Ting Liu <ting.liu@nxp.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ee669ae..ab6e499 100644
---- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,6 @@ install: restool scripts/ls-main scripts/ls-append-dpl scripts/ls-debug scripts/
-        install -D -m 755 scripts/ls-debug $(DESTDIR)$(bindir)/ls-debug
-        $(foreach symlink, $(RESTOOL_SCRIPT_SYMLINKS), sh -c "cd $(DESTDIR)$(bindir) && ln -sf ls-main $(symlink)" ;)
-        install -D -m 755 scripts/restool_completion.sh $(DESTDIR)$(bindir_completion)/restool
--       install -m 0644 -D $(MANPAGE) $(call get_manpage_destination,$(MANPAGE))
- 
- clean:
-        rm -f $(OBJ) $(MANPAGE) \
--- 
-2.25.1
-
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index d9e3b630f..596625ece 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -2,12 +2,8 @@ SUMMARY = "DPAA2 Resource Manager Tool"
 LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
 
-SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \
-    file://disable-manpage-generation.patch \
-"
-SRCREV = "8c45e04363bf2a984a87b24d1dac80a286dd40d8"
-
-S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1"
+SRCREV = "8f73f2600111440d034227966d6ff03ec47d8f1a"
 
 inherit bash-completion
 
diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb
index c54484be3..93630a20c 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}" '