mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 0/5] Support for OP-TEE (Open Portable Trusted Execution Environment)
@ 2019-02-04  9:55 Rouven Czerwinski
  2019-02-04  9:55 ` [ptxdist] [PATCH 1/5] optee-client: bump to 3.4.0 Rouven Czerwinski
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04  9:55 UTC (permalink / raw)
  To: ptxdist; +Cc: Rouven Czerwinski

This series adds support for OP-TEE to ptxdist.
The series starts by bumping the client version and adding a systemd
service file for the tee-supplicant.
The core OP-TEE package is added next and the test and examples are also
introduced into ptxdist.

Regards,
Rouven Czerwinski

Rouven Czerwinski (5):
  optee-client: bump to 3.4.0
  optee-client: add tee-supplicant service file
  optee: add the OP-TEE as new target package
  optee_test: add new optee_test target package
  optee_examples: add as new target package

 platforms/optee.in                                        |  54 +++-
 projectroot/usr/lib/systemd/system/tee-supplicant.service |   9 +-
 rules/optee-client.in                                     |  13 +-
 rules/optee-client.make                                   |  12 +-
 rules/optee.in                                            |   7 +-
 rules/optee.make                                          | 113 +++++++-
 rules/optee_examples.in                                   |  10 +-
 rules/optee_examples.make                                 |  77 +++++-
 rules/optee_test.in                                       |   9 +-
 rules/optee_test.make                                     |  82 +++++-
 10 files changed, 383 insertions(+), 3 deletions(-)
 create mode 100644 platforms/optee.in
 create mode 100644 projectroot/usr/lib/systemd/system/tee-supplicant.service
 create mode 100644 rules/optee.in
 create mode 100644 rules/optee.make
 create mode 100644 rules/optee_examples.in
 create mode 100644 rules/optee_examples.make
 create mode 100644 rules/optee_test.in
 create mode 100644 rules/optee_test.make

base-commit: eebcc6a5054db3f9b3cd3617267061fdc51b4701
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [ptxdist] [PATCH 1/5] optee-client: bump to 3.4.0
  2019-02-04  9:55 [ptxdist] [PATCH 0/5] Support for OP-TEE (Open Portable Trusted Execution Environment) Rouven Czerwinski
@ 2019-02-04  9:55 ` Rouven Czerwinski
  2019-02-04  9:55 ` [ptxdist] [PATCH 2/5] optee-client: add tee-supplicant service file Rouven Czerwinski
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04  9:55 UTC (permalink / raw)
  To: ptxdist; +Cc: Rouven Czerwinski

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/optee-client.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/optee-client.make b/rules/optee-client.make
index 8726f77..09cae7e 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
 #
 # Paths and names
 #
-OPTEE_CLIENT_VERSION	:= 2.4.0
-OPTEE_CLIENT_MD5	:= 5c27298b0e28aa9b28d18e44c79cc66d
+OPTEE_CLIENT_VERSION	:= 3.4.0
+OPTEE_CLIENT_MD5	:= ccefa79858454e9255d1a5f93335e322
 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)
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [ptxdist] [PATCH 2/5] optee-client: add tee-supplicant service file
  2019-02-04  9:55 [ptxdist] [PATCH 0/5] Support for OP-TEE (Open Portable Trusted Execution Environment) Rouven Czerwinski
  2019-02-04  9:55 ` [ptxdist] [PATCH 1/5] optee-client: bump to 3.4.0 Rouven Czerwinski
@ 2019-02-04  9:55 ` Rouven Czerwinski
  2019-02-04 13:22   ` Michael Olbrich
  2019-02-04  9:56 ` [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package Rouven Czerwinski
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04  9:55 UTC (permalink / raw)
  To: ptxdist; +Cc: Rouven Czerwinski

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 projectroot/usr/lib/systemd/system/tee-supplicant.service |  9 ++++++-
 rules/optee-client.in                                     | 13 +++++++-
 rules/optee-client.make                                   |  8 +++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 projectroot/usr/lib/systemd/system/tee-supplicant.service

diff --git a/projectroot/usr/lib/systemd/system/tee-supplicant.service b/projectroot/usr/lib/systemd/system/tee-supplicant.service
new file mode 100644
index 0000000..f8eacff
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/tee-supplicant.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TEE Supplicant
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/tee-supplicant
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/rules/optee-client.in b/rules/optee-client.in
index 9099b4c..0ed2511 100644
--- a/rules/optee-client.in
+++ b/rules/optee-client.in
@@ -1,8 +1,9 @@
 ## SECTION=security
 
-config OPTEE_CLIENT
+menuconfig OPTEE_CLIENT
 	tristate
 	prompt "optee-client"
+	select OPTEE
 	help
 	  Open Portable Trusted Execution Environment Client API.
 
@@ -11,3 +12,13 @@ config OPTEE_CLIENT
 	  a binary tee-supplicant which is a daemon serving the
 	  Trusted OS in secure world with miscellaneous features, such
 	  as file system access.
+
+if OPTEE_CLIENT
+
+config OPTEE_CLIENT_SYSTEMD_UNIT
+	bool
+	default y
+	depends on SYSTEMD
+	prompt "install systemd service file for tee-supplicant"
+
+endif
diff --git a/rules/optee-client.make b/rules/optee-client.make
index 09cae7e..9c5d30b 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -54,6 +54,14 @@ $(STATEDIR)/optee-client.targetinstall:
 
 	@$(call install_lib, optee-client, 0, 0, 0644, libteec)
 	@$(call install_copy, optee-client, 0, 0, 0755, -, /usr/bin/tee-supplicant)
+ifdef PTXCONF_INITMETHOD_SYSTEMD
+ifdef PTXCONF_OPTEE_CLIENT_SYSTEMD_UNIT
+	@$(call install_alternative, optee-client, 0, 0, 0644, \
+		/usr/lib/systemd/system/tee-supplicant.service)
+	@$(call install_link, optee-client, ../tee-supplicant.service,\
+		/usr/lib/systemd/system/multi-user.target.wants/tee-supplicant.service)
+endif
+endif
 
 	@$(call install_finish, optee-client)
 
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package
  2019-02-04  9:55 [ptxdist] [PATCH 0/5] Support for OP-TEE (Open Portable Trusted Execution Environment) Rouven Czerwinski
  2019-02-04  9:55 ` [ptxdist] [PATCH 1/5] optee-client: bump to 3.4.0 Rouven Czerwinski
  2019-02-04  9:55 ` [ptxdist] [PATCH 2/5] optee-client: add tee-supplicant service file Rouven Czerwinski
@ 2019-02-04  9:56 ` Rouven Czerwinski
  2019-02-04 14:03   ` Michael Olbrich
  2019-02-04  9:56 ` [ptxdist] [PATCH 4/5] optee_test: add new optee_test " Rouven Czerwinski
  2019-02-04  9:56 ` [ptxdist] [PATCH 5/5] optee_examples: add as new " Rouven Czerwinski
  4 siblings, 1 reply; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04  9:56 UTC (permalink / raw)
  To: ptxdist; +Cc: Rouven Czerwinski

Provide two KConfig files to allow inclusion of OP-TEE for userspace libraries
and applications.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 platforms/optee.in |  54 ++++++++++++++++++++++-
 rules/optee.in     |   7 +++-
 rules/optee.make   | 113 ++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 174 insertions(+)
 create mode 100644 platforms/optee.in
 create mode 100644 rules/optee.in
 create mode 100644 rules/optee.make

diff --git a/platforms/optee.in b/platforms/optee.in
new file mode 100644
index 0000000..b750774
--- /dev/null
+++ b/platforms/optee.in
@@ -0,0 +1,54 @@
+## SECTION=bootloader
+
+menuconfig OPTEE
+	select BOOTLOADER
+	prompt "OPTEE"
+	bool
+	help
+	  OP-TEE is an open source project which contains a full implementation
+	  to make up a complete Trusted Execution Environment. The project has
+	  roots in a proprietary solution, initially created by ST-Ericsson and
+	  then owned and maintained by STMicroelectronics. In 2014, Linaro
+	  started working with STMicroelectronics to transform the proprietary
+	  TEE solution into an open source TEE solution instead.
+
+if OPTEE
+
+config OPTEE_VERSION
+	string
+	prompt "OPTEE version"
+	help
+	  Enter the OPTEE version you want to build. Usally something like
+	  "3.1.0"
+
+config OPTEE_MD5
+	string
+	prompt "OPTEE source md5"
+
+config OPTEE_PLATFORM
+	string
+	prompt "OPTEE Platform"
+	help
+	  Platform to use for OP-TEE.
+	  i.e. imx for the NXP imx platform or vexpress for versatile express
+	  platforms.
+
+config OPTEE_PLATFORM_FLAVOUR
+	string
+	prompt "OPTEE Platform Flavour"
+	help
+	  Platform Flavour for the selected platform, i.e. mx6qsabresd for the
+	  imx platform.
+
+config OPTEE_CFG
+	string
+	prompt "OP-TEE CFG Flags"
+	help
+	  Refer to the following file for the CFG_FLAGS:
+	  https://github.com/OP-TEE/optee_os/blob/master/mk/config.mk
+
+config OPTEE_IMAGES
+	bool
+	prompt "copy optee to images directory"
+
+endif
diff --git a/rules/optee.in b/rules/optee.in
new file mode 100644
index 0000000..77f112f
--- /dev/null
+++ b/rules/optee.in
@@ -0,0 +1,7 @@
+## SECTION=security
+
+menuconfig OPTEE
+	prompt "OP-TEE"
+	bool
+	help
+	  OP-TEE Secure Operating System
diff --git a/rules/optee.make b/rules/optee.make
new file mode 100644
index 0000000..2865c92
--- /dev/null
+++ b/rules/optee.make
@@ -0,0 +1,113 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Rouven Czerwinski <rouven@czerwinskis.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_ARCH_ARM64
+ifneq ($(shell test -h $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32 && echo ok),ok)
+    $(warning *** selected_toolchain_optee_aarch32 must point to a valid optee_aarch32 toolchain)
+    $(error )
+endif
+ifneq ($(shell test -x $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc && echo ok),ok)
+    $(warning *** $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc not found)
+    $(error )
+endif
+endif
+
+PACKAGES-$(PTXCONF_OPTEE) += optee
+
+#
+# Paths and names
+#
+OPTEE_VERSION	:= $(call remove_quotes,$(PTXCONF_OPTEE_VERSION))
+OPTEE_MD5	:= $(call remove_quotes,$(PTXCONF_OPTEE_MD5))
+OPTEE		:= optee-$(OPTEE_VERSION)
+OPTEE_SUFFIX	:= tar.gz
+OPTEE_URL	:= https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
+OPTEE_SOURCE	:= $(SRCDIR)/$(OPTEE).$(OPTEE_SUFFIX)
+OPTEE_DIR	:= $(BUILDDIR)/$(OPTEE)
+OPTEE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+OPTEE_WRAPPER_BLACKLIST := \
+	TARGET_HARDEN_RELRO \
+	TARGET_HARDEN_BINDNOW \
+	TARGET_HARDEN_PIE \
+	TARGET_DEBUG \
+	TARGET_BUILD_ID
+
+OPTEE_CONF_TOOL := NO
+
+$(STATEDIR)/optee.prepare:
+	@$(call targetinfo)
+	@$(call touch)
+
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+ifdef PTXCONF_ARCH_ARM64
+OPTEE_CROSS_COMPILE32= $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(call remove_quotes,$(PTXCONF_OPTEE_AARCH32_CC_PREFIX))
+OPTEE_MAKE_ENV += CROSS_COMPILE32=$(OPTEE_CROSS_COMPILE32)
+OPTEE_MAKE_OPT += CFG_ARM64_core=y
+OPTEE_MAKE_ENV += CROSS_COMPILE64=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
+endif
+
+OPTEE_MAKE_OPT += PLATFORM=$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM))-$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM_FLAVOUR))
+OPTEE_MAKE_OPT += $(call remove_quotes,$(PTXCONF_OPTEE_CFG))
+
+$(STATEDIR)/optee.compile:
+	@$(call targetinfo)
+	@$(call world/compile, OPTEE)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+ifdef PTXCONF_ARCH_ARM64
+OPTEE_LIB_DIR = export-ta_arm64
+else
+OPTEE_LIB_DIR = export-ta_arm32
+endif
+
+OPTEE_OUT_DIR        := \
+    $(OPTEE_DIR)/out/arm-plat-$(PTXCONF_OPTEE_PLATFORM)
+
+$(STATEDIR)/optee.install:
+	@$(call targetinfo)
+	@rm -rf $(OPTEES_PKGDIR)
+	@install -d -m755 $(OPTEE_PKGDIR)/usr/lib/optee-os
+	@cp -av $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/* $(OPTEE_PKGDIR)/usr/lib/optee-os
+ifdef PTXCONF_OPTEE_IMAGES
+	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee.bin $(IMAGEDIR)/tee.bin
+	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-header_v2.bin $(IMAGEDIR)/tee-header_v2.bin
+	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-pager_v2.bin $(IMAGEDIR)/tee-pager_v2.bin
+	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-pageable_v2.bin $(IMAGEDIR)/tee-pageable_v2.bin
+	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee.elf $(IMAGEDIR)/tee.elf
+endif
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/optee.clean:
+	@$(call targetinfo)
+	@rm -f $(IMAGEDIR)/tee.bin $(IMAGEDIR)/tee-header_v2.bin
+	@rm -f $(IMAGEDIR)/tee-pager_v2.bin $(IMAGEDIR)/tee-pageable_v2.bin
+	@rm -f $(IMAGEDIR)/tee-pager_v2.bin $(IMAGEDIR)/tee.elf
+	@$(call clean_pkg, OPTEE)
+
+# vim: syntax=make
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [ptxdist] [PATCH 4/5] optee_test: add new optee_test target package
  2019-02-04  9:55 [ptxdist] [PATCH 0/5] Support for OP-TEE (Open Portable Trusted Execution Environment) Rouven Czerwinski
                   ` (2 preceding siblings ...)
  2019-02-04  9:56 ` [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package Rouven Czerwinski
@ 2019-02-04  9:56 ` Rouven Czerwinski
  2019-02-04 14:43   ` Michael Olbrich
  2019-02-04  9:56 ` [ptxdist] [PATCH 5/5] optee_examples: add as new " Rouven Czerwinski
  4 siblings, 1 reply; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04  9:56 UTC (permalink / raw)
  To: ptxdist; +Cc: Rouven Czerwinski

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/optee_test.in   |  9 +++++-
 rules/optee_test.make | 82 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 91 insertions(+)
 create mode 100644 rules/optee_test.in
 create mode 100644 rules/optee_test.make

diff --git a/rules/optee_test.in b/rules/optee_test.in
new file mode 100644
index 0000000..43b0d90
--- /dev/null
+++ b/rules/optee_test.in
@@ -0,0 +1,9 @@
+## SECTION=security
+
+config OPTEE_TEST
+	tristate
+	select OPTEE_CLIENT
+	select OPENSSL
+	prompt "optee_test"
+	help
+	  FIXME
diff --git a/rules/optee_test.make b/rules/optee_test.make
new file mode 100644
index 0000000..f18a1e4
--- /dev/null
+++ b/rules/optee_test.make
@@ -0,0 +1,82 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Rouven Czerwinski <rouven@czerwinskis.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_OPTEE_TEST) += optee_test
+
+#
+# Paths and names
+#
+OPTEE_TEST_VERSION	:= 3.4.0
+OPTEE_TEST_MD5		:= 5bfd9c01a8271e0b7d623d208349f183
+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)
+OPTEE_TEST_SOURCE	:= $(SRCDIR)/$(OPTEE_TEST).$(OPTEE_TEST_SUFFIX)
+OPTEE_TEST_DIR		:= $(BUILDDIR)/$(OPTEE_TEST)
+OPTEE_TEST_LICENSE	:= BSD-2-Clause and GPL-2.0
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+#$(OPTEE_TEST_SOURCE):
+#	@$(call targetinfo)
+#	@$(call get, OPTEE_TEST)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+OPTEE_TEST_CONF_TOOL := NO
+OPTEE_TEST_CONF_ENV	:= $(CROSS_ENV)
+OPTEE_TEST_MAKE_ENV += CROSS_COMPILE_HOST=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
+OPTEE_TEST_MAKE_ENV += CROSS_COMPILE_TA=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
+OPTEE_TEST_MAKE_ENV += TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os
+OPTEE_TEST_MAKE_ENV += OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr
+OPTEE_TEST_MAKE_ENV += COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib
+OPTEE_TEST_MAKE_ENV += CFG_SECURE_KEY_SERVICES=y
+
+
+ifndef PTXCONF_ARCH_LP64
+OPTEE_TEST_CFLAGS += -D_FILE_OFFSET_BITS=64
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/optee_test.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, optee_test)
+	@$(call install_fixup, optee_test,PRIORITY,optional)
+	@$(call install_fixup, optee_test,SECTION,base)
+	@$(call install_fixup, optee_test,AUTHOR,"Rouven Czerwinski <rouven@czerwinskis.de>")
+	@$(call install_fixup, optee_test,DESCRIPTION,missing)
+
+	@$(call install_copy, optee_test, 0, 0, 0755, $(OPTEE_TEST_DIR)/out/xtest/xtest, /opt/optee_test/xtest/xtest)
+	@$(call install_tree, optee_test, 0, 0, -, /lib/optee_armtz)
+
+	@$(call install_finish, optee_test)
+
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/optee_test.clean:
+	@$(call targetinfo)
+	@$(call clean_pkg, OPTEE_TEST)
+
+# vim: syntax=make
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [ptxdist] [PATCH 5/5] optee_examples: add as new target package
  2019-02-04  9:55 [ptxdist] [PATCH 0/5] Support for OP-TEE (Open Portable Trusted Execution Environment) Rouven Czerwinski
                   ` (3 preceding siblings ...)
  2019-02-04  9:56 ` [ptxdist] [PATCH 4/5] optee_test: add new optee_test " Rouven Czerwinski
@ 2019-02-04  9:56 ` Rouven Czerwinski
  2019-02-04 14:54   ` Michael Olbrich
  4 siblings, 1 reply; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04  9:56 UTC (permalink / raw)
  To: ptxdist; +Cc: Rouven Czerwinski

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/optee_examples.in   | 10 +++++-
 rules/optee_examples.make | 77 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 87 insertions(+)
 create mode 100644 rules/optee_examples.in
 create mode 100644 rules/optee_examples.make

diff --git a/rules/optee_examples.in b/rules/optee_examples.in
new file mode 100644
index 0000000..304048f
--- /dev/null
+++ b/rules/optee_examples.in
@@ -0,0 +1,10 @@
+## SECTION=security
+
+config OPTEE_EXAMPLES
+	tristate
+	select OPTEE
+	select OPTEE_CLIENT
+	prompt "optee_examples"
+	help
+	  Install the optee examples package from
+	  https://github.com/linaro-swg/optee_examples
diff --git a/rules/optee_examples.make b/rules/optee_examples.make
new file mode 100644
index 0000000..30acd0b
--- /dev/null
+++ b/rules/optee_examples.make
@@ -0,0 +1,77 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Rouven Czerwinski <rouven@czerwinskis.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_OPTEE_EXAMPLES) += optee_examples
+
+#
+# Paths and names
+#
+OPTEE_EXAMPLES_VERSION	:= 3.4.0
+OPTEE_EXAMPLES_MD5	:= 20bf84c5c647f9270e9edb9bb79f75db
+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)
+OPTEE_EXAMPLES_SOURCE	:= $(SRCDIR)/$(OPTEE_EXAMPLES).$(OPTEE_EXAMPLES_SUFFIX)
+OPTEE_EXAMPLES_DIR	:= $(BUILDDIR)/$(OPTEE_EXAMPLES)
+OPTEE_EXAMPLES_LICENSE	:= BSD-2-Clause
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+OPTEE_EXAMPLES_MAKE_ENV	:= $(CROSS_ENV)
+OPTEE_EXAMPLES_CONF_TOOL := NO
+
+OPTEE_EXAMPLES_MAKE_ENV += HOST_CROSS_COMPILE=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
+OPTEE_EXAMPLES_MAKE_ENV += TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os
+OPTEE_EXAMPLES_MAKE_ENV += TEEC_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/optee_examples.install:
+	@$(call targetinfo)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/optee_examples.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, optee_examples)
+	@$(call install_fixup, optee_examples,PRIORITY,optional)
+	@$(call install_fixup, optee_examples,SECTION,base)
+	@$(call install_fixup, optee_examples,AUTHOR,"Rouven Czerwinski <rouven@czerwinskis.de>")
+	@$(call install_fixup, optee_examples,DESCRIPTION,missing)
+
+	@$(call install_copy, optee_examples, 0, 0, 0755, /opt/examples)
+	@$(call install_copy, optee_examples, 0, 0, 0755, /lib/optee_armtz)
+	@$(call install_glob, optee_examples, 0, 0, $(OPTEE_EXAMPLES_DIR)/out/ta/, /lib/optee_armtz, *.ta, -)
+	@$(call install_tree, optee_examples, 0, 0, $(OPTEE_EXAMPLES_DIR)/out/ca/, /opt/examples/)
+
+	@$(call install_finish, optee_examples)
+
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+#$(STATEDIR)/optee_examples.clean:
+#	@$(call targetinfo)
+#	@$(call clean_pkg, OPTEE_EXAMPLES)
+
+# vim: syntax=make
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [ptxdist] [PATCH 2/5] optee-client: add tee-supplicant service file
  2019-02-04  9:55 ` [ptxdist] [PATCH 2/5] optee-client: add tee-supplicant service file Rouven Czerwinski
@ 2019-02-04 13:22   ` Michael Olbrich
  2019-02-04 14:28     ` Rouven Czerwinski
  0 siblings, 1 reply; 13+ messages in thread
From: Michael Olbrich @ 2019-02-04 13:22 UTC (permalink / raw)
  To: ptxdist

On Mon, Feb 04, 2019 at 10:55:59AM +0100, Rouven Czerwinski wrote:
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  projectroot/usr/lib/systemd/system/tee-supplicant.service |  9 ++++++-
>  rules/optee-client.in                                     | 13 +++++++-
>  rules/optee-client.make                                   |  8 +++++-
>  3 files changed, 29 insertions(+), 1 deletion(-)
>  create mode 100644 projectroot/usr/lib/systemd/system/tee-supplicant.service
> 
> diff --git a/projectroot/usr/lib/systemd/system/tee-supplicant.service b/projectroot/usr/lib/systemd/system/tee-supplicant.service
> new file mode 100644
> index 0000000..f8eacff
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/tee-supplicant.service
> @@ -0,0 +1,9 @@
> +[Unit]
> +Description=TEE Supplicant
> +
> +[Service]
> +Type=simple
> +ExecStart=/usr/bin/tee-supplicant
> +
> +[Install]
> +WantedBy=multi-user.target
> \ No newline at end of file

Add newline.

> diff --git a/rules/optee-client.in b/rules/optee-client.in
> index 9099b4c..0ed2511 100644
> --- a/rules/optee-client.in
> +++ b/rules/optee-client.in
> @@ -1,8 +1,9 @@
>  ## SECTION=security
>  
> -config OPTEE_CLIENT
> +menuconfig OPTEE_CLIENT
>  	tristate
>  	prompt "optee-client"

Add spaces to align the '-->' in the menu.


> +	select OPTEE
>  	help
>  	  Open Portable Trusted Execution Environment Client API.
>  
> @@ -11,3 +12,13 @@ config OPTEE_CLIENT
>  	  a binary tee-supplicant which is a daemon serving the
>  	  Trusted OS in secure world with miscellaneous features, such
>  	  as file system access.
> +
> +if OPTEE_CLIENT
> +
> +config OPTEE_CLIENT_SYSTEMD_UNIT
> +	bool
> +	default y
> +	depends on SYSTEMD
> +	prompt "install systemd service file for tee-supplicant"
> +
> +endif
> diff --git a/rules/optee-client.make b/rules/optee-client.make
> index 09cae7e..9c5d30b 100644
> --- a/rules/optee-client.make
> +++ b/rules/optee-client.make
> @@ -54,6 +54,14 @@ $(STATEDIR)/optee-client.targetinstall:
>  
>  	@$(call install_lib, optee-client, 0, 0, 0644, libteec)
>  	@$(call install_copy, optee-client, 0, 0, 0755, -, /usr/bin/tee-supplicant)
> +ifdef PTXCONF_INITMETHOD_SYSTEMD

Not necessary.

Michael

> +ifdef PTXCONF_OPTEE_CLIENT_SYSTEMD_UNIT
> +	@$(call install_alternative, optee-client, 0, 0, 0644, \
> +		/usr/lib/systemd/system/tee-supplicant.service)
> +	@$(call install_link, optee-client, ../tee-supplicant.service,\
> +		/usr/lib/systemd/system/multi-user.target.wants/tee-supplicant.service)
> +endif
> +endif
>  
>  	@$(call install_finish, optee-client)
>  
> -- 
> git-series 0.9.1
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package
  2019-02-04  9:56 ` [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package Rouven Czerwinski
@ 2019-02-04 14:03   ` Michael Olbrich
  2019-02-04 14:26     ` Rouven Czerwinski
  0 siblings, 1 reply; 13+ messages in thread
From: Michael Olbrich @ 2019-02-04 14:03 UTC (permalink / raw)
  To: ptxdist

On Mon, Feb 04, 2019 at 10:56:00AM +0100, Rouven Czerwinski wrote:
> Provide two KConfig files to allow inclusion of OP-TEE for userspace libraries
> and applications.
> 
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  platforms/optee.in |  54 ++++++++++++++++++++++-
>  rules/optee.in     |   7 +++-
>  rules/optee.make   | 113 ++++++++++++++++++++++++++++++++++++++++++++++-
>  3 files changed, 174 insertions(+)
>  create mode 100644 platforms/optee.in
>  create mode 100644 rules/optee.in
>  create mode 100644 rules/optee.make
> 
> diff --git a/platforms/optee.in b/platforms/optee.in
> new file mode 100644
> index 0000000..b750774
> --- /dev/null
> +++ b/platforms/optee.in
> @@ -0,0 +1,54 @@
> +## SECTION=bootloader
> +
> +menuconfig OPTEE
> +	select BOOTLOADER
> +	prompt "OPTEE"

Spaces.

And "OP-TEE" or "optee" I think.


> +	bool
> +	help
> +	  OP-TEE is an open source project which contains a full implementation
> +	  to make up a complete Trusted Execution Environment. The project has
> +	  roots in a proprietary solution, initially created by ST-Ericsson and
> +	  then owned and maintained by STMicroelectronics. In 2014, Linaro
> +	  started working with STMicroelectronics to transform the proprietary
> +	  TEE solution into an open source TEE solution instead.
> +
> +if OPTEE
> +
> +config OPTEE_VERSION
> +	string
> +	prompt "OPTEE version"
> +	help
> +	  Enter the OPTEE version you want to build. Usally something like
> +	  "3.1.0"

Why is this needed?

> +
> +config OPTEE_MD5
> +	string
> +	prompt "OPTEE source md5"
> +
> +config OPTEE_PLATFORM
> +	string
> +	prompt "OPTEE Platform"
> +	help
> +	  Platform to use for OP-TEE.
> +	  i.e. imx for the NXP imx platform or vexpress for versatile express
> +	  platforms.
> +
> +config OPTEE_PLATFORM_FLAVOUR
> +	string
> +	prompt "OPTEE Platform Flavour"
> +	help
> +	  Platform Flavour for the selected platform, i.e. mx6qsabresd for the
> +	  imx platform.
> +
> +config OPTEE_CFG
> +	string
> +	prompt "OP-TEE CFG Flags"
> +	help
> +	  Refer to the following file for the CFG_FLAGS:
> +	  https://github.com/OP-TEE/optee_os/blob/master/mk/config.mk
> +
> +config OPTEE_IMAGES
> +	bool
> +	prompt "copy optee to images directory"

Why is this optional?

> +
> +endif
> diff --git a/rules/optee.in b/rules/optee.in
> new file mode 100644
> index 0000000..77f112f
> --- /dev/null
> +++ b/rules/optee.in
> @@ -0,0 +1,7 @@
> +## SECTION=security
> +
> +menuconfig OPTEE
> +	prompt "OP-TEE"

Spaces.

> +	bool
> +	help
> +	  OP-TEE Secure Operating System
> diff --git a/rules/optee.make b/rules/optee.make
> new file mode 100644
> index 0000000..2865c92
> --- /dev/null
> +++ b/rules/optee.make
> @@ -0,0 +1,113 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Rouven Czerwinski <rouven@czerwinskis.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +ifdef PTXCONF_ARCH_ARM64
> +ifneq ($(shell test -h $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32 && echo ok),ok)
> +    $(warning *** selected_toolchain_optee_aarch32 must point to a valid optee_aarch32 toolchain)
> +    $(error )

Just $(error ). warning+error only make sense for multiple lines.

> +endif
> +ifneq ($(shell test -x $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc && echo ok),ok)
> +    $(warning *** $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc not found)
> +    $(error )
> +endif
> +endif

And why do we need the extra toolchain anyways?

> +
> +PACKAGES-$(PTXCONF_OPTEE) += optee
> +
> +#
> +# Paths and names
> +#
> +OPTEE_VERSION	:= $(call remove_quotes,$(PTXCONF_OPTEE_VERSION))
> +OPTEE_MD5	:= $(call remove_quotes,$(PTXCONF_OPTEE_MD5))
> +OPTEE		:= optee-$(OPTEE_VERSION)
> +OPTEE_SUFFIX	:= tar.gz
> +OPTEE_URL	:= https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
> +OPTEE_SOURCE	:= $(SRCDIR)/$(OPTEE).$(OPTEE_SUFFIX)
> +OPTEE_DIR	:= $(BUILDDIR)/$(OPTEE)
> +OPTEE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +OPTEE_WRAPPER_BLACKLIST := \
> +	TARGET_HARDEN_RELRO \
> +	TARGET_HARDEN_BINDNOW \
> +	TARGET_HARDEN_PIE \
> +	TARGET_DEBUG \
> +	TARGET_BUILD_ID
> +
> +OPTEE_CONF_TOOL := NO
> +
> +$(STATEDIR)/optee.prepare:
> +	@$(call targetinfo)
> +	@$(call touch)

This is the sam as conf_tool = no

> +
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +ifdef PTXCONF_ARCH_ARM64
> +OPTEE_CROSS_COMPILE32= $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(call remove_quotes,$(PTXCONF_OPTEE_AARCH32_CC_PREFIX))
> +OPTEE_MAKE_ENV += CROSS_COMPILE32=$(OPTEE_CROSS_COMPILE32)
> +OPTEE_MAKE_OPT += CFG_ARM64_core=y
> +OPTEE_MAKE_ENV += CROSS_COMPILE64=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
> +endif
> +
> +OPTEE_MAKE_OPT += PLATFORM=$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM))-$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM_FLAVOUR))
> +OPTEE_MAKE_OPT += $(call remove_quotes,$(PTXCONF_OPTEE_CFG))
> +
> +$(STATEDIR)/optee.compile:
> +	@$(call targetinfo)
> +	@$(call world/compile, OPTEE)
> +	@$(call touch)

This is the default.

> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +ifdef PTXCONF_ARCH_ARM64
> +OPTEE_LIB_DIR = export-ta_arm64
> +else
> +OPTEE_LIB_DIR = export-ta_arm32
> +endif
> +
> +OPTEE_OUT_DIR        := \
> +    $(OPTEE_DIR)/out/arm-plat-$(PTXCONF_OPTEE_PLATFORM)
> +
> +$(STATEDIR)/optee.install:
> +	@$(call targetinfo)
> +	@rm -rf $(OPTEES_PKGDIR)
> +	@install -d -m755 $(OPTEE_PKGDIR)/usr/lib/optee-os
> +	@cp -av $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/* $(OPTEE_PKGDIR)/usr/lib/optee-os
> +ifdef PTXCONF_OPTEE_IMAGES
> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee.bin $(IMAGEDIR)/tee.bin
> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-header_v2.bin $(IMAGEDIR)/tee-header_v2.bin
> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-pager_v2.bin $(IMAGEDIR)/tee-pager_v2.bin
> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-pageable_v2.bin $(IMAGEDIR)/tee-pageable_v2.bin
> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee.elf $(IMAGEDIR)/tee.elf

Also add '-v'.

make this a list and loop with foreach.

> +endif
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/optee.clean:
> +	@$(call targetinfo)
> +	@rm -f $(IMAGEDIR)/tee.bin $(IMAGEDIR)/tee-header_v2.bin
> +	@rm -f $(IMAGEDIR)/tee-pager_v2.bin $(IMAGEDIR)/tee-pageable_v2.bin
> +	@rm -f $(IMAGEDIR)/tee-pager_v2.bin $(IMAGEDIR)/tee.elf

and reuse it here.

mol

> +	@$(call clean_pkg, OPTEE)
> +
> +# vim: syntax=make
> -- 
> git-series 0.9.1
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package
  2019-02-04 14:03   ` Michael Olbrich
@ 2019-02-04 14:26     ` Rouven Czerwinski
  2019-02-04 14:51       ` Michael Olbrich
  0 siblings, 1 reply; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04 14:26 UTC (permalink / raw)
  To: ptxdist


Michael Olbrich <m.olbrich@pengutronix.de> writes:

> On Mon, Feb 04, 2019 at 10:56:00AM +0100, Rouven Czerwinski wrote:
>> Provide two KConfig files to allow inclusion of OP-TEE for userspace libraries
>> and applications.
>> 
>> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
>> ---
>>  platforms/optee.in |  54 ++++++++++++++++++++++-
>>  rules/optee.in     |   7 +++-
>>  rules/optee.make   | 113 ++++++++++++++++++++++++++++++++++++++++++++++-
>>  3 files changed, 174 insertions(+)
>>  create mode 100644 platforms/optee.in
>>  create mode 100644 rules/optee.in
>>  create mode 100644 rules/optee.make
>> 
>> diff --git a/platforms/optee.in b/platforms/optee.in
>> new file mode 100644
>> index 0000000..b750774
>> --- /dev/null
>> +++ b/platforms/optee.in
>> @@ -0,0 +1,54 @@
>> +## SECTION=bootloader
>> +
>> +menuconfig OPTEE
>> +	select BOOTLOADER
>> +	prompt "OPTEE"
>
> Spaces.
>
> And "OP-TEE" or "optee" I think.
I think it should be OP-TEE.

>> +	bool
>> +	help
>> +	  OP-TEE is an open source project which contains a full implementation
>> +	  to make up a complete Trusted Execution Environment. The project has
>> +	  roots in a proprietary solution, initially created by ST-Ericsson and
>> +	  then owned and maintained by STMicroelectronics. In 2014, Linaro
>> +	  started working with STMicroelectronics to transform the proprietary
>> +	  TEE solution into an open source TEE solution instead.
>> +
>> +if OPTEE
>> +
>> +config OPTEE_VERSION
>> +	string
>> +	prompt "OPTEE version"
>> +	help
>> +	  Enter the OPTEE version you want to build. Usally something like
>> +	  "3.1.0"
>
> Why is this needed?

It's not needed and should be configured in the makefile.
I will remove the Kconfig entry, otherwise the different packages could
get incompatible anyway.

>> +
>> +config OPTEE_MD5
>> +	string
>> +	prompt "OPTEE source md5"
>> +
>> +config OPTEE_PLATFORM
>> +	string
>> +	prompt "OPTEE Platform"
>> +	help
>> +	  Platform to use for OP-TEE.
>> +	  i.e. imx for the NXP imx platform or vexpress for versatile express
>> +	  platforms.
>> +
>> +config OPTEE_PLATFORM_FLAVOUR
>> +	string
>> +	prompt "OPTEE Platform Flavour"
>> +	help
>> +	  Platform Flavour for the selected platform, i.e. mx6qsabresd for the
>> +	  imx platform.
>> +
>> +config OPTEE_CFG
>> +	string
>> +	prompt "OP-TEE CFG Flags"
>> +	help
>> +	  Refer to the following file for the CFG_FLAGS:
>> +	  https://github.com/OP-TEE/optee_os/blob/master/mk/config.mk
>> +
>> +config OPTEE_IMAGES
>> +	bool
>> +	prompt "copy optee to images directory"
>
> Why is this optional?

I will remove the KConfig option.
>
>> +
>> +endif
>> diff --git a/rules/optee.in b/rules/optee.in
>> new file mode 100644
>> index 0000000..77f112f
>> --- /dev/null
>> +++ b/rules/optee.in
>> @@ -0,0 +1,7 @@
>> +## SECTION=security
>> +
>> +menuconfig OPTEE
>> +	prompt "OP-TEE"
>
> Spaces.
will fix.

>
>> +	bool
>> +	help
>> +	  OP-TEE Secure Operating System
>> diff --git a/rules/optee.make b/rules/optee.make
>> new file mode 100644
>> index 0000000..2865c92
>> --- /dev/null
>> +++ b/rules/optee.make
>> @@ -0,0 +1,113 @@
>> +# -*-makefile-*-
>> +#
>> +# Copyright (C) 2018 by Rouven Czerwinski <rouven@czerwinskis.de>
>> +#
>> +# See CREDITS for details about who has contributed to this project.
>> +#
>> +# For further information about the PTXdist project and license conditions
>> +# see the README file.
>> +#
>> +
>> +#
>> +# We provide this package
>> +#
>> +ifdef PTXCONF_ARCH_ARM64
>> +ifneq ($(shell test -h $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32 && echo ok),ok)
>> +    $(warning *** selected_toolchain_optee_aarch32 must point to a valid optee_aarch32 toolchain)
>> +    $(error )
>
> Just $(error ). warning+error only make sense for multiple lines.
>
>> +endif
>> +ifneq ($(shell test -x $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc && echo ok),ok)
>> +    $(warning *** $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc not found)
>> +    $(error )
>> +endif
>> +endif
>
> And why do we need the extra toolchain anyways?
Due to OP-TEEs build system, see
https://github.com/OP-TEE/optee_website/tree/master/build_system#cross_compile-cross-compiler-selection

>> +
>> +PACKAGES-$(PTXCONF_OPTEE) += optee
>> +
>> +#
>> +# Paths and names
>> +#
>> +OPTEE_VERSION	:= $(call remove_quotes,$(PTXCONF_OPTEE_VERSION))
>> +OPTEE_MD5	:= $(call remove_quotes,$(PTXCONF_OPTEE_MD5))
>> +OPTEE		:= optee-$(OPTEE_VERSION)
>> +OPTEE_SUFFIX	:= tar.gz
>> +OPTEE_URL	:= https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
>> +OPTEE_SOURCE	:= $(SRCDIR)/$(OPTEE).$(OPTEE_SUFFIX)
>> +OPTEE_DIR	:= $(BUILDDIR)/$(OPTEE)
>> +OPTEE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
>> +
>> +# ----------------------------------------------------------------------------
>> +# Prepare
>> +# ----------------------------------------------------------------------------
>> +
>> +OPTEE_WRAPPER_BLACKLIST := \
>> +	TARGET_HARDEN_RELRO \
>> +	TARGET_HARDEN_BINDNOW \
>> +	TARGET_HARDEN_PIE \
>> +	TARGET_DEBUG \
>> +	TARGET_BUILD_ID
>> +
>> +OPTEE_CONF_TOOL := NO
>> +
>> +$(STATEDIR)/optee.prepare:
>> +	@$(call targetinfo)
>> +	@$(call touch)
>
> This is the sam as conf_tool = no
I will remove the prepare statements.

>
>> +
>> +
>> +# ----------------------------------------------------------------------------
>> +# Compile
>> +# ----------------------------------------------------------------------------
>> +
>> +ifdef PTXCONF_ARCH_ARM64
>> +OPTEE_CROSS_COMPILE32= $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(call remove_quotes,$(PTXCONF_OPTEE_AARCH32_CC_PREFIX))
>> +OPTEE_MAKE_ENV += CROSS_COMPILE32=$(OPTEE_CROSS_COMPILE32)
>> +OPTEE_MAKE_OPT += CFG_ARM64_core=y
>> +OPTEE_MAKE_ENV += CROSS_COMPILE64=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
>> +endif
>> +
>> +OPTEE_MAKE_OPT += PLATFORM=$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM))-$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM_FLAVOUR))
>> +OPTEE_MAKE_OPT += $(call remove_quotes,$(PTXCONF_OPTEE_CFG))
>> +
>> +$(STATEDIR)/optee.compile:
>> +	@$(call targetinfo)
>> +	@$(call world/compile, OPTEE)
>> +	@$(call touch)
>
> This is the default.

Will remove as well.
>
>> +
>> +# ----------------------------------------------------------------------------
>> +# Install
>> +# ----------------------------------------------------------------------------
>> +ifdef PTXCONF_ARCH_ARM64
>> +OPTEE_LIB_DIR = export-ta_arm64
>> +else
>> +OPTEE_LIB_DIR = export-ta_arm32
>> +endif
>> +
>> +OPTEE_OUT_DIR        := \
>> +    $(OPTEE_DIR)/out/arm-plat-$(PTXCONF_OPTEE_PLATFORM)
>> +
>> +$(STATEDIR)/optee.install:
>> +	@$(call targetinfo)
>> +	@rm -rf $(OPTEES_PKGDIR)
>> +	@install -d -m755 $(OPTEE_PKGDIR)/usr/lib/optee-os
>> +	@cp -av $(OPTEE_OUT_DIR)/$(OPTEE_LIB_DIR)/* $(OPTEE_PKGDIR)/usr/lib/optee-os
>> +ifdef PTXCONF_OPTEE_IMAGES
>> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee.bin $(IMAGEDIR)/tee.bin
>> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-header_v2.bin $(IMAGEDIR)/tee-header_v2.bin
>> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-pager_v2.bin $(IMAGEDIR)/tee-pager_v2.bin
>> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee-pageable_v2.bin $(IMAGEDIR)/tee-pageable_v2.bin
>> +	@install -D -m644 $(OPTEE_OUT_DIR)/core/tee.elf $(IMAGEDIR)/tee.elf
>
> Also add '-v'.
>
> make this a list and loop with foreach.

will fix.
>
>> +endif
>> +	@$(call touch)
>> +
>> +# ----------------------------------------------------------------------------
>> +# Clean
>> +# ----------------------------------------------------------------------------
>> +
>> +$(STATEDIR)/optee.clean:
>> +	@$(call targetinfo)
>> +	@rm -f $(IMAGEDIR)/tee.bin $(IMAGEDIR)/tee-header_v2.bin
>> +	@rm -f $(IMAGEDIR)/tee-pager_v2.bin $(IMAGEDIR)/tee-pageable_v2.bin
>> +	@rm -f $(IMAGEDIR)/tee-pager_v2.bin $(IMAGEDIR)/tee.elf
>
> and reuse it here.

Yes.
>
> mol
>
>> +	@$(call clean_pkg, OPTEE)
>> +
>> +# vim: syntax=make
>> -- 
>> git-series 0.9.1
>> 
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [ptxdist] [PATCH 2/5] optee-client: add tee-supplicant service file
  2019-02-04 13:22   ` Michael Olbrich
@ 2019-02-04 14:28     ` Rouven Czerwinski
  0 siblings, 0 replies; 13+ messages in thread
From: Rouven Czerwinski @ 2019-02-04 14:28 UTC (permalink / raw)
  To: ptxdist


Michael Olbrich <m.olbrich@pengutronix.de> writes:

> On Mon, Feb 04, 2019 at 10:55:59AM +0100, Rouven Czerwinski wrote:
>> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
>> ---
>>  projectroot/usr/lib/systemd/system/tee-supplicant.service |  9 ++++++-
>>  rules/optee-client.in                                     | 13 +++++++-
>>  rules/optee-client.make                                   |  8 +++++-
>>  3 files changed, 29 insertions(+), 1 deletion(-)
>>  create mode 100644 projectroot/usr/lib/systemd/system/tee-supplicant.service
>> 
>> diff --git a/projectroot/usr/lib/systemd/system/tee-supplicant.service b/projectroot/usr/lib/systemd/system/tee-supplicant.service
>> new file mode 100644
>> index 0000000..f8eacff
>> --- /dev/null
>> +++ b/projectroot/usr/lib/systemd/system/tee-supplicant.service
>> @@ -0,0 +1,9 @@
>> +[Unit]
>> +Description=TEE Supplicant
>> +
>> +[Service]
>> +Type=simple
>> +ExecStart=/usr/bin/tee-supplicant
>> +
>> +[Install]
>> +WantedBy=multi-user.target
>> \ No newline at end of file
>
> Add newline.
Yep!

>
>> diff --git a/rules/optee-client.in b/rules/optee-client.in
>> index 9099b4c..0ed2511 100644
>> --- a/rules/optee-client.in
>> +++ b/rules/optee-client.in
>> @@ -1,8 +1,9 @@
>>  ## SECTION=security
>>  
>> -config OPTEE_CLIENT
>> +menuconfig OPTEE_CLIENT
>>  	tristate
>>  	prompt "optee-client"
>
> Add spaces to align the '-->' in the menu.

will fix.
>
>
>> +	select OPTEE
>>  	help
>>  	  Open Portable Trusted Execution Environment Client API.
>>  
>> @@ -11,3 +12,13 @@ config OPTEE_CLIENT
>>  	  a binary tee-supplicant which is a daemon serving the
>>  	  Trusted OS in secure world with miscellaneous features, such
>>  	  as file system access.
>> +
>> +if OPTEE_CLIENT
>> +
>> +config OPTEE_CLIENT_SYSTEMD_UNIT
>> +	bool
>> +	default y
>> +	depends on SYSTEMD
>> +	prompt "install systemd service file for tee-supplicant"
>> +
>> +endif
>> diff --git a/rules/optee-client.make b/rules/optee-client.make
>> index 09cae7e..9c5d30b 100644
>> --- a/rules/optee-client.make
>> +++ b/rules/optee-client.make
>> @@ -54,6 +54,14 @@ $(STATEDIR)/optee-client.targetinstall:
>>  
>>  	@$(call install_lib, optee-client, 0, 0, 0644, libteec)
>>  	@$(call install_copy, optee-client, 0, 0, 0755, -, /usr/bin/tee-supplicant)
>> +ifdef PTXCONF_INITMETHOD_SYSTEMD
>
> Not necessary.

Ah, good to know, will remove.
>
> Michael
>
>> +ifdef PTXCONF_OPTEE_CLIENT_SYSTEMD_UNIT
>> +	@$(call install_alternative, optee-client, 0, 0, 0644, \
>> +		/usr/lib/systemd/system/tee-supplicant.service)
>> +	@$(call install_link, optee-client, ../tee-supplicant.service,\
>> +		/usr/lib/systemd/system/multi-user.target.wants/tee-supplicant.service)
>> +endif
>> +endif
>>  
>>  	@$(call install_finish, optee-client)
>>  
>> -- 
>> git-series 0.9.1
>> 
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [ptxdist] [PATCH 4/5] optee_test: add new optee_test target package
  2019-02-04  9:56 ` [ptxdist] [PATCH 4/5] optee_test: add new optee_test " Rouven Czerwinski
@ 2019-02-04 14:43   ` Michael Olbrich
  0 siblings, 0 replies; 13+ messages in thread
From: Michael Olbrich @ 2019-02-04 14:43 UTC (permalink / raw)
  To: ptxdist

On Mon, Feb 04, 2019 at 10:56:01AM +0100, Rouven Czerwinski wrote:
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  rules/optee_test.in   |  9 +++++-
>  rules/optee_test.make | 82 ++++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 91 insertions(+)
>  create mode 100644 rules/optee_test.in
>  create mode 100644 rules/optee_test.make
> 
> diff --git a/rules/optee_test.in b/rules/optee_test.in
> new file mode 100644
> index 0000000..43b0d90
> --- /dev/null
> +++ b/rules/optee_test.in
> @@ -0,0 +1,9 @@
> +## SECTION=security
> +
> +config OPTEE_TEST
> +	tristate
> +	select OPTEE_CLIENT
> +	select OPENSSL
> +	prompt "optee_test"
> +	help
> +	  FIXME
> diff --git a/rules/optee_test.make b/rules/optee_test.make
> new file mode 100644
> index 0000000..f18a1e4
> --- /dev/null
> +++ b/rules/optee_test.make
> @@ -0,0 +1,82 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Rouven Czerwinski <rouven@czerwinskis.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_OPTEE_TEST) += optee_test

No '_' in package names.

> +
> +#
> +# Paths and names
> +#
> +OPTEE_TEST_VERSION	:= 3.4.0
> +OPTEE_TEST_MD5		:= 5bfd9c01a8271e0b7d623d208349f183
> +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)
> +OPTEE_TEST_SOURCE	:= $(SRCDIR)/$(OPTEE_TEST).$(OPTEE_TEST_SUFFIX)
> +OPTEE_TEST_DIR		:= $(BUILDDIR)/$(OPTEE_TEST)
> +OPTEE_TEST_LICENSE	:= BSD-2-Clause and GPL-2.0
> +
> +# ----------------------------------------------------------------------------
> +# Get
> +# ----------------------------------------------------------------------------
> +
> +#$(OPTEE_TEST_SOURCE):
> +#	@$(call targetinfo)
> +#	@$(call get, OPTEE_TEST)

See my other mails.

> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +OPTEE_TEST_CONF_TOOL := NO
> +OPTEE_TEST_CONF_ENV	:= $(CROSS_ENV)
> +OPTEE_TEST_MAKE_ENV += CROSS_COMPILE_HOST=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
> +OPTEE_TEST_MAKE_ENV += CROSS_COMPILE_TA=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))

The quotes are already removed (see rules/other/Namespace.make)

> +OPTEE_TEST_MAKE_ENV += TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os
> +OPTEE_TEST_MAKE_ENV += OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr
> +OPTEE_TEST_MAKE_ENV += COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib
> +OPTEE_TEST_MAKE_ENV += CFG_SECURE_KEY_SERVICES=y


OPTEE_TEST_CONF_ENV	:= \
	$(CROSS_ENV) \
	CROSS_COMPILE_HOST=... \
	[...]



> +
> +
> +ifndef PTXCONF_ARCH_LP64
> +OPTEE_TEST_CFLAGS += -D_FILE_OFFSET_BITS=64
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/optee_test.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, optee_test)
> +	@$(call install_fixup, optee_test,PRIORITY,optional)
> +	@$(call install_fixup, optee_test,SECTION,base)
> +	@$(call install_fixup, optee_test,AUTHOR,"Rouven Czerwinski <rouven@czerwinskis.de>")
> +	@$(call install_fixup, optee_test,DESCRIPTION,missing)
> +
> +	@$(call install_copy, optee_test, 0, 0, 0755, $(OPTEE_TEST_DIR)/out/xtest/xtest, /opt/optee_test/xtest/xtest)

No. Install files to pkgdir in .install

> +	@$(call install_tree, optee_test, 0, 0, -, /lib/optee_armtz)
> +
> +	@$(call install_finish, optee_test)
> +
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/optee_test.clean:
> +	@$(call targetinfo)
> +	@$(call clean_pkg, OPTEE_TEST)

remove.

mol

> +
> +# vim: syntax=make
> -- 
> git-series 0.9.1
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package
  2019-02-04 14:26     ` Rouven Czerwinski
@ 2019-02-04 14:51       ` Michael Olbrich
  0 siblings, 0 replies; 13+ messages in thread
From: Michael Olbrich @ 2019-02-04 14:51 UTC (permalink / raw)
  To: ptxdist

On Mon, Feb 04, 2019 at 03:26:15PM +0100, Rouven Czerwinski wrote:
> Michael Olbrich <m.olbrich@pengutronix.de> writes:
> > On Mon, Feb 04, 2019 at 10:56:00AM +0100, Rouven Czerwinski wrote:
> >> Provide two KConfig files to allow inclusion of OP-TEE for userspace libraries
> >> and applications.
> >> 
> >> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> >> ---
> >>  platforms/optee.in |  54 ++++++++++++++++++++++-
> >>  rules/optee.in     |   7 +++-
> >>  rules/optee.make   | 113 ++++++++++++++++++++++++++++++++++++++++++++++-
> >>  3 files changed, 174 insertions(+)
> >>  create mode 100644 platforms/optee.in
> >>  create mode 100644 rules/optee.in
> >>  create mode 100644 rules/optee.make
> >> +endif
> >> +ifneq ($(shell test -x $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc && echo ok),ok)
> >> +    $(warning *** $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(PTXCONF_OPTEE_AARCH32_CC_PREFIX)gcc not found)
> >> +    $(error )
> >> +endif
> >> +endif
> >
> > And why do we need the extra toolchain anyways?
> Due to OP-TEEs build system, see
> https://github.com/OP-TEE/optee_website/tree/master/build_system#cross_compile-cross-compiler-selection

Is the 32bit stuff actually used anywhere, or it this just a broken build
system? Could use use the aarch64 toolchain with -mabi=ilp32 ?

> >> +
> >> +# ----------------------------------------------------------------------------
> >> +# Compile
> >> +# ----------------------------------------------------------------------------
> >> +
> >> +ifdef PTXCONF_ARCH_ARM64
> >> +OPTEE_CROSS_COMPILE32= $(PTXDIST_WORKSPACE)/selected_toolchain_optee_aarch32/$(call remove_quotes,$(PTXCONF_OPTEE_AARCH32_CC_PREFIX))
> >> +OPTEE_MAKE_ENV += CROSS_COMPILE32=$(OPTEE_CROSS_COMPILE32)
> >> +OPTEE_MAKE_OPT += CFG_ARM64_core=y
> >> +OPTEE_MAKE_ENV += CROSS_COMPILE64=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))

As noted elsewhere: PTXCONF_COMPILER_PREFIX has no quotes

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [ptxdist] [PATCH 5/5] optee_examples: add as new target package
  2019-02-04  9:56 ` [ptxdist] [PATCH 5/5] optee_examples: add as new " Rouven Czerwinski
@ 2019-02-04 14:54   ` Michael Olbrich
  0 siblings, 0 replies; 13+ messages in thread
From: Michael Olbrich @ 2019-02-04 14:54 UTC (permalink / raw)
  To: ptxdist

On Mon, Feb 04, 2019 at 10:56:02AM +0100, Rouven Czerwinski wrote:
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  rules/optee_examples.in   | 10 +++++-
>  rules/optee_examples.make | 77 ++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 87 insertions(+)
>  create mode 100644 rules/optee_examples.in
>  create mode 100644 rules/optee_examples.make
> 
> diff --git a/rules/optee_examples.in b/rules/optee_examples.in
> new file mode 100644
> index 0000000..304048f
> --- /dev/null
> +++ b/rules/optee_examples.in
> @@ -0,0 +1,10 @@
> +## SECTION=security
> +
> +config OPTEE_EXAMPLES
> +	tristate
> +	select OPTEE
> +	select OPTEE_CLIENT
> +	prompt "optee_examples"
> +	help
> +	  Install the optee examples package from
> +	  https://github.com/linaro-swg/optee_examples
> diff --git a/rules/optee_examples.make b/rules/optee_examples.make
> new file mode 100644
> index 0000000..30acd0b
> --- /dev/null
> +++ b/rules/optee_examples.make
> @@ -0,0 +1,77 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Rouven Czerwinski <rouven@czerwinskis.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_OPTEE_EXAMPLES) += optee_examples

No _

> +
> +#
> +# Paths and names
> +#
> +OPTEE_EXAMPLES_VERSION	:= 3.4.0
> +OPTEE_EXAMPLES_MD5	:= 20bf84c5c647f9270e9edb9bb79f75db
> +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)
> +OPTEE_EXAMPLES_SOURCE	:= $(SRCDIR)/$(OPTEE_EXAMPLES).$(OPTEE_EXAMPLES_SUFFIX)
> +OPTEE_EXAMPLES_DIR	:= $(BUILDDIR)/$(OPTEE_EXAMPLES)
> +OPTEE_EXAMPLES_LICENSE	:= BSD-2-Clause
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +OPTEE_EXAMPLES_MAKE_ENV	:= $(CROSS_ENV)
> +OPTEE_EXAMPLES_CONF_TOOL := NO
> +
> +OPTEE_EXAMPLES_MAKE_ENV += HOST_CROSS_COMPILE=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX))
> +OPTEE_EXAMPLES_MAKE_ENV += TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os
> +OPTEE_EXAMPLES_MAKE_ENV += TEEC_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr

+OPTEE_EXAMPLES_MAKE_ENV := \
	$(CROSS_ENV) \
	...

> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/optee_examples.install:
> +	@$(call targetinfo)

install the stuff here to OPTEE_EXAMPLES_PKGDIR

> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/optee_examples.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, optee_examples)
> +	@$(call install_fixup, optee_examples,PRIORITY,optional)
> +	@$(call install_fixup, optee_examples,SECTION,base)
> +	@$(call install_fixup, optee_examples,AUTHOR,"Rouven Czerwinski <rouven@czerwinskis.de>")
> +	@$(call install_fixup, optee_examples,DESCRIPTION,missing)
> +
> +	@$(call install_copy, optee_examples, 0, 0, 0755, /opt/examples)

This is implied by the install_tree below.


> +	@$(call install_copy, optee_examples, 0, 0, 0755, /lib/optee_armtz)

same here.

> +	@$(call install_glob, optee_examples, 0, 0, $(OPTEE_EXAMPLES_DIR)/out/ta/, /lib/optee_armtz, *.ta, -)
> +	@$(call install_tree, optee_examples, 0, 0, $(OPTEE_EXAMPLES_DIR)/out/ca/, /opt/examples/)

Why /opt? Maybe /usr/lib/optee/examples?

Michael

> +
> +	@$(call install_finish, optee_examples)
> +
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/optee_examples.clean:
> +#	@$(call targetinfo)
> +#	@$(call clean_pkg, OPTEE_EXAMPLES)
> +
> +# vim: syntax=make
> -- 
> git-series 0.9.1
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2019-02-04 14:54 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-04  9:55 [ptxdist] [PATCH 0/5] Support for OP-TEE (Open Portable Trusted Execution Environment) Rouven Czerwinski
2019-02-04  9:55 ` [ptxdist] [PATCH 1/5] optee-client: bump to 3.4.0 Rouven Czerwinski
2019-02-04  9:55 ` [ptxdist] [PATCH 2/5] optee-client: add tee-supplicant service file Rouven Czerwinski
2019-02-04 13:22   ` Michael Olbrich
2019-02-04 14:28     ` Rouven Czerwinski
2019-02-04  9:56 ` [ptxdist] [PATCH 3/5] optee: add the OP-TEE as new target package Rouven Czerwinski
2019-02-04 14:03   ` Michael Olbrich
2019-02-04 14:26     ` Rouven Czerwinski
2019-02-04 14:51       ` Michael Olbrich
2019-02-04  9:56 ` [ptxdist] [PATCH 4/5] optee_test: add new optee_test " Rouven Czerwinski
2019-02-04 14:43   ` Michael Olbrich
2019-02-04  9:56 ` [ptxdist] [PATCH 5/5] optee_examples: add as new " Rouven Czerwinski
2019-02-04 14:54   ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox