ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Parameterise repo used in Mbed TLS importer script 

This commit makes the repo used to import new Mbed TLS versions into Mbed OS
a parameter, to allow CI scripts (and any other script or users) to specify
specific repos to use for testing.
pull/9355/head
Simon Butcher 2019-01-11 13:20:44 +00:00
parent d20b59153a
commit 7bf33f01f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/mbedtls/importer/Makefile
View File

@ -28,6 +28,7 @@
# Set the mbed TLS release to import (this can/should be edited before import) # Set the mbed TLS release to import (this can/should be edited before import)
MBED_TLS_RELEASE ?= mbedtls-2.15.1 MBED_TLS_RELEASE ?= mbedtls-2.15.1
MBED_TLS_REPO_URL ?= git@github.com:ARMmbed/mbedtls-restricted.git
# Translate between mbed TLS namespace and mbed namespace # Translate between mbed TLS namespace and mbed namespace
TARGET_PREFIX:=../ TARGET_PREFIX:=../
@ -51,7 +52,6 @@ TARGET_PSA_DRIVERS:=$(TARGET_PREFIX_CRYPTO)/targets
TARGET_NSPE:=$(TARGET_SRV_IMPL)/COMPONENT_NSPE TARGET_NSPE:=$(TARGET_SRV_IMPL)/COMPONENT_NSPE
# mbed TLS source directory - hidden from mbed via TARGET_IGNORE # mbed TLS source directory - hidden from mbed via TARGET_IGNORE
MBED_TLS_URL:=git@github.com:ARMmbed/mbedtls-restricted.git
MBED_TLS_DIR:=TARGET_IGNORE/mbedtls MBED_TLS_DIR:=TARGET_IGNORE/mbedtls
MBED_TLS_API:=$(MBED_TLS_DIR)/include/mbedtls MBED_TLS_API:=$(MBED_TLS_DIR)/include/mbedtls
MBED_TLS_GIT_CFG=$(MBED_TLS_DIR)/.git/config MBED_TLS_GIT_CFG=$(MBED_TLS_DIR)/.git/config
@ -139,7 +139,7 @@ update: $(MBED_TLS_GIT_CFG) $(MBED_TLS_HA_GIT_CFG)
$(MBED_TLS_GIT_CFG): $(MBED_TLS_GIT_CFG):
rm -rf $(MBED_TLS_DIR) rm -rf $(MBED_TLS_DIR)
git clone $(MBED_TLS_URL) $(MBED_TLS_DIR) git clone $(MBED_TLS_REPO_URL) $(MBED_TLS_DIR)
clean: clean:
rm -f $(TARGET_PREFIX)LICENSE rm -f $(TARGET_PREFIX)LICENSE