summaryrefslogtreecommitdiffstats
path: root/build/patch-packages
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-10-27 12:38:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-27 12:38:02 +0000
commit0799bce0ce6fb46cbf1c5a2d3b505627d963428a (patch)
tree7a070959b180a23566af0fb6b891b869327397ea /build/patch-packages
parentf7a740476332fffca2bea98dadb2ab454154bb6b (diff)
parente37746b93c622ddddeb44bc5791c8da4a98fff7f (diff)
Merge "Update cirros image"
Diffstat (limited to 'build/patch-packages')
-rw-r--r--build/patch-packages/Makefile2
-rw-r--r--build/patch-packages/cirros_testvm/Makefile31
-rwxr-xr-xbuild/patch-packages/tools/deb_pack2
3 files changed, 33 insertions, 2 deletions
diff --git a/build/patch-packages/Makefile b/build/patch-packages/Makefile
index 339c9e7cf..aaac038b0 100644
--- a/build/patch-packages/Makefile
+++ b/build/patch-packages/Makefile
@@ -8,7 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-SUBDIRS :=
+SUBDIRS := cirros_testvm
SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
.PHONY: $(SUBDIRS) $(SUBCLEAN) clean
diff --git a/build/patch-packages/cirros_testvm/Makefile b/build/patch-packages/cirros_testvm/Makefile
new file mode 100644
index 000000000..4cbe13f6c
--- /dev/null
+++ b/build/patch-packages/cirros_testvm/Makefile
@@ -0,0 +1,31 @@
+##############################################################################
+# 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~u14.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
diff --git a/build/patch-packages/tools/deb_pack b/build/patch-packages/tools/deb_pack
index f5d42dec3..1550d95d8 100755
--- a/build/patch-packages/tools/deb_pack
+++ b/build/patch-packages/tools/deb_pack
@@ -39,7 +39,7 @@ revision_step ()
{
REV=$1
- sed -i "s/^\(Version:.*$\)/\1-eri$REV/" package/DEBIAN/control
+ sed -i "s/^\(Version:.*$\)/\1-opnfv$REV/" package/DEBIAN/control
}
md5sum_gen ()