aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-09-07 09:51:06 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-09-07 09:51:06 +0000
commit2434ad9ab3681d70cca3b925540eb69af34debee (patch)
tree3d97c8baf169e78723f7f723f756f11d414ea418
parentfed87b8bd6d965218e6866c26a5b382261ee4b3d (diff)
trusty-arm64-tcwg-dev: ARM64 Trusty doesn't have gnat.
All other arch/distro configurations do have gnat/gnat-5 package. Change-Id: I1b3f5be27364b20741b3eec6af7e1802661d066e
-rw-r--r--tcwg-base/tcwg-dev/Dockerfile.in2
-rw-r--r--trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile1
2 files changed, 2 insertions, 1 deletions
diff --git a/tcwg-base/tcwg-dev/Dockerfile.in b/tcwg-base/tcwg-dev/Dockerfile.in
index bf42b832..1ed08f12 100644
--- a/tcwg-base/tcwg-dev/Dockerfile.in
+++ b/tcwg-base/tcwg-dev/Dockerfile.in
@@ -19,7 +19,9 @@ RUN apt-get update \
git-review \
git-svn \
#if DISTRO_trusty
+# if !ARCH_arm64
gnat \
+# endif
#else
gnat-5 \
#endif
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile
index 987dc705..3ce31c73 100644
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile
@@ -18,7 +18,6 @@ RUN apt-get update \
git-gui \
git-review \
git-svn \
- gnat \
less \
locales \
libgmp-dev \