diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-02-27 23:43:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-27 23:43:01 +0000 |
| commit | e0aef8845d1471418ce673145b5c78fc9d89d7fb (patch) | |
| tree | c485510052dc1bb28ee251b77f6e4820112b1c65 | |
| parent | d8a98cd629464a20a8b69ba54e310e3652449ec9 (diff) | |
| parent | e1fffbe607421d6df2d98e0bda1d632feebf108d (diff) | |
Merge "Tidy up outdated cirros image"
| -rw-r--r-- | build/patch-packages/Makefile | 2 | ||||
| -rw-r--r-- | build/patch-packages/cirros_testvm/Makefile | 31 |
2 files changed, 1 insertions, 32 deletions
diff --git a/build/patch-packages/Makefile b/build/patch-packages/Makefile index aaac038b0..d12b53a72 100644 --- a/build/patch-packages/Makefile +++ b/build/patch-packages/Makefile @@ -8,7 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -SUBDIRS := cirros_testvm +SUBDIRS := SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) .PHONY: $(SUBDIRS) $(SUBCLEAN) clean diff --git a/build/patch-packages/cirros_testvm/Makefile b/build/patch-packages/cirros_testvm/Makefile deleted file mode 100644 index b6a56d4d0..000000000 --- a/build/patch-packages/cirros_testvm/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -# Copyright (c) 2015,2016 Ericsson AB, Mirantis Inc. and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# mpolenchuk@mirantis.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -TOP := $(shell pwd) - -.PHONY: all -all: - -.PHONY: clean -clean: - @rm -rf package - @rm -rf *.deb - @rm -rf patch-replacements - @rm -rf .package - -.PHONY: release -release: - ../tools/deb_unpack c/cirros-testvm/cirros-testvm_0.3.4-2~u16.04+mos5_amd64.deb $(ORIGISO) - @rm -rf package/usr/share/cirros-testvm/* - wget -O package/usr/share/cirros-testvm/cirros-x86_64-disk.img http://download.cirros-cloud.net/daily/20160722/cirros-d160722-x86_64-disk.img - ../tools/deb_pack $(REVSTATE) - @cp *.deb ../release/packages - @cat patch-replacements >> ../release/patch-replacements |