From 82a691eff3e32cc35301385c4c699bbc3e44f42a Mon Sep 17 00:00:00 2001
From: Etienne Carriere <etienne.carriere@linaro.org>
Date: Wed, 6 Feb 2019 10:18:16 +0100
Subject: [PATCH] common: remove deprecated rootfs targets
Targets update_rootfs-common, update_rootfs-clean-common and
filelist-tee-common are not used by any of the supported
platform and their content is not accurate regarding OP-TEE
packages content (init.d.optee, tee-supplicant install path).
This change removes this make targets.
This change also remove the init.d.optee init script which is
no more embedded in the filesystem of the supported platforms.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
---
common.mk | 84 ----------------------------------------------------
init.d.optee | 26 ----------------
2 files changed, 110 deletions(-)
delete mode 100755 init.d.optee
diff --git a/common.mk b/common.mk
index 55afbfe..e6054e4 100644
--- a/common.mk
+++ b/common.mk
@@ -471,87 +471,3 @@ benchmark-app-common: optee-os optee-client
.PHONY: benchmark-app-clean-common
benchmark-app-clean-common:
$(MAKE) -C $(BENCHMARK_APP_PATH) clean
-
-################################################################################
-# rootfs
-################################################################################
-.PHONY: update_rootfs-common
-update_rootfs-common: busybox filelist-tee
- cat $(GEN_ROOTFS_PATH)/filelist-final.txt > $(GEN_ROOTFS_PATH)/filelist.tmp
- cat $(GEN_ROOTFS_FILELIST) >> $(GEN_ROOTFS_PATH)/filelist.tmp
- cd $(GEN_ROOTFS_PATH) && \
- $(LINUX_PATH)/usr/gen_init_cpio $(GEN_ROOTFS_PATH)/filelist.tmp | \
- gzip > $(GEN_ROOTFS_PATH)/filesystem.cpio.gz
-
-.PHONY: update_rootfs-clean-common
-update_rootfs-clean-common:
- rm -f $(GEN_ROOTFS_PATH)/filesystem.cpio.gz
- rm -f $(GEN_ROOTFS_PATH)/filelist-all.txt
- rm -f $(GEN_ROOTFS_PATH)/filelist-tmp.txt
- rm -f $(GEN_ROOTFS_FILELIST)
-
-.PHONY: filelist-tee-common
-ifeq ($(CFG_TEE_BENCHMARK),y)
-filelist-tee-common: benchmark-app
-endif
-filelist-tee-common: fl:=$(GEN_ROOTFS_FILELIST)
-filelist-tee-common: optee-client xtest optee-examples
- @echo "# filelist-tee-common /start" > $(fl)
- @echo "dir /lib/optee_armtz 755 0 0" >> $(fl)
- @if [ -e $(OPTEE_EXAMPLES_PATH)/out/ca ]; then \
- for file in $(OPTEE_EXAMPLES_PATH)/out/ca/*; do \
- echo "file /usr/bin/$$(basename $$file)" \
- "$$file 755 0 0" >> $(fl); \
- done; \
- fi
- @if [ -e $(OPTEE_EXAMPLES_PATH)/out/ta ]; then \
- for file in $(OPTEE_EXAMPLES_PATH)/out/ta/*; do \
- echo "file /lib/optee_armtz/$$(basename $$file)" \
- "$$file 755 0 0" >> $(fl); \
- done; \
- fi
- @echo "# xtest / optee_test" >> $(fl)
- @find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | \
- sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(fl)
- @find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
- sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' \
- >> $(fl)
- @if [ -e $(BENCHMARK_APP_OUT)/benchmark ]; then \
- echo "file /bin/benchmark" \
- "$(BENCHMARK_APP_OUT)/benchmark 755 0 0" >> $(fl); \
- echo "slink /lib/libyaml-0.so.2 libyaml-0.so.2.0.5 755 0 0" \
- >> $(fl); \
- echo "file /lib/libyaml-0.so.2.0.5 $(LIBYAML_LIB_OUT)/libyaml-0.so.2.0.5 755 0 0" \
- >> $(fl); \
- fi
- @echo "slink /etc/rc.d/S02_udhcp_networking /etc/init.d/udhcpc 755 0 0" \
- >> $(fl);
- @echo "# Secure storage dir" >> $(fl)
- @echo "dir /data 755 0 0" >> $(fl)
- @echo "dir /data/tee 755 0 0" >> $(fl)
- @if [ -e $(OPTEE_GENDRV_MODULE) ]; then \
- echo "# OP-TEE device" >> $(fl); \
- echo "dir /lib/modules 755 0 0" >> $(fl); \
- echo "dir /lib/modules/$(call KERNEL_VERSION) 755 0 0" \
- >> $(fl); \
- echo "file /lib/modules/$(call KERNEL_VERSION)/optee.ko" \
- "$(OPTEE_GENDRV_MODULE) 755 0 0" \
- >> $(fl); \
- fi
- @echo "# OP-TEE Client" >> $(fl)
- @echo "file /bin/tee-supplicant $(OPTEE_CLIENT_EXPORT)/bin/tee-supplicant 755 0 0" \
- >> $(fl)
- @echo "file /lib/libteec.so.1.0 $(OPTEE_CLIENT_EXPORT)/lib/libteec.so.1.0 755 0 0" \
- >> $(fl)
- @echo "slink /lib/libteec.so.1 libteec.so.1.0 755 0 0" >> $(fl)
- @echo "slink /lib/libteec.so libteec.so.1 755 0 0" >> $(fl)
- @if [ -e $(OPTEE_CLIENT_EXPORT)/lib/libsqlfs.so.1.0 ]; then \
- echo "file /lib/libsqlfs.so.1.0" \
- "$(OPTEE_CLIENT_EXPORT)/lib/libsqlfs.so.1.0 755 0 0" \
- >> $(fl); \
- echo "slink /lib/libsqlfs.so.1 libsqlfs.so.1.0 755 0 0" >> $(fl); \
- echo "slink /lib/libsqlfs.so libsqlfs.so.1 755 0 0" >> $(fl); \
- fi
- @echo "file /etc/init.d/optee $(BUILD_PATH)/init.d.optee 755 0 0" >> $(fl)
- @echo "slink /etc/rc.d/S09_optee /etc/init.d/optee 755 0 0" >> $(fl)
- @echo "# filelist-tee-common /end" >> $(fl)
diff --git a/init.d.optee b/init.d.optee
deleted file mode 100755
index 6b7042c..0000000
--- a/init.d.optee
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# /etc/init.d/optee
-#
-# Start/stop tee-supplicant (OP-TEE normal world daemon)
-#
-case "$1" in
- start)
- if [ -e /bin/tee-supplicant -a -e /dev/teepriv0 ]; then
- echo "Starting tee-supplicant..."
- tee-supplicant&
- exit 0
- else
- echo "tee-supplicant or TEE device not found"
- exit 1
- fi
-
- ;;
- stop)
- killall tee-supplicant
- ;;
- status)
- cat /dev/teepriv0 2>&1 | grep -q "Device or resource busy" || not="not "
- echo "tee-supplicant is ${not}active"
- ;;
-esac
--
GitLab