From 6ad03fd403dc596e7d4f2fe03bccca339278bd9c Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 14 May 2019 10:53:13 +0200 Subject: [PATCH] boot/optee-os: fix TA files installation This change fixes the TA binary files install sequence that were previously install in target filesystem though OPTEE_OS_INSTALL_IMAGES_CMDS instead of expected OPTEE_OS_INSTALL_TARGET_CMDS. This change removes useless mkdir prior call to $(INSTALL) that already handles parent directory creation when needed. This change conditions the .ta files installation upon their availability as they may exist or not depending on the exact OPTEE version/configuration selected. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- boot/optee-os/optee-os.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 6da20a9f3e..b22f560ba7 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -75,10 +75,10 @@ endef endif # BR2_TARGET_OPTEE_OS_CORE ifeq ($(BR2_TARGET_OPTEE_OS_SERVICES),y) -define OPTEE_OS_INSTALL_IMAGES_SERVICES - mkdir -p $(TARGET_DIR)/lib/optee_armtz - $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \ - $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta +define OPTEE_OS_INSTALL_TARGET_CMDS + $(if $(wildcard $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta), + $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \ + $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta) endef endif # BR2_TARGET_OPTEE_OS_SERVICES