* [ptxdist] [PATCH 1/4] optee: version bump 4.6.0 -> 4.7.0
@ 2025-08-27 10:36 Michael Tretter
2025-08-27 10:36 ` [ptxdist] [PATCH 2/4] optee: add license file Michael Tretter
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Michael Tretter @ 2025-08-27 10:36 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/optee-client.make | 4 ++--
rules/optee-examples.make | 4 ++--
rules/optee-test.make | 4 ++--
rules/optee.make | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/rules/optee-client.make b/rules/optee-client.make
index 8ea127774b0d..c884000d688c 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
#
# Paths and names
#
-OPTEE_CLIENT_VERSION := 4.6.0
-OPTEE_CLIENT_MD5 := fd4e607cc2c185c9aac0d74c337eab21
+OPTEE_CLIENT_VERSION := 4.7.0
+OPTEE_CLIENT_MD5 := bede2f80cf601ab46211da3396968862
OPTEE_CLIENT := optee-client-$(OPTEE_CLIENT_VERSION)
OPTEE_CLIENT_SUFFIX := tar.gz
OPTEE_CLIENT_URL := https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIENT_VERSION).$(OPTEE_CLIENT_SUFFIX)
diff --git a/rules/optee-examples.make b/rules/optee-examples.make
index 376815f938ec..ba586b6fe0a4 100644
--- a/rules/optee-examples.make
+++ b/rules/optee-examples.make
@@ -16,8 +16,8 @@ endif
#
# Paths and names
#
-OPTEE_EXAMPLES_VERSION := 4.6.0
-OPTEE_EXAMPLES_MD5 := 24def25f5efa8999f40077a8383167e6
+OPTEE_EXAMPLES_VERSION := 4.7.0
+OPTEE_EXAMPLES_MD5 := 43a72fe46d59d71fb8f3793e68f3a057
OPTEE_EXAMPLES := optee-examples-$(OPTEE_EXAMPLES_VERSION)
OPTEE_EXAMPLES_SUFFIX := tar.gz
OPTEE_EXAMPLES_URL := https://github.com/linaro-swg/optee_examples/archive/$(OPTEE_EXAMPLES_VERSION).$(OPTEE_EXAMPLES_SUFFIX)
diff --git a/rules/optee-test.make b/rules/optee-test.make
index 2163920b59b4..6f0951ddb93f 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -16,8 +16,8 @@ endif
#
# Paths and names
#
-OPTEE_TEST_VERSION := 4.6.0
-OPTEE_TEST_MD5 := 88b4ae2a4e4e1ccd064a06bbe399ed5e
+OPTEE_TEST_VERSION := 4.7.0
+OPTEE_TEST_MD5 := 3a765b1feb11d02f345d0ba83759fa56
OPTEE_TEST := optee-test-$(OPTEE_TEST_VERSION)
OPTEE_TEST_SUFFIX := tar.gz
OPTEE_TEST_URL := https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VERSION).$(OPTEE_TEST_SUFFIX)
diff --git a/rules/optee.make b/rules/optee.make
index e523ca201776..6fbbcfc2052c 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -16,8 +16,8 @@ endif
#
# Paths and names
#
-OPTEE_VERSION := 4.6.0
-OPTEE_MD5 := aa77c03cf9927e65edd141b6847c88ec
+OPTEE_VERSION := 4.7.0
+OPTEE_MD5 := 28e0d1349527223574bc243c926f586f
OPTEE := optee-$(OPTEE_VERSION)
OPTEE_SUFFIX := tar.gz
OPTEE_URL := https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
--
2.47.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 2/4] optee: add license file
2025-08-27 10:36 [ptxdist] [PATCH 1/4] optee: version bump 4.6.0 -> 4.7.0 Michael Tretter
@ 2025-08-27 10:36 ` Michael Tretter
2025-08-29 9:46 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-08-27 10:36 ` [ptxdist] [PATCH 3/4] optee: remove install_init Michael Tretter
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Michael Tretter @ 2025-08-27 10:36 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/optee.make | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rules/optee.make b/rules/optee.make
index 6fbbcfc2052c..52a71962eeca 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -24,6 +24,8 @@ OPTEE_URL := https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE
OPTEE_SOURCE := $(SRCDIR)/$(OPTEE).$(OPTEE_SUFFIX)
OPTEE_DIR := $(BUILDDIR)/$(OPTEE)
OPTEE_LICENSE := BSD-2-Clause AND BSD-3-Clause
+OPTEE_LICENSE_FILES := \
+ file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173
OPTEE_DEVPKG := NO
# ----------------------------------------------------------------------------
--
2.47.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 3/4] optee: remove install_init
2025-08-27 10:36 [ptxdist] [PATCH 1/4] optee: version bump 4.6.0 -> 4.7.0 Michael Tretter
2025-08-27 10:36 ` [ptxdist] [PATCH 2/4] optee: add license file Michael Tretter
@ 2025-08-27 10:36 ` Michael Tretter
2025-08-29 9:46 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-08-27 10:36 ` [ptxdist] [PATCH 4/4] optee: install in-tree user TAs into rootfs Michael Tretter
2025-08-29 9:46 ` [ptxdist] [APPLIED] optee: version bump 4.6.0 -> 4.7.0 Michael Olbrich
3 siblings, 1 reply; 8+ messages in thread
From: Michael Tretter @ 2025-08-27 10:36 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
The rule calls install_init twice. Once in the install stage and once in
the targetinstall stage. If never calls install_finish.
Remove install_init, since the rule doesn't create a package.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/optee.make | 2 --
1 file changed, 2 deletions(-)
diff --git a/rules/optee.make b/rules/optee.make
index 52a71962eeca..e0655565efc3 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -61,7 +61,6 @@ OPTEE_OUT_DIR := \
$(STATEDIR)/optee.install:
@$(call targetinfo)
- @$(call install_init, optee)
@install -vd -m755 $(OPTEE_PKGDIR)/usr/lib/optee-os
@cp -vr $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/* $(OPTEE_PKGDIR)/usr/lib/optee-os
@@ -81,7 +80,6 @@ OPTEE_BINARIES := \
$(STATEDIR)/optee.targetinstall:
@$(call targetinfo)
- @$(call install_init, optee)
@$(foreach binary, $(OPTEE_BINARIES), \
$(call ptx/image-install, OPTEE, \
$(OPTEE_OUT_DIR)/core/$(binary), \
--
2.47.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 4/4] optee: install in-tree user TAs into rootfs
2025-08-27 10:36 [ptxdist] [PATCH 1/4] optee: version bump 4.6.0 -> 4.7.0 Michael Tretter
2025-08-27 10:36 ` [ptxdist] [PATCH 2/4] optee: add license file Michael Tretter
2025-08-27 10:36 ` [ptxdist] [PATCH 3/4] optee: remove install_init Michael Tretter
@ 2025-08-27 10:36 ` Michael Tretter
2025-08-27 14:36 ` Michael Olbrich
2025-08-29 9:46 ` [ptxdist] [APPLIED] optee: version bump 4.6.0 -> 4.7.0 Michael Olbrich
3 siblings, 1 reply; 8+ messages in thread
From: Michael Tretter @ 2025-08-27 10:36 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
While user TAs are preferably disabled in a secure system to reduce the
attack surface, it may still be useful to be able to load the in-tree
TAs from the rootfs during development.
The option to install the user TAs into the rootfs.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/optee.in | 17 ++++++++++++++++-
rules/optee.make | 24 ++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/rules/optee.in b/rules/optee.in
index 0e0f3230d8c6..a6a03a151eb3 100644
--- a/rules/optee.in
+++ b/rules/optee.in
@@ -1,4 +1,19 @@
## SECTION=security
-config OPTEE
+menuconfig OPTEE
tristate
+ prompt "optee"
+
+if OPTEE
+
+config PTXCONF_OPTEE_INSTALL_USER_TAS
+ bool "install in-tree user TAs"
+ help
+ Install the OP-TEE in-tree user TAs.
+
+ Enable this option to install the user TAs, which are included in
+ the OP-TEE OS, into the rootfs. This allows loading the TAs via the
+ tee-supplicant at runtime and removes the requirement to include the
+ TAs as early TAs in the OP-TEE binary.
+
+endif
diff --git a/rules/optee.make b/rules/optee.make
index e0655565efc3..e9a4ac302494 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -64,6 +64,10 @@ $(STATEDIR)/optee.install:
@install -vd -m755 $(OPTEE_PKGDIR)/usr/lib/optee-os
@cp -vr $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/* $(OPTEE_PKGDIR)/usr/lib/optee-os
+ @install -vd -m755 $(OPTEE_PKGDIR)/usr/lib/optee_armtz
+ @install -v -D -m444 $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/ta/*.ta \
+ $(OPTEE_PKGDIR)/usr/lib/optee_armtz
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -77,9 +81,29 @@ OPTEE_BINARIES := \
tee-pageable_v2.bin \
tee.elf
+OPTEE_USER_TAS := \
+ 023f8f1a-292a-432b-8fc4-de8471358067.ta \
+ 80a4c275-0a47-4905-8285-1486a9771a08.ta \
+ f04a0fe7-1f5d-4b9b-abf7-619b85b4ce8c.ta \
+ fd02c9da-306c-48c7-a49c-bbd827ae86ee.ta
+
$(STATEDIR)/optee.targetinstall:
@$(call targetinfo)
+ifdef PTXCONF_OPTEE_INSTALL_USER_TAS
+ @$(call install_init, optee)
+ @$(call install_fixup, optee,PRIORITY,optional)
+ @$(call install_fixup, optee,SECTION,base)
+ @$(call install_fixup, optee,AUTHOR,"Rouven Czerwinski <rouven@czerwinskis.de>")
+ @$(call install_fixup, optee,DESCRIPTION,missing)
+
+ @$(foreach ta, $(OPTEE_USER_TAS), \
+ $(call install_copy, optee, 0, 0, 0444, -, \
+ /usr/lib/optee_armtz/$(ta))$(ptx/nl))
+
+ @$(call install_finish, optee)
+endif
+
@$(foreach binary, $(OPTEE_BINARIES), \
$(call ptx/image-install, OPTEE, \
$(OPTEE_OUT_DIR)/core/$(binary), \
--
2.47.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 4/4] optee: install in-tree user TAs into rootfs
2025-08-27 10:36 ` [ptxdist] [PATCH 4/4] optee: install in-tree user TAs into rootfs Michael Tretter
@ 2025-08-27 14:36 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2025-08-27 14:36 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
On Wed, Aug 27, 2025 at 12:36:41PM +0200, Michael Tretter wrote:
> While user TAs are preferably disabled in a secure system to reduce the
> attack surface, it may still be useful to be able to load the in-tree
> TAs from the rootfs during development.
>
> The option to install the user TAs into the rootfs.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
> rules/optee.in | 17 ++++++++++++++++-
> rules/optee.make | 24 ++++++++++++++++++++++++
> 2 files changed, 40 insertions(+), 1 deletion(-)
>
> diff --git a/rules/optee.in b/rules/optee.in
> index 0e0f3230d8c6..a6a03a151eb3 100644
> --- a/rules/optee.in
> +++ b/rules/optee.in
> @@ -1,4 +1,19 @@
> ## SECTION=security
>
> -config OPTEE
> +menuconfig OPTEE
> tristate
> + prompt "optee"
> +
> +if OPTEE
> +
> +config PTXCONF_OPTEE_INSTALL_USER_TAS
> + bool "install in-tree user TAs"
> + help
> + Install the OP-TEE in-tree user TAs.
> +
> + Enable this option to install the user TAs, which are included in
> + the OP-TEE OS, into the rootfs. This allows loading the TAs via the
> + tee-supplicant at runtime and removes the requirement to include the
> + TAs as early TAs in the OP-TEE binary.
Hmm, I would expect that this is platform specific, so it should probably
be in platforms/optee.in instead.
Michael
> +
> +endif
> diff --git a/rules/optee.make b/rules/optee.make
> index e0655565efc3..e9a4ac302494 100644
> --- a/rules/optee.make
> +++ b/rules/optee.make
> @@ -64,6 +64,10 @@ $(STATEDIR)/optee.install:
> @install -vd -m755 $(OPTEE_PKGDIR)/usr/lib/optee-os
> @cp -vr $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/* $(OPTEE_PKGDIR)/usr/lib/optee-os
>
> + @install -vd -m755 $(OPTEE_PKGDIR)/usr/lib/optee_armtz
> + @install -v -D -m444 $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/ta/*.ta \
> + $(OPTEE_PKGDIR)/usr/lib/optee_armtz
> +
> @$(call touch)
>
> # ----------------------------------------------------------------------------
> @@ -77,9 +81,29 @@ OPTEE_BINARIES := \
> tee-pageable_v2.bin \
> tee.elf
>
> +OPTEE_USER_TAS := \
> + 023f8f1a-292a-432b-8fc4-de8471358067.ta \
> + 80a4c275-0a47-4905-8285-1486a9771a08.ta \
> + f04a0fe7-1f5d-4b9b-abf7-619b85b4ce8c.ta \
> + fd02c9da-306c-48c7-a49c-bbd827ae86ee.ta
> +
> $(STATEDIR)/optee.targetinstall:
> @$(call targetinfo)
>
> +ifdef PTXCONF_OPTEE_INSTALL_USER_TAS
> + @$(call install_init, optee)
> + @$(call install_fixup, optee,PRIORITY,optional)
> + @$(call install_fixup, optee,SECTION,base)
> + @$(call install_fixup, optee,AUTHOR,"Rouven Czerwinski <rouven@czerwinskis.de>")
> + @$(call install_fixup, optee,DESCRIPTION,missing)
> +
> + @$(foreach ta, $(OPTEE_USER_TAS), \
> + $(call install_copy, optee, 0, 0, 0444, -, \
> + /usr/lib/optee_armtz/$(ta))$(ptx/nl))
> +
> + @$(call install_finish, optee)
> +endif
> +
> @$(foreach binary, $(OPTEE_BINARIES), \
> $(call ptx/image-install, OPTEE, \
> $(OPTEE_OUT_DIR)/core/$(binary), \
> --
> 2.47.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [APPLIED] optee: version bump 4.6.0 -> 4.7.0
2025-08-27 10:36 [ptxdist] [PATCH 1/4] optee: version bump 4.6.0 -> 4.7.0 Michael Tretter
` (2 preceding siblings ...)
2025-08-27 10:36 ` [ptxdist] [PATCH 4/4] optee: install in-tree user TAs into rootfs Michael Tretter
@ 2025-08-29 9:46 ` Michael Olbrich
3 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2025-08-29 9:46 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Thanks, applied as 1b93af9ad884df780a87e16e0af7d31318df763f.
Michael
[sent from post-receive hook]
On Fri, 29 Aug 2025 11:46:31 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250827103642.3881930-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/optee-client.make b/rules/optee-client.make
> index 8ea127774b0d..c884000d688c 100644
> --- a/rules/optee-client.make
> +++ b/rules/optee-client.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
> #
> # Paths and names
> #
> -OPTEE_CLIENT_VERSION := 4.6.0
> -OPTEE_CLIENT_MD5 := fd4e607cc2c185c9aac0d74c337eab21
> +OPTEE_CLIENT_VERSION := 4.7.0
> +OPTEE_CLIENT_MD5 := bede2f80cf601ab46211da3396968862
> OPTEE_CLIENT := optee-client-$(OPTEE_CLIENT_VERSION)
> OPTEE_CLIENT_SUFFIX := tar.gz
> OPTEE_CLIENT_URL := https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIENT_VERSION).$(OPTEE_CLIENT_SUFFIX)
> diff --git a/rules/optee-examples.make b/rules/optee-examples.make
> index 376815f938ec..ba586b6fe0a4 100644
> --- a/rules/optee-examples.make
> +++ b/rules/optee-examples.make
> @@ -16,8 +16,8 @@ endif
> #
> # Paths and names
> #
> -OPTEE_EXAMPLES_VERSION := 4.6.0
> -OPTEE_EXAMPLES_MD5 := 24def25f5efa8999f40077a8383167e6
> +OPTEE_EXAMPLES_VERSION := 4.7.0
> +OPTEE_EXAMPLES_MD5 := 43a72fe46d59d71fb8f3793e68f3a057
> OPTEE_EXAMPLES := optee-examples-$(OPTEE_EXAMPLES_VERSION)
> OPTEE_EXAMPLES_SUFFIX := tar.gz
> OPTEE_EXAMPLES_URL := https://github.com/linaro-swg/optee_examples/archive/$(OPTEE_EXAMPLES_VERSION).$(OPTEE_EXAMPLES_SUFFIX)
> diff --git a/rules/optee-test.make b/rules/optee-test.make
> index 2163920b59b4..6f0951ddb93f 100644
> --- a/rules/optee-test.make
> +++ b/rules/optee-test.make
> @@ -16,8 +16,8 @@ endif
> #
> # Paths and names
> #
> -OPTEE_TEST_VERSION := 4.6.0
> -OPTEE_TEST_MD5 := 88b4ae2a4e4e1ccd064a06bbe399ed5e
> +OPTEE_TEST_VERSION := 4.7.0
> +OPTEE_TEST_MD5 := 3a765b1feb11d02f345d0ba83759fa56
> OPTEE_TEST := optee-test-$(OPTEE_TEST_VERSION)
> OPTEE_TEST_SUFFIX := tar.gz
> OPTEE_TEST_URL := https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VERSION).$(OPTEE_TEST_SUFFIX)
> diff --git a/rules/optee.make b/rules/optee.make
> index e523ca201776..6fbbcfc2052c 100644
> --- a/rules/optee.make
> +++ b/rules/optee.make
> @@ -16,8 +16,8 @@ endif
> #
> # Paths and names
> #
> -OPTEE_VERSION := 4.6.0
> -OPTEE_MD5 := aa77c03cf9927e65edd141b6847c88ec
> +OPTEE_VERSION := 4.7.0
> +OPTEE_MD5 := 28e0d1349527223574bc243c926f586f
> OPTEE := optee-$(OPTEE_VERSION)
> OPTEE_SUFFIX := tar.gz
> OPTEE_URL := https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [APPLIED] optee: add license file
2025-08-27 10:36 ` [ptxdist] [PATCH 2/4] optee: add license file Michael Tretter
@ 2025-08-29 9:46 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2025-08-29 9:46 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Thanks, applied as 37d5ec3f62107ff1aea31e080e6d9d7fadd6d3b5.
Michael
[sent from post-receive hook]
On Fri, 29 Aug 2025 11:46:31 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250827103642.3881930-2-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/optee.make b/rules/optee.make
> index 6fbbcfc2052c..52a71962eeca 100644
> --- a/rules/optee.make
> +++ b/rules/optee.make
> @@ -24,6 +24,8 @@ OPTEE_URL := https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE
> OPTEE_SOURCE := $(SRCDIR)/$(OPTEE).$(OPTEE_SUFFIX)
> OPTEE_DIR := $(BUILDDIR)/$(OPTEE)
> OPTEE_LICENSE := BSD-2-Clause AND BSD-3-Clause
> +OPTEE_LICENSE_FILES := \
> + file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173
> OPTEE_DEVPKG := NO
>
> # ----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [APPLIED] optee: remove install_init
2025-08-27 10:36 ` [ptxdist] [PATCH 3/4] optee: remove install_init Michael Tretter
@ 2025-08-29 9:46 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2025-08-29 9:46 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Thanks, applied as 6a35b4a5b93c4c96752a2affa165f7ec1fbaa9ab.
Michael
[sent from post-receive hook]
On Fri, 29 Aug 2025 11:46:32 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> The rule calls install_init twice. Once in the install stage and once in
> the targetinstall stage. If never calls install_finish.
>
> Remove install_init, since the rule doesn't create a package.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250827103642.3881930-3-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/optee.make b/rules/optee.make
> index 52a71962eeca..e0655565efc3 100644
> --- a/rules/optee.make
> +++ b/rules/optee.make
> @@ -61,7 +61,6 @@ OPTEE_OUT_DIR := \
> $(STATEDIR)/optee.install:
> @$(call targetinfo)
>
> - @$(call install_init, optee)
> @install -vd -m755 $(OPTEE_PKGDIR)/usr/lib/optee-os
> @cp -vr $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/* $(OPTEE_PKGDIR)/usr/lib/optee-os
>
> @@ -81,7 +80,6 @@ OPTEE_BINARIES := \
> $(STATEDIR)/optee.targetinstall:
> @$(call targetinfo)
>
> - @$(call install_init, optee)
> @$(foreach binary, $(OPTEE_BINARIES), \
> $(call ptx/image-install, OPTEE, \
> $(OPTEE_OUT_DIR)/core/$(binary), \
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-08-29 9:49 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-08-27 10:36 [ptxdist] [PATCH 1/4] optee: version bump 4.6.0 -> 4.7.0 Michael Tretter
2025-08-27 10:36 ` [ptxdist] [PATCH 2/4] optee: add license file Michael Tretter
2025-08-29 9:46 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-08-27 10:36 ` [ptxdist] [PATCH 3/4] optee: remove install_init Michael Tretter
2025-08-29 9:46 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-08-27 10:36 ` [ptxdist] [PATCH 4/4] optee: install in-tree user TAs into rootfs Michael Tretter
2025-08-27 14:36 ` Michael Olbrich
2025-08-29 9:46 ` [ptxdist] [APPLIED] optee: version bump 4.6.0 -> 4.7.0 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox