diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2019-11-18 15:14:14 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2019-11-18 15:14:14 +0000 |
| commit | e62ae92fee548d64c2d91f00f340dd41b0754ca0 (patch) | |
| tree | 7490132523c8d8ff1b67059974b7d7b15a79da5b | |
| parent | c70d14c3f25a1630cce521275a6548232d752df9 (diff) | |
| parent | 2b0d21d178e653ff97fe5be3b30b3c1292bda28d (diff) | |
Merge "optee-client: fixup 04e6f41"
| -rw-r--r-- | meta-optee/recipes-security/optee/optee-client.bb | 10 | ||||
| -rw-r--r-- | meta-optee/recipes-security/optee/optee-client/tee-supplicant.service | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-optee/recipes-security/optee/optee-client.bb b/meta-optee/recipes-security/optee/optee-client.bb index ddc746ea..519683a6 100644 --- a/meta-optee/recipes-security/optee/optee-client.bb +++ b/meta-optee/recipes-security/optee/optee-client.bb @@ -6,26 +6,26 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" PV = "3.7.0+git${SRCPV}" -inherit pythonnative systemd +inherit python3native systemd SRC_URI = "git://github.com/OP-TEE/optee_client.git \ file://tee-supplicant.service" S = "${WORKDIR}/git" -SRCREV = "c48bc3be9f23529952c7dd80ddd775bf580315b8" +SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe" SYSTEMD_SERVICE_${PN} = "tee-supplicant.service" do_install() { oe_runmake install - install -D -p -m0755 ${S}/out/export/bin/tee-supplicant ${D}${bindir}/tee-supplicant + install -D -p -m0755 ${S}/out/export/usr/sbin/tee-supplicant ${D}${sbindir}/tee-supplicant - install -D -p -m0644 ${S}/out/export/lib/libteec.so.1.0 ${D}${libdir}/libteec.so.1.0 + install -D -p -m0644 ${S}/out/export/usr/lib/libteec.so.1.0 ${D}${libdir}/libteec.so.1.0 ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1 - cp -a ${S}/out/export/include ${D}/usr/ + cp -a ${S}/out/export/usr/include ${D}/usr/ sed -i -e s:/etc:${sysconfdir}:g \ -e s:/usr/bin:${bindir}:g \ diff --git a/meta-optee/recipes-security/optee/optee-client/tee-supplicant.service b/meta-optee/recipes-security/optee/optee-client/tee-supplicant.service index 82bc8303..ffb54d39 100644 --- a/meta-optee/recipes-security/optee/optee-client/tee-supplicant.service +++ b/meta-optee/recipes-security/optee/optee-client/tee-supplicant.service @@ -4,7 +4,7 @@ Description=TEE Supplicant [Service] User=root EnvironmentFile=-/etc/default/tee-supplicant -ExecStart=/usr/bin/tee-supplicant $OPTARGS +ExecStart=/usr/sbin/tee-supplicant $OPTARGS [Install] WantedBy=basic.target |