From fad32d7c66d7af9a8334fb1c8b8f984495afe37f Mon Sep 17 00:00:00 2001
From: Victor Chong <victor.chong@linaro.org>
Date: Thu, 28 Jul 2016 14:43:05 +0100
Subject: [PATCH] hikey: fix bug: @echo: command not found
Changed some line formatting to make commands more robust as well.
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (hikey)
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
---
hikey.mk | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/hikey.mk b/hikey.mk
index eca3691..c3f198e 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -273,14 +273,12 @@ awk '{while(match($$0,"[$$]{[^}]*}")) {var=substr($$0,RSTART+2,RLENGTH -3);gsub(
endef
filelist-all: busybox
- cat $(GEN_ROOTFS_PATH)/filelist-final.txt | sed '/fbtest/d' > $(GEN_ROOTFS_PATH)/filelist-all.txt
- export KERNEL_VERSION=$(call KERNEL_VERSION); \
- export TOP=$(ROOT); export MULTIARCH=$(MULTIARCH); \
- $(expand-env-var) <$(PATCHES_PATH)/rootfs/initramfs-add-files.txt >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
- find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
- @echo "file /bin/hello_world $(HELLOWORLD_PATH)/host/hello_world 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
- find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
- sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
+ @cat $(GEN_ROOTFS_PATH)/filelist-final.txt | sed '/fbtest/d' > $(GEN_ROOTFS_PATH)/filelist-all.txt
+ @env TOP=$(ROOT) $(expand-env-var) <$(PATCHES_PATH)/rootfs/initramfs-add-files.txt >> $(GEN_ROOTFS_PATH)/filelist-all.txt
+ @find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(GEN_ROOTFS_PATH)/filelist-all.txt
+ @echo "file /bin/hello_world $(HELLOWORLD_PATH)/host/hello_world 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt
+ @find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
+ sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' >> $(GEN_ROOTFS_PATH)/filelist-all.txt
@echo "file /lib/optee_armtz/8aaaf200-2450-11e4-abe20002a5d5c51b.ta $(HELLOWORLD_PATH)/ta/8aaaf200-2450-11e4-abe20002a5d5c51b.ta 444 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt
@if [ -e $(OPTEE_GENDRV_MODULE) ]; then \
echo "# OP-TEE device" >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
--
GitLab