diff --git a/meta-ohos-core/conf/distro/allscenarios-linux.conf b/meta-ohos-core/conf/distro/allscenarios-linux.conf index d19bbb0bb7e3c39cc03d8dbbb0105b5f15af1e74..866b7295c5ffe5e2f36da160eab14feb7c0dbd5a 100644 --- a/meta-ohos-core/conf/distro/allscenarios-linux.conf +++ b/meta-ohos-core/conf/distro/allscenarios-linux.conf @@ -19,8 +19,6 @@ INIT_MANAGER = "systemd" # Remove some of the default Poky DISTRO_FEATURES we inherited, but do not use. DISTRO_FEATURES_remove = "nfc 3g pcmcia" -IMAGE_INSTALL_append = " ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-client', '', d)} " - PREFERRED_VERSION_linux-yocto = "5.10%" # Default to enabling serial debug console on RaspberryPi diff --git a/meta-ohos-staging/recipes-security/optee/optee-client.bb b/meta-ohos-staging/recipes-security/optee/optee-client.bb deleted file mode 100644 index 2bbb282ad96e153a51fdb191fc55dd02e13677f5..0000000000000000000000000000000000000000 --- a/meta-ohos-staging/recipes-security/optee/optee-client.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "OPTEE Client" -HOMEPAGE = "https://github.com/OP-TEE/optee_client" - -LICENSE = "BSD-2" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" - -PV = "3.7.0+git${SRCPV}" - -inherit python3native systemd - -SRC_URI = "git://github.com/OP-TEE/optee_client.git \ - file://tee-supplicant.service" -S = "${WORKDIR}/git" - -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe" - -SYSTEMD_SERVICE_${PN} = "tee-supplicant.service" - -do_install() { - oe_runmake install - - install -D -p -m0755 ${S}/out/export/usr/sbin/tee-supplicant ${D}${sbindir}/tee-supplicant - - 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/usr/include ${D}/usr/ - - sed -i -e s:/etc:${sysconfdir}:g \ - ${WORKDIR}/tee-supplicant.service - - install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service -} diff --git a/meta-ohos-staging/recipes-security/optee/optee-client/tee-supplicant.service b/meta-ohos-staging/recipes-security/optee/optee-client/tee-supplicant.service deleted file mode 100644 index ffb54d3900d28b05be0ef75d82824ec094da5058..0000000000000000000000000000000000000000 --- a/meta-ohos-staging/recipes-security/optee/optee-client/tee-supplicant.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=TEE Supplicant - -[Service] -User=root -EnvironmentFile=-/etc/default/tee-supplicant -ExecStart=/usr/sbin/tee-supplicant $OPTARGS - -[Install] -WantedBy=basic.target