From: Albert <asyriy@mirantis.com>
Date: Thu, 21 Apr 2016 11:58:24 +0000 (+0300)
Subject: Cherry-picked two commits from master e57920b and 0ecd1ca to update the kernel 3... 
X-Git-Tag: mos-9.0~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F34%2F19934%2F4;p=packages%2Ftrusty%2Fcirros-testvm.git

Cherry-picked two commits from master e57920b and 0ecd1ca to update the kernel 3.13.0-85 and add tcpdump package

This is a cherry-pick of two commits. The first one adds tcpdump and
other packages into cirros image and updates the kernel to 3.13.0-85.
The second commit adds some space to the has grown image.

Closes-Bug: #1571704
Closes-Bug: #1260268

Change-Id: I89dbf2656b95edd18c9dedec96b70dc8a450c2d4
---

diff --git a/cirros-testvm/cirros-u14.04-kver-3.13.0-83-x86_64-disk.img b/cirros-testvm/cirros-u14.04-kver-3.13.0-85-x86_64-disk.img
similarity index 57%
rename from cirros-testvm/cirros-u14.04-kver-3.13.0-83-x86_64-disk.img
rename to cirros-testvm/cirros-u14.04-kver-3.13.0-85-x86_64-disk.img
index 3256ea8..f673522 100644
Binary files a/cirros-testvm/cirros-u14.04-kver-3.13.0-83-x86_64-disk.img and b/cirros-testvm/cirros-u14.04-kver-3.13.0-85-x86_64-disk.img differ
diff --git a/debian/changelog b/debian/changelog
index f38e95b..d77ed53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+cirros-testvm (0.3.4-2~u14.04+mos4) mos9.0; urgency=medium
+
+  * Add image size up to 48M due to the LP#1571704 
+
+ -- Albert Syriy <asyriy@mirantis.com>  Mon, 19 Apr 2016 15:52:03 +0200
+
+cirros-testvm (0.3.4-2~u14.04+mos3) mos9.0; urgency=medium
+
+  * Add the tcpdump package to the image
+  * Update kernel to 3.13.0-85 version
+
+ -- Albert Syriy <asyriy@mirantis.com>  Mon, 14 Apr 2016 13:09:07 +0200
+
 cirros-testvm (0.3.4-2~u14.04+mos2) mos9.0; urgency=medium
 
   * Update the package to the version after 0.3.4 (trunk), since the project
diff --git a/debian/cirros-testvm.links b/debian/cirros-testvm.links
index cd8ddfb..a1cf52b 100644
--- a/debian/cirros-testvm.links
+++ b/debian/cirros-testvm.links
@@ -1 +1 @@
-/usr/share/cirros-testvm/cirros-u14.04-kver-3.13.0-83-x86_64-disk.img /usr/share/cirros-testvm/cirros-x86_64-disk.img
+/usr/share/cirros-testvm/cirros-u14.04-kver-3.13.0-85-x86_64-disk.img /usr/share/cirros-testvm/cirros-x86_64-disk.img
diff --git a/debian/rules b/debian/rules
index 5493923..bd51249 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ clean:
 build-arch:
 	dh_testdir
 	mkdir -p debian/cirros-testvm/usr/share/cirros-testvm/
-	cp -p cirros-u14.04-kver-3.13.0-83-x86_64-disk.img debian/cirros-testvm/usr/share/cirros-testvm/
+	cp -p cirros-u14.04-kver-3.13.0-85-x86_64-disk.img debian/cirros-testvm/usr/share/cirros-testvm/
 
 build: build-arch build-indep