Re: [ptxdist] [PATCH 4/5] optee_test: add new optee_test target package

[Michael Olbrich <m.olbrich@pengutronix.de>]

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