From 7a95759f935202c1f25df10eb32c67bbd69db3c8 Mon Sep 17 00:00:00 2001 From: Chris Kay Date: Tue, 12 Nov 2024 12:47:15 +0000 Subject: [PATCH] fix(build): ensure `$(ROT_KEY)` depends on correct directory rules In order for directories to be automatically created when used as a dependency, they must end with a forward slash (`/`). This is because we have a pattern rule (`%/`) to create a directory anywhere where a directory is required as a direct dependency. Change-Id: Ib632d59da0745f6cadb0a839a62360aeca25c178 Signed-off-by: Chris Kay --- plat/hisilicon/hikey/platform.mk | 4 ++-- plat/hisilicon/hikey960/platform.mk | 4 ++-- plat/imx/imx7/common/imx7.mk | 4 ++-- plat/imx/imx8m/imx8mm/platform.mk | 4 ++-- plat/imx/imx8m/imx8mp/platform.mk | 4 ++-- plat/nxp/common/tbbr/tbbr.mk | 4 ++-- plat/qemu/qemu/platform.mk | 4 ++-- plat/rpi/rpi3/platform.mk | 4 ++-- plat/socionext/synquacer/platform.mk | 4 ++-- plat/socionext/uniphier/platform.mk | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk index 63eca3767..b67d3ff98 100644 --- a/plat/hisilicon/hikey/platform.mk +++ b/plat/hisilicon/hikey/platform.mk @@ -152,11 +152,11 @@ $(BUILD_PLAT)/bl1/hikey_rotpk.o: $(ROTPK_HASH) $(BUILD_PLAT)/bl2/hikey_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): | $(BUILD_PLAT) +$(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null -$(ROTPK_HASH): $(ROT_KEY) +$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/hisilicon/hikey960/platform.mk b/plat/hisilicon/hikey960/platform.mk index c2c312256..c278d8edb 100644 --- a/plat/hisilicon/hikey960/platform.mk +++ b/plat/hisilicon/hikey960/platform.mk @@ -145,11 +145,11 @@ $(BUILD_PLAT)/bl1/hikey960_rotpk.o: $(ROTPK_HASH) $(BUILD_PLAT)/bl2/hikey960_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): | $(BUILD_PLAT) +$(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null -$(ROTPK_HASH): $(ROT_KEY) +$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/imx/imx7/common/imx7.mk b/plat/imx/imx7/common/imx7.mk index 2bda3a5d0..a7e8fe815 100644 --- a/plat/imx/imx7/common/imx7.mk +++ b/plat/imx/imx7/common/imx7.mk @@ -76,13 +76,13 @@ $(BUILD_PLAT)/bl2/imx7_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): | $(BUILD_PLAT) +$(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)if [ ! -f $(ROT_KEY) ]; then \ ${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \ fi -$(ROTPK_HASH): $(ROT_KEY) +$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk index d1c1259dc..e54256c19 100644 --- a/plat/imx/imx8m/imx8mm/platform.mk +++ b/plat/imx/imx8m/imx8mm/platform.mk @@ -132,13 +132,13 @@ $(BUILD_PLAT)/bl2/imx8mm_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): | $(BUILD_PLAT) +$(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)if [ ! -f $(ROT_KEY) ]; then \ ${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \ fi -$(ROTPK_HASH): $(ROT_KEY) +$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/imx/imx8m/imx8mp/platform.mk b/plat/imx/imx8m/imx8mp/platform.mk index 5df598cf1..98b99d11e 100644 --- a/plat/imx/imx8m/imx8mp/platform.mk +++ b/plat/imx/imx8m/imx8mp/platform.mk @@ -129,13 +129,13 @@ $(BUILD_PLAT)/bl2/imx8mp_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): | $(BUILD_PLAT) +$(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)if [ ! -f $(ROT_KEY) ]; then \ ${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \ fi -$(ROTPK_HASH): $(ROT_KEY) +$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/nxp/common/tbbr/tbbr.mk b/plat/nxp/common/tbbr/tbbr.mk index 000e419be..023339868 100644 --- a/plat/nxp/common/tbbr/tbbr.mk +++ b/plat/nxp/common/tbbr/tbbr.mk @@ -130,13 +130,13 @@ else $(BUILD_PLAT)/bl2/nxp_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) - $(ROT_KEY): | $(BUILD_PLAT) + $(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)if [ ! -f $(ROT_KEY) ]; then \ ${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \ fi - $(ROTPK_HASH): $(ROT_KEY) + $(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/qemu/qemu/platform.mk b/plat/qemu/qemu/platform.mk index cf1b3a84d..0d4cdb8ff 100644 --- a/plat/qemu/qemu/platform.mk +++ b/plat/qemu/qemu/platform.mk @@ -78,11 +78,11 @@ ifneq (${TRUSTED_BOARD_BOOT},0) certificates: $(ROT_KEY) - $(ROT_KEY): | $(BUILD_PLAT) + $(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null - $(ROTPK_HASH): $(ROT_KEY) + $(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/rpi/rpi3/platform.mk b/plat/rpi/rpi3/platform.mk index e139b4924..fc51bec67 100644 --- a/plat/rpi/rpi3/platform.mk +++ b/plat/rpi/rpi3/platform.mk @@ -213,11 +213,11 @@ ifneq (${TRUSTED_BOARD_BOOT},0) certificates: $(ROT_KEY) - $(ROT_KEY): | $(BUILD_PLAT) + $(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null - $(ROTPK_HASH): $(ROT_KEY) + $(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/socionext/synquacer/platform.mk b/plat/socionext/synquacer/platform.mk index a5ab4f7ee..e4ae87bd4 100644 --- a/plat/socionext/synquacer/platform.mk +++ b/plat/socionext/synquacer/platform.mk @@ -71,11 +71,11 @@ $(eval $(call add_define_val,ROTPK_HASH,'"$(ROTPK_HASH)"')) $(BUILD_PLAT)/bl2/sq_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): | $(BUILD_PLAT) +$(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null -$(ROTPK_HASH): $(ROT_KEY) +$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null diff --git a/plat/socionext/uniphier/platform.mk b/plat/socionext/uniphier/platform.mk index ebb9b8ca2..21d95cf1f 100644 --- a/plat/socionext/uniphier/platform.mk +++ b/plat/socionext/uniphier/platform.mk @@ -105,11 +105,11 @@ $(eval $(call add_define_val,ROTPK_HASH,'"$(ROTPK_HASH)"')) $(BUILD_PLAT)/bl2/uniphier_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): | $(BUILD_PLAT) +$(ROT_KEY): | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null -$(ROTPK_HASH): $(ROT_KEY) +$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/ $(s)echo " OPENSSL $@" $(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ ${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null