Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de> --- ...eserve-links-to-libraries-during-make-cop.patch | 27 ++++++++++ patches/optee-client-2.4.0/series | 4 ++ rules/optee-client.in | 13 +++++ rules/optee-client.make | 59 ++++++++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 patches/optee-client-2.4.0/0001-Makefile-preserve-links-to-libraries-during-make-cop.patch create mode 100644 patches/optee-client-2.4.0/series create mode 100644 rules/optee-client.in create mode 100644 rules/optee-client.make
diff --git a/patches/optee-client-2.4.0/0001-Makefile-preserve-links-to-libraries-during-make-cop.patch b/patches/optee-client-2.4.0/0001-Makefile-preserve-links-to-libraries-during-make-cop.patch new file mode 100644 index 000000000000..e7616e29ec87 --- /dev/null +++ b/patches/optee-client-2.4.0/0001-Makefile-preserve-links-to-libraries-during-make-cop.patch @@ -0,0 +1,27 @@ +From: Marc Kleine-Budde <m...@pengutronix.de> +Date: Mon, 12 Jun 2017 17:13:30 +0200 +Subject: [PATCH] Makefile: preserve links to libraries during make copy_export + +During "make copy_export" and "make install" the shared library is +copied into the LIBDIR. However "cp" is used, thus the links to the +shared library are not preserved. This patch fixes the problem by using +"cp -a" instead. + +Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index c7462479e5fe..4c2d45851543 100644 +--- a/Makefile ++++ b/Makefile +@@ -128,7 +128,7 @@ distclean: clean + + copy_export: build + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) +- cp ${O}/libteec/libteec.so* $(DESTDIR)$(LIBDIR) ++ cp -a ${O}/libteec/libteec.so* $(DESTDIR)$(LIBDIR) + if [ "$(BUILD-LIBSQLFS)" ]; then cp ${O}/libsqlfs/libsqlfs.so* $(DESTDIR)$(LIBDIR); fi + cp ${O}/tee-supplicant/tee-supplicant $(DESTDIR)$(BINDIR) + cp public/*.h $(DESTDIR)$(INCLUDEDIR) diff --git a/patches/optee-client-2.4.0/series b/patches/optee-client-2.4.0/series new file mode 100644 index 000000000000..67909b73dcbb --- /dev/null +++ b/patches/optee-client-2.4.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Makefile-preserve-links-to-libraries-during-make-cop.patch +# fcb00a29db34466467890d0b5ce73392 - git-ptx-patches magic diff --git a/rules/optee-client.in b/rules/optee-client.in new file mode 100644 index 000000000000..9099b4c48adb --- /dev/null +++ b/rules/optee-client.in @@ -0,0 +1,13 @@ +## SECTION=security + +config OPTEE_CLIENT + tristate + prompt "optee-client" + help + Open Portable Trusted Execution Environment Client API. + + This package contains libteec.so, which is the library that + contains that API for communication with the Trusted OS. And + a binary tee-supplicant which is a daemon serving the + Trusted OS in secure world with miscellaneous features, such + as file system access. diff --git a/rules/optee-client.make b/rules/optee-client.make new file mode 100644 index 000000000000..25835ed1e56b --- /dev/null +++ b/rules/optee-client.make @@ -0,0 +1,59 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Marc Kleine-Budde <m...@pengutronix.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_CLIENT) += optee-client + +# +# Paths and names +# +OPTEE_CLIENT_VERSION := 2.4.0 +OPTEE_CLIENT_MD5 := 5c27298b0e28aa9b28d18e44c79cc66d +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) +OPTEE_CLIENT_SOURCE := $(SRCDIR)/$(OPTEE_CLIENT).$(OPTEE_CLIENT_SUFFIX) +OPTEE_CLIENT_DIR := $(BUILDDIR)/$(OPTEE_CLIENT) +OPTEE_CLIENT_LICENSE := BSD-2-Clause + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +OPTEE_CLIENT_CONF_TOOL := NO +OPTEE_CLIENT_MAKE_ENV := \ + $(CROSS_ENV) \ + LIBDIR=/usr/lib \ + BINDIR=/usr/bin \ + INCLUDEDIR=/usr/include + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/optee-client.targetinstall: + @$(call targetinfo) + + @$(call install_init, optee-client) + @$(call install_fixup, optee-client,PRIORITY,optional) + @$(call install_fixup, optee-client,SECTION,base) + @$(call install_fixup, optee-client,AUTHOR,"Marc Kleine-Budde <m...@pengutronix.de>") + @$(call install_fixup, optee-client,DESCRIPTION,missing) + + @$(call install_lib, optee-client, 0, 0, 0644, libteec) + @$(call install_copy, optee-client, 0, 0, 0755, -, /usr/bin/tee-supplicant) + + @$(call install_finish, optee-client) + + @$(call touch) + +# vim: syntax=make -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de