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

crypto: importer: Update with fetch 

Instead of doing a "pull --rebase" to update to the latest development
branch, do a "fetch" followed by a "checkout" to update to the specified
release. This enables us to get any new tags created since the last
update to the development branch, and removes the noise of updating a
local "development" branch.
pull/9529/head
Jaeden Amero 2019-01-22 17:47:09 +00:00 committed by Oren Cohen
parent c74993bac4
commit 4a1584696c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/mbedtls/mbed-crypto/importer/Makefile
View File

@ -29,7 +29,7 @@
# Set the Mbed Crypto release to import (this can/should be edited before
# import)
CRYPTO_RELEASE ?= mbedcrypto-0.1.0b2
CRYPTO_RELEASE ?= mbedcrypto-1.0.0d0
CRYPTO_REPO_URL ?= git@github.com:ARMmbed/mbed-crypto.git
# Translate between Mbed Crypto namespace and Mbed OS namespace
@ -88,8 +88,7 @@ update: $(CRYPTO_GIT_CFG)
# Updating to the specified Mbed Crypto library version
# (If it is not an initial checkout we will start with the repository
# being in a detached head state)
git -C $(CRYPTO_DIR) checkout development
git -C $(CRYPTO_DIR) pull --rebase origin development
git -C $(CRYPTO_DIR) fetch
#
# Checking out the required release
git -C $(CRYPTO_DIR) checkout $(CRYPTO_RELEASE)