From 82bf7c2d092b49c7422aeb1b369c3f6cf7b66164 Mon Sep 17 00:00:00 2001 From: David Brown Date: Wed, 12 Jul 2017 09:49:31 -0600 Subject: [PATCH] sim: Move mbedtls into mcuboot-sys The mbedtls library is used by the binding crate, so move the submodule into this directory as well. Signed-off-by: David Brown --- .gitmodules | 2 +- sim/mcuboot-sys/build.rs | 14 +++++++------- sim/{ => mcuboot-sys}/mbedtls | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename sim/{ => mcuboot-sys}/mbedtls (100%) diff --git a/.gitmodules b/.gitmodules index 960139a2..4a844598 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "sim/mbedtls"] - path = sim/mbedtls + path = sim/mcuboot-sys/mbedtls url = https://github.com/ARMmbed/mbedtls diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs index d0532294..4f4cf9e0 100644 --- a/sim/mcuboot-sys/build.rs +++ b/sim/mcuboot-sys/build.rs @@ -34,12 +34,12 @@ fn main() { conf.define("MCUBOOT_USE_MBED_TLS", None); conf.define("MBEDTLS_CONFIG_FILE", Some("")); - conf.include("../mbedtls/include"); - conf.file("../mbedtls/library/sha256.c"); + conf.include("mbedtls/include"); + conf.file("mbedtls/library/sha256.c"); - conf.file("../mbedtls/library/rsa.c"); - conf.file("../mbedtls/library/bignum.c"); - conf.file("../mbedtls/library/asn1parse.c"); + conf.file("mbedtls/library/rsa.c"); + conf.file("mbedtls/library/bignum.c"); + conf.file("mbedtls/library/asn1parse.c"); } if sig_ecdsa { conf.define("MCUBOOT_SIGN_ECDSA", None); @@ -65,8 +65,8 @@ fn main() { walk_dir("../../boot").unwrap(); walk_dir("../csupport").unwrap(); - walk_dir("../mbedtls/include").unwrap(); - walk_dir("../mbedtls/library").unwrap(); + walk_dir("mbedtls/include").unwrap(); + walk_dir("mbedtls/library").unwrap(); } // Output the names of all files within a directory so that Cargo knows when to rebuild. diff --git a/sim/mbedtls b/sim/mcuboot-sys/mbedtls similarity index 100% rename from sim/mbedtls rename to sim/mcuboot-sys/mbedtls