Skip to content

Commit 66cbb32

Browse files
committed
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.
1 parent 0f9f45f commit 66cbb32

File tree

1 file changed

+2
-3
lines changed
  • features/mbedtls/mbed-crypto/importer

1 file changed

+2
-3
lines changed

features/mbedtls/mbed-crypto/importer/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Set the Mbed Crypto release to import (this can/should be edited before
3131
# import)
32-
CRYPTO_RELEASE ?= mbedcrypto-0.1.0b2
32+
CRYPTO_RELEASE ?= mbedcrypto-1.0.0d0
3333
CRYPTO_REPO_URL ?= [email protected]:ARMmbed/mbed-crypto.git
3434

3535
# Translate between Mbed Crypto namespace and Mbed OS namespace
@@ -88,8 +88,7 @@ update: $(CRYPTO_GIT_CFG)
8888
# Updating to the specified Mbed Crypto library version
8989
# (If it is not an initial checkout we will start with the repository
9090
# being in a detached head state)
91-
git -C $(CRYPTO_DIR) checkout development
92-
git -C $(CRYPTO_DIR) pull --rebase origin development
91+
git -C $(CRYPTO_DIR) fetch
9392
#
9493
# Checking out the required release
9594
git -C $(CRYPTO_DIR) checkout $(CRYPTO_RELEASE)

0 commit comments

Comments
 (0)