Merge "This will add a new package in vrouter to support with 3.13.0-…

…83-generic kernel, without chaging default vrouter kernel version. Partial-Bug: #1566047" into R2.20
Juniper · May 5, 2016 · 94a363a · 94a363a
2 parents dba80fe + 522d3ff
commit 94a363a
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 1 deletion.
diff --git a/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg
@@ -1615,16 +1615,36 @@ file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 source         = repo:trusty-security
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 source         = repo:trusty-security
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 source         = repo:trusty-security
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [mysql-client-5.5_5.5.47-0ubuntu0.14.04.1]
 file           = mysql-client-5.5_5.5.47-0ubuntu0.14.04.1_amd64.deb
 md5            = c9628bdd19abae613490651e6a00f6ad

diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg
@@ -2009,16 +2009,36 @@ file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 source         = repo:trusty-security
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 source         = repo:trusty-security
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 source         = repo:trusty-security
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [mysql-client-5.5_5.5.47-0ubuntu0.14.04.1]
 file           = mysql-client-5.5_5.5.47-0ubuntu0.14.04.1_amd64.deb
 md5            = c9628bdd19abae613490651e6a00f6ad

diff --git a/build/package_configs/ubuntu1404/kilo/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/kilo/depends_contrail_dependent_packages.cfg
@@ -48,6 +48,11 @@ md5   = efc4948adfc7855968db71d52b181af0
 file  = cassandra_1.2.11_all.deb
 md5   = e23ee7822d3c52317d52d523662dc1d5
 
+[cgmanager_0.24-0ubuntu7.1]
+file  = cgmanager_0.24-0ubuntu7.1_amd64.deb
+md5   = 222c12502e6fcb5d5897f51c158d33e8
+source = repo:trusty-security/main/
+
 [cgroup-lite_1.9]
 file  = cgroup-lite_1.9_all.deb
 md5   = fe1749ba83aaf6d4f3e87ccdbc3581d4
@@ -2034,6 +2039,16 @@ file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 source         = repo:trusty-security
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-34-generic_3.13.0-34.60]
 file           = linux-image-3.13.0-34-generic_3.13.0-34.60_amd64.deb
 md5            = 860eee967a5f0b1e20d422839db84f7d
@@ -2049,6 +2064,11 @@ file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 source         = repo:trusty-security
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-34-generic_3.13.0-34.60]
 file           = linux-image-extra-3.13.0-34-generic_3.13.0-34.60_amd64.deb
 md5            = e4c9fce04b06f0cfafcd0c0d1a494e40
@@ -2064,6 +2084,11 @@ file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 source         = repo:trusty-security
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [linux-libc-dev_3.13.0-79.123]
 file           = linux-libc-dev_3.13.0-79.123_amd64.deb
 md5            = e9c7f222b9bffa0049ba329e9671e4d9

diff --git a/build/package_configs/ubuntu1404/vcenter/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/vcenter/depends_contrail_dependent_packages.cfg
@@ -851,14 +851,34 @@ md5            = 5746e3f726d3828c48de16e4b37c7b75
 file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [lksctp-tools_1.0.15+dfsg-1]
 file           = lksctp-tools_1.0.15+dfsg-1_amd64.deb
 md5            = 39373482904f27eddebcef56b9bcf13f

diff --git a/common/debian/Makefile b/common/debian/Makefile
@@ -171,7 +171,7 @@ clean-%:
 
 KERNEL_VERSIONS := 3.8.0-29-generic 3.2.0-58-generic 3.2.0-51-generic 3.11.0-22-generic \
                    3.13.0-24-generic 3.8.0-31-generic 3.13.0-34-generic 3.13.0-35-generic \
-                   3.13.0-40-generic
+                   3.13.0-40-generic 3.13.0-83-generic
 
 AVAILABLE_KERNEL_VERSIONS := $(foreach kname, $(KERNEL_VERSIONS), $(shell [ -d /lib/modules/$(kname)/build ] && echo $(kname)))