summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2020-01-20 00:50:27 +0700
committerGitHub <noreply@github.com>2020-01-20 00:50:27 +0700
commit0b67e14b62fee0d4ab3d2d621828000701758767 (patch)
tree78009d25830acad2b3bc373724cc4a17a6ff179e
parent2b332ea0c3cd73abe403af17c4824b99eeb66365 (diff)
parent62fce9c3c9c19df2ececbbd79a54a261a7cfd068 (diff)
downloadvyos-build-0b67e14b62fee0d4ab3d2d621828000701758767.tar.gz
vyos-build-0b67e14b62fee0d4ab3d2d621828000701758767.zip
Merge pull request #78 from UnicronNL/current
T1951: Include awscli package is the AWS build
-rw-r--r--Makefile2
-rw-r--r--tools/cloud-init/AWS/cloud-init.list.chroot2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ac4d1add..6c22fd4a 100644
--- a/Makefile
+++ b/Makefile
@@ -126,7 +126,7 @@ AWS: clean prepare
@echo "It's not like I'm building this specially for you or anything!"
mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
cp tools/cloud-init/AWS/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
- cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/
+ cp tools/cloud-init/AWS/cloud-init.list.chroot build/config/package-lists/
cp -f tools/cloud-init/AWS/config.boot.default build/config/includes.chroot/opt/vyatta/etc/
cd $(build_dir)
lb build 2>&1 | tee build.log
diff --git a/tools/cloud-init/AWS/cloud-init.list.chroot b/tools/cloud-init/AWS/cloud-init.list.chroot
new file mode 100644
index 00000000..0858effd
--- /dev/null
+++ b/tools/cloud-init/AWS/cloud-init.list.chroot
@@ -0,0 +1,2 @@
+cloud-init
+awscli