diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-11-12 16:55:08 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-11-12 16:55:08 +0100 |
| commit | b7bfae60015d6c4d5e756c664b3f85d8a23f0898 (patch) | |
| tree | c403b88492114155b40f65c83480873435516f77 /Makefile | |
| parent | cab61166bf06860a3678ca8f3098d31d3826e1a3 (diff) | |
| parent | e33f57928d6e8a3206ddafa827ac8d3b9b07974e (diff) | |
| download | vyos-build-b7bfae60015d6c4d5e756c664b3f85d8a23f0898.tar.gz vyos-build-b7bfae60015d6c4d5e756c664b3f85d8a23f0898.zip | |
Merge branch 'current' into crux
Conflicts:
scripts/live-build-config
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -82,7 +82,7 @@ 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/99-walinuxagent.chroot build/config/hooks/live/ 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) @@ -114,6 +114,16 @@ AWS: clean prepare 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/ + cd $(build_dir) + @../scripts/build-oracle-image + .PHONY: clean .ONESHELL: clean: @@ -129,6 +139,7 @@ clean: rm -f *.vhd rm -f *.raw rm -f *.tar.gz + rm -f *.qcow2 .PHONY: purge purge: |