diff options
| author | Rouven Czerwinski <r.czerwinski@pengutronix.de> | 2019-02-13 09:42:57 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-13 12:04:58 +0100 |
| commit | 69668882bd8ed042fd97d050be18226cf174e7f2 (patch) | |
| tree | 3b6c3b88943f8ace3b257155a6494d77d9ce51b1 /patches | |
| parent | 97727e2fdab395969a97f3ec3853380ec5253f99 (diff) | |
| download | ptxdist-69668882bd8ed042fd97d050be18226cf174e7f2.tar.gz ptxdist-69668882bd8ed042fd97d050be18226cf174e7f2.tar.xz | |
optee-client: bump to 3.4.0
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
3 files changed, 0 insertions, 62 deletions
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 deleted file mode 100644 index e7616e29e..000000000 --- a/patches/optee-client-2.4.0/0001-Makefile-preserve-links-to-libraries-during-make-cop.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Marc Kleine-Budde <mkl@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 <mkl@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/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 deleted file mode 100644 index 0b9efe394..000000000 --- a/patches/optee-client-2.4.0/0002-libteec-Makefile-create-relative-links-to-shared-lib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -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 <jerome.forissier@linaro.org> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - 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 deleted file mode 100644 index a5150ee47..000000000 --- a/patches/optee-client-2.4.0/series +++ /dev/null @@ -1,5 +0,0 @@ -# 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 |