From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 26 Jun 2025 17:07:27 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uUoCF-00BJBW-1s for lore@lore.pengutronix.de; Thu, 26 Jun 2025 17:07:27 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uUoCF-0000pg-3g; Thu, 26 Jun 2025 17:07:27 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uUoBl-0008GU-RR; Thu, 26 Jun 2025 17:06:57 +0200 From: Michael Tretter To: ptxdist@pengutronix.de Date: Thu, 26 Jun 2025 17:06:55 +0200 Message-Id: <20250626150657.2728049-5-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250626150657.2728049-1-m.tretter@pengutronix.de> References: <20250626150657.2728049-1-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 5/7] optee-test: set libdir and bindir X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Michael Tretter Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false optee-test by default sets ${libdir} to /lib and ${bindir} to /bin. As a workaround, the ptxdist rule adds /usr to ${DESTDIR} to install into /usr. This doesn't work, if files not be installed into /usr or a path already contains /usr. Thus, set libdir and bindir to include /usr and drop /usr from DESTDIR to install files relative to the root directory. Signed-off-by: Michael Tretter --- rules/optee-test.make | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/optee-test.make b/rules/optee-test.make index 83b149461afd..4984c2bed16f 100644 --- a/rules/optee-test.make +++ b/rules/optee-test.make @@ -36,7 +36,9 @@ OPTEE_TEST_MAKE_ENV := \ CROSS_COMPILE_TA=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX)) \ TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \ OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \ - COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib + COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib \ + bindir=/usr/bin \ + libdir=/usr/lib OPTEE_TEST_CFLAGS := \ -Wno-error=deprecated-declarations @@ -45,7 +47,7 @@ OPTEE_TEST_CFLAGS := \ # Install # ---------------------------------------------------------------------------- -OPTEE_TEST_INSTALL_OPT := install DESTDIR=$(OPTEE_TEST_PKGDIR)/usr/ +OPTEE_TEST_INSTALL_OPT := install DESTDIR=$(OPTEE_TEST_PKGDIR) $(STATEDIR)/optee-test.install: @$(call targetinfo) -- 2.39.5