From 5d4f0766cb288ff7b29e342c6085e12b2b0fd72e Mon Sep 17 00:00:00 2001 From: dkohlbre Date: Mon, 6 May 2019 11:44:25 -0700 Subject: [PATCH] Updated READMEs in submodules to make it clearer that builds should always occur at top-level (#89) --- README.md | 14 +++++++------- linux-keystone-driver | 2 +- sdk | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 00a3c84fb..2eced2537 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,7 @@ sudo apt update sudo apt install autoconf automake autotools-dev bc bison build-essential curl \ expat libexpat1-dev flex gawk gcc git gperf libgmp-dev libmpc-dev libmpfr-dev \ libtool texinfo tmux patchutils zlib1g-dev wget bzip2 patch vim-common lbzip2 \ -python pkg-config libglib2.0-dev libpixman-1-dev device-tree-compiler -``` - -Some of the utilities also use ``expect`` so we recommend that you install that as well though it is not strictly necessary. -``` -sudo apt install expect +python pkg-config libglib2.0-dev libpixman-1-dev device-tree-compiler expect ``` Setup Tools and Submodules @@ -35,7 +30,7 @@ Setup Tools and Submodules ./fast-setup.sh ``` -Build All for QEMU +Build All ``` make ``` @@ -60,6 +55,11 @@ Terminate QEMU poweroff ``` +## Rebuilding + +Any modifications in a submodule should be built with the top-level +`make` in Keystone. + # Documentation See [docs](http://docs.keystone-enclave.org) for detailed diff --git a/linux-keystone-driver b/linux-keystone-driver index 56ea0b427..05890f869 160000 --- a/linux-keystone-driver +++ b/linux-keystone-driver @@ -1 +1 @@ -Subproject commit 56ea0b4279f42b566c6cb61ba44b41d0baa60643 +Subproject commit 05890f869a4a97a2edf63270f48f2b0d48c74aae diff --git a/sdk b/sdk index 35840719f..50abdf0d4 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 35840719f7e8c7c9cbab59f3c2545ad10d4f14ae +Subproject commit 50abdf0d48050dcfa5a3141a603407f2ef615197