Thanks, applied as dd4378735f06f9bb5a5dc53944f7a82e7ab5da56. Michael
[sent from post-receive hook] On Sat, 05 Jul 2025 10:22:22 +0200, Michael Tretter <[email protected]> wrote: > 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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)
