From 48820bc17052fca058c1ca2b31cf55f72313c918 Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Sat, 18 Nov 2017 12:14:40 +0900 Subject: [PATCH] release: fix secureos filename for artik710s Fixes: 904876fe6e92 ("release: security: add check routine for restrictive security files exist") This patch fixes invalid secure os file name for artik710s. Unlike artik530 series, the artik710s uses the fip-secure.img name. Change-Id: I5ca7a5f9506a8924861e9ac96e95d5cebd34154c Signed-off-by: Chanho Park --- config/artik530s.cfg | 1 + config/artik533s.cfg | 1 + config/artik710s.cfg | 1 + release.sh | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/artik530s.cfg b/config/artik530s.cfg index e160d1d..9c1b6fc 100644 --- a/config/artik530s.cfg +++ b/config/artik530s.cfg @@ -9,6 +9,7 @@ export SECURE_PREBUILT_DIR=$ARTIK_BUILD_DIR/../security-firmwares-artik530s export INITRD=$PREBUILT_DIR/$RAMDISK_NAME export SECURE_BOOT=enable export SECURE_OS=trustware +export SECURE_OS_FILE=secureos.img export RSA_SIGN_TOOL=$PREBUILT_DIR/artik530s_codesigner export FEDORA_PREBUILT_RPM_DIR=$PREBUILT_DIR/rpms diff --git a/config/artik533s.cfg b/config/artik533s.cfg index fddb124..160af35 100644 --- a/config/artik533s.cfg +++ b/config/artik533s.cfg @@ -9,6 +9,7 @@ export SECURE_PREBUILT_DIR=$ARTIK_BUILD_DIR/../security-firmwares-artik533s export INITRD=$PREBUILT_DIR/$RAMDISK_NAME export SECURE_BOOT=enable export SECURE_OS=trustware +export SECURE_OS_FILE=secureos.img export RSA_SIGN_TOOL=$PREBUILT_DIR/artik533s_codesigner export FEDORA_PREBUILT_RPM_DIR=$PREBUILT_DIR/rpms diff --git a/config/artik710s.cfg b/config/artik710s.cfg index 0ae482f..c64b050 100644 --- a/config/artik710s.cfg +++ b/config/artik710s.cfg @@ -8,6 +8,7 @@ export PREBUILT_DIR=$ARTIK_BUILD_DIR/../boot-firmwares-artik710s export SECURE_PREBUILT_DIR=$ARTIK_BUILD_DIR/../security-firmwares-artik710s export INITRD=$PREBUILT_DIR/$RAMDISK_NAME export SECURE_BOOT=enable +export SECURE_OS_FILE=fip-secure.img export FIP_SEC_LOAD_ADDR=0x7fb00000 diff --git a/release.sh b/release.sh index 1e5c469..4d96484 100755 --- a/release.sh +++ b/release.sh @@ -136,7 +136,7 @@ check_restrictive_pkg() if [ "${TARGET_BOARD}" == "artik530s" ] || [ "${TARGET_BOARD}" == "artik533s" ] || [ "${TARGET_BOARD}" == "artik710s" ]; then if [ "$SECURE_PREBUILT_DIR" != "" ]; then cp -f $SECURE_PREBUILT_DIR/${TARGET_BOARD}_codesigner $PREBUILT_DIR - cp -f $SECURE_PREBUILT_DIR/secureos.img $PREBUILT_DIR + cp -f $SECURE_PREBUILT_DIR/${SECURE_OS_FILE} $PREBUILT_DIR test ! -d $UBUNTU_MODULE_DEB_DIR && mkdir -p $UBUNTU_MODULE_DEB_DIR cp -f $SECURE_PREBUILT_DIR/debs/*.deb $UBUNTU_MODULE_DEB_DIR