From 5da8b1d811e76dcc089404f123b00684d8b58ad4 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 12 Jun 2017 19:08:40 +0200 Subject: optee-client: add the "Open Portable Trusted Execution Environment" client Signed-off-by: Marc Kleine-Budde Signed-off-by: Michael Olbrich --- ...eserve-links-to-libraries-during-make-cop.patch | 27 +++++++++++++++++++ ...efile-create-relative-links-to-shared-lib.patch | 30 ++++++++++++++++++++++ patches/optee-client-2.4.0/series | 5 ++++ 3 files changed, 62 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/0002-libteec-Makefile-create-relative-links-to-shared-lib.patch create mode 100644 patches/optee-client-2.4.0/series (limited to 'patches') 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 000000000..e7616e29e --- /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 +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 +--- + 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/0002-libteec-Makefile-create-relative-links-to-shared-lib.patch b/patches/optee-client-2.4.0/0002-libteec-Makefile-create-relative-links-to-shared-lib.patch new file mode 100644 index 000000000..0b9efe394 --- /dev/null +++ b/patches/optee-client-2.4.0/0002-libteec-Makefile-create-relative-links-to-shared-lib.patch @@ -0,0 +1,30 @@ +From: Marc Kleine-Budde +Date: Mon, 12 Jun 2017 17:55:32 +0200 +Subject: [PATCH] libteec/Makefile: create relative links to shared library + instead of absolute ones + +Absolute paths in link targets are ugly and there is always a risk that +they may be packaged incorrectly. Further the *.so* files are always +expected to reside in the same directory. This patch fixes this problem. + +Suggested-by: Jerome Forissier +Signed-off-by: Marc Kleine-Budde +--- + libteec/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libteec/Makefile b/libteec/Makefile +index 66055a723a2d..f40898569e9e 100644 +--- a/libteec/Makefile ++++ b/libteec/Makefile +@@ -33,8 +33,8 @@ TEEC_LFLAGS := -lpthread + TEEC_LIBRARY := $(OUT_DIR)/$(LIB_MAJ_MIN) + + libteec: $(TEEC_LIBRARY) +- $(VPREFIX)ln -sf $(TEEC_LIBRARY) $(OUT_DIR)/$(LIB_MAJOR) +- $(VPREFIX)ln -sf $(OUT_DIR)/$(LIB_MAJOR) $(OUT_DIR)/$(LIB_NAME) ++ $(VPREFIX)ln -sf $(LIB_MAJ_MIN) $(OUT_DIR)/$(LIB_MAJOR) ++ $(VPREFIX)ln -sf $(LIB_MAJOR) $(OUT_DIR)/$(LIB_NAME) + + $(TEEC_LIBRARY): $(TEEC_OBJS) + @echo " LINK $@" diff --git a/patches/optee-client-2.4.0/series b/patches/optee-client-2.4.0/series new file mode 100644 index 000000000..a5150ee47 --- /dev/null +++ b/patches/optee-client-2.4.0/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Makefile-preserve-links-to-libraries-during-make-cop.patch +0002-libteec-Makefile-create-relative-links-to-shared-lib.patch +# 6e062706c976942f1f2f5f9c2c524618 - git-ptx-patches magic -- cgit v1.2.3