Message ID | 20230309211521.496531-1-jon.mason@arm.com |
---|---|
State | New |
Headers | show |
Series | [1/3] arm-bsp/optee: remove unused recipes | expand |
On Thu, 9 Mar 2023 16:15:19 -0500, Jon Mason wrote:
>
Applied, thanks!
[1/3] arm-bsp/optee: remove unused recipes
commit: 8b581f3de3d87bd5868f3e8aee65fa0a51282f28
[2/3] arm/optee: optee-os include cleanup
commit: fa5fffd287ae3fa9aef5d95512ec76319fbcde62
[3/3] arm/optee-os: update to 3.20.0
commit: dcc81b56ffddee9736d9b97bc4786e4fa8b69dfa
Best regards,
diff --git a/meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.service b/meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.service deleted file mode 100644 index c273832d..00000000 --- a/meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=TEE Supplicant - -[Service] -User=root -EnvironmentFile=-@sysconfdir@/default/tee-supplicant -ExecStart=@sbindir@/tee-supplicant $OPTARGS - -[Install] -WantedBy=basic.target diff --git a/meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.sh b/meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.sh deleted file mode 100644 index b4d21950..00000000 --- a/meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# Source function library -. /etc/init.d/functions - -NAME=tee-supplicant -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="OP-TEE Supplicant" - -DAEMON=@sbindir@/$NAME - -test -f $DAEMON || exit 0 - -test -f @sysconfdir@/default/$NAME && . @sysconfdir@/default/$NAME -test -f @sysconfdir@/default/rcS && . @sysconfdir@/default/rcS - -SSD_OPTIONS="--oknodo --quiet --exec $DAEMON -- -d $OPTARGS" - -set -e - -case $1 in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start $SSD_OPTIONS - echo "${DAEMON##*/}." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop $SSD_OPTIONS - echo "${DAEMON##*/}." - ;; - restart|force-reload) - $0 stop - sleep 1 - $0 start - ;; - status) - status ${DAEMON} || exit $? - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bb b/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bb deleted file mode 100644 index 641fb0a0..00000000 --- a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-security/optee/optee-client.inc - -SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53" diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.10.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os_3.10.0.bb deleted file mode 100644 index 19beaa7c..00000000 --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.10.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-security/optee/optee-os.inc - -SRCREV = "d1c635434c55b7d75eadf471bde04926bd1e50a7"
Signed-off-by: Jon Mason <jon.mason@arm.com> --- .../optee/optee-client/tee-supplicant.service | 10 ---- .../optee/optee-client/tee-supplicant.sh | 46 ------------------- .../optee/optee-client_3.14.0.bb | 3 -- .../recipes-security/optee/optee-os_3.10.0.bb | 3 -- 4 files changed, 62 deletions(-) delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.service delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.sh delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bb delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.10.0.bb