Merge branch 'current' into crux

Conflicts:
	data/live-build-config/package-lists/vyos-utils.list.chroot
	scripts/live-build-config

1 files changed, 31 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index b2dc1f8b..b0904772 100644
--- a/Makefile
+++ b/Makefile
@@ -82,9 +82,38 @@ clearfog: clean prepare
 azure: clean prepare
 	@set -e
 	@echo "It's not like I'm building this specially for you or anything!"
+	cp tools/cloud-init/azure/99-walinuxagent.chroot build/config/hooks/
+	cp tools/cloud-init/azure/vyos-azure.list.chroot build/config/package-lists/
+	cp -f tools/cloud-init/azure/config.boot.default build/config/includes.chroot/opt/vyatta/etc/
 	cd $(build_dir)
 	@../scripts/build-azure-image
 
+.PHONY: GCE
+.ONESHELL:
+GCE: clean prepare
+	@set -e
+	@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/GCE/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 -f tools/cloud-init/GCE/config.boot.default build/config/includes.chroot/opt/vyatta/etc/
+	cd $(build_dir)
+	@../scripts/build-GCE-image
+
+.PHONY: AWS
+.ONESHELL:
+AWS: clean prepare
+	@set -e
+	@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 -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
+	cd ..
+	@scripts/copy-image
+
 .PHONY: clean
 .ONESHELL:
 clean:
@@ -98,6 +127,8 @@ clean:
 	rm -f *.img
 	rm -f *.xz
 	rm -f *.vhd
+	rm -f *.raw
+	rm -f *.tar.gz
 
 .PHONY: purge
 purge: