Merge pull request #175 from UnicronNL/current

T3664: Eliminate obsolete build flavours

1 files changed, 0 insertions, 136 deletions

diff --git a/Makefile b/Makefile
index 59f5fb34..3defd020 100644
--- a/Makefile
+++ b/Makefile
@@ -44,84 +44,6 @@ prepare-package-env:
 	@scripts/pbuilder-config
 	@scripts/pbuilder-setup
 
-.PHONY: qemu
-.ONESHELL:
-qemu:
-	@set -e
-	@scripts/check-vm-build-env
-	@scripts/build-qemu-image
-
-.PHONY: vagrant-libvirt
-.ONESHELL:
-vagrant-libvirt:
-	@set -e
-	@scripts/check-vm-build-env
-	@scripts/build-vagrant-libvirt-box
-
-.PHONY: vmware
-.ONESHELL:
-vmware: 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/vmware/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/vmware/config.boot.default build/config/includes.chroot/opt/vyatta/etc/
-	cd $(build_dir)
-	@../scripts/build-vmware-image
-
-.PHONY: hyperv
-.ONESHELL:
-hyperv:
-	@set -e
-	@scripts/check-vm-build-env
-	@scripts/build-hyperv-image
-
-.PHONY: clearfog
-.ONESHELL:
-clearfog: clean prepare
-	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
-	cd $(build_dir)
-	@../scripts/build-clearfog-image
-
-.PHONY: azure
-.ONESHELL:
-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/live/
-	cp tools/cloud-init/azure/vyos-azure.list.chroot build/config/package-lists/
-	cp tools/cloud-init/cloud-init.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: GCE-debug
-.ONESHELL:
-GCE-debug: 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/99-debug-user.chroot build/config/hooks/live/
-	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-debug build/config/includes.chroot/opt/vyatta/etc/config.boot.default
-	cd $(build_dir)
-	@../scripts/build-GCE-image
-
 .PHONY: AWS
 .ONESHELL:
 AWS: clean prepare
@@ -136,63 +58,6 @@ AWS: clean prepare
 	cd ..
 	@scripts/copy-image
 
-.PHONY: openstack
-.ONESHELL:
-openstack: 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/openstack/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/openstack/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: oracle
-.ONESHELL:
-oracle: 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/OCI/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/OCI/config.boot.default build/config/includes.chroot/opt/vyatta/etc/
-	cd $(build_dir)
-	@../scripts/build-oracle-image
-
-.PHONY: PACKET
-.ONESHELL:
-PACKET: 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/99-disable-networking.chroot build/config/hooks/live/
-	cp tools/cloud-init/PACKET/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/PACKET/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: PACKET-debug
-.ONESHELL:
-PACKET-debug: 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/99-debug-user.chroot build/config/hooks/live/
-	cp tools/cloud-init/99-disable-networking.chroot build/config/hooks/live/
-	cp tools/cloud-init/PACKET/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/PACKET/config.boot.default-debug build/config/includes.chroot/opt/vyatta/etc/config.boot.default
-	cd $(build_dir)
-	lb build 2>&1 | tee build.log
-	cd ..
-	@scripts/copy-image
-
 .PHONY: vep4600
 .ONESHELL:
 vep4600: check_build_config clean prepare
@@ -269,7 +134,6 @@ clean:
 	rm -f *.mf
 	rm -f *.ovf
 	rm -f *.ova
-	rm -f *.vmdk
 
 .PHONY: purge
 purge: