From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 29 Dec 2022 16:21:32 +0000 (+0100)
Subject: nativesdk-rpm: don't create wrappers for WRAPPER_TOOLS
X-Git-Tag: uninative-3.8~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34f1121ba9684b1ab978438db2b16c1e42ea5973;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

nativesdk-rpm: don't create wrappers for WRAPPER_TOOLS

* environment.d/rpm.sh sets the right environment in SDK
  and we don't need to use them

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/rpm/rpm_4.18.0.bb b/meta/recipes-devtools/rpm/rpm_4.18.0.bb
index 152cab490d1..8eb0ab207e3 100644
--- a/meta/recipes-devtools/rpm/rpm_4.18.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.18.0.bb
@@ -117,14 +117,6 @@ do_install:append:class-native() {
 }
 
 do_install:append:class-nativesdk() {
-        for tool in ${WRAPPER_TOOLS}; do
-                test -x ${D}$tool && create_wrapper ${D}$tool \
-                        RPM_CONFIGDIR='$'{RPM_CONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm} \
-                        RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \
-                        MAGIC=''{MAGIC-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc} \
-                        RPM_NO_CHROOT_FOR_SCRIPTS=1
-        done
-
         rm -rf ${D}/var
 
 	mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d