summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRouven Czerwinski <r.czerwinski@pengutronix.de>2019-04-29 08:43:22 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-05-01 10:37:34 +0200
commit016a6c2790f84e40dd6b7e1426e23f19ee61ca0a (patch)
tree0450f164b63a51f20617f303cd776703458c092e
parentc992a7977452a29c53494e524c0aaf9de86324fe (diff)
downloadptxdist-016a6c2790f84e40dd6b7e1426e23f19ee61ca0a.tar.gz
ptxdist-016a6c2790f84e40dd6b7e1426e23f19ee61ca0a.tar.xz
optee-client: version bump 3.4.0 → 3.5.0
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--projectroot/usr/lib/systemd/system/tee-supplicant.service2
-rw-r--r--rules/optee-client.make7
2 files changed, 4 insertions, 5 deletions
diff --git a/projectroot/usr/lib/systemd/system/tee-supplicant.service b/projectroot/usr/lib/systemd/system/tee-supplicant.service
index cef6b980d..714851573 100644
--- a/projectroot/usr/lib/systemd/system/tee-supplicant.service
+++ b/projectroot/usr/lib/systemd/system/tee-supplicant.service
@@ -3,7 +3,7 @@ Description=TEE Supplicant
[Service]
Type=simple
-ExecStart=/usr/bin/tee-supplicant
+ExecStart=/usr/sbin/tee-supplicant
[Install]
WantedBy=multi-user.target
diff --git a/rules/optee-client.make b/rules/optee-client.make
index 042bfdfcc..d4dbeec39 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 := 3.4.0
-OPTEE_CLIENT_MD5 := ccefa79858454e9255d1a5f93335e322
+OPTEE_CLIENT_VERSION := 3.5.0
+OPTEE_CLIENT_MD5 := 2738729cb2457f2b4993ef6b91a6519d
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)
@@ -33,7 +33,6 @@ OPTEE_CLIENT_CONF_TOOL := NO
OPTEE_CLIENT_MAKE_ENV := \
$(CROSS_ENV) \
LIBDIR=/usr/lib \
- BINDIR=/usr/bin \
INCLUDEDIR=/usr/include
ifdef PTXDIST_ICECC
@@ -53,7 +52,7 @@ $(STATEDIR)/optee-client.targetinstall:
@$(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_copy, optee-client, 0, 0, 0755, -, /usr/sbin/tee-supplicant)
ifdef PTXCONF_OPTEE_CLIENT_SYSTEMD_UNIT
@$(call install_alternative, optee-client, 0, 0, 0644, \
/usr/lib/systemd/system/tee-supplicant.service)