To support -85 kernel with default in R3.0 builds

Partial-Bug: #1580670 Change-Id: Ic00a059cecd1327bbdc4a568b3814ac98d5261d9
Juniper · May 11, 2016 · 7be2933 · 7be2933
1 parent dd17341
commit 7be2933
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 5 deletions.
diff --git a/build/package_configs/ubuntu1404/juno/contrail_packages.cfg b/build/package_configs/ubuntu1404/juno/contrail_packages.cfg
@@ -43,7 +43,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-nova-driver, contrail-vrouter-agent, contrail-vrouter-dkms,
           contrail-vrouter-dpdk, contrail-vrouter-source,
           contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
-          contrail-vrouter-3.13.0-40-generic, contrail-config-openstack,
+          contrail-vrouter-3.13.0-85-generic, contrail-config-openstack,
           contrail-dns, python-opencontrail-vrouter-netns, contrail-utils,
           contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg
@@ -1421,6 +1421,16 @@ file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
 md5            = 50bf914d576b43b2e28c1862c3638c82
 source         = repo:trusty-security/main/
 
+[linux-headers-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-headers-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = ea4e36e8e787115b19bddb3c74bac3cb
+source         = repo:trusty-updates/main/
+
+[linux-headers-3.13.0-85_3.13.0-85.129]
+file           = linux-headers-3.13.0-85_3.13.0-85.129_all.deb
+md5            = 8153507a22c943d64055df2a8490dc7d
+source         = repo:trusty-updates/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
@@ -1431,6 +1441,11 @@ file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 1488cbc687bebc497f2112f93131a727
 source         = repo:trusty-security/main/
 
+[linux-image-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = fc7234f99aff2a0f0dfb1c3b1a44dacf
+source         = repo:trusty-updates/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
@@ -1441,6 +1456,11 @@ file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 4832e8b6a6654b8d20ae53f279ff878d
 source         = repo:trusty-security/main/
 
+[linux-image-extra-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-extra-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = 5e660aae162edc373ecdb8668ab3d0b8
+source         = repo:trusty-updates/main/
+
 [lksctp-tools_1.0.15+dfsg-1]
 file           = lksctp-tools_1.0.15+dfsg-1_amd64.deb
 md5            = 39373482904f27eddebcef56b9bcf13f

diff --git a/build/package_configs/ubuntu1404/kilo/contrail_packages.cfg b/build/package_configs/ubuntu1404/kilo/contrail_packages.cfg
@@ -42,7 +42,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-nova-driver, contrail-vrouter-agent, contrail-vrouter-dkms,
           contrail-vrouter-dpdk, contrail-vrouter-source,
           contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
-          contrail-vrouter-3.13.0-40-generic, contrail-config-openstack,
+          contrail-vrouter-3.13.0-85-generic, contrail-config-openstack,
           contrail-dns, python-opencontrail-vrouter-netns, contrail-utils,
           contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/kilo/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/kilo/depends_contrail_dependent_packages.cfg
@@ -1321,6 +1321,16 @@ file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
 md5            = 50bf914d576b43b2e28c1862c3638c82
 source         = repo:trusty-security/main/
 
+[linux-headers-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-headers-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = ea4e36e8e787115b19bddb3c74bac3cb
+source         = repo:trusty-updates/main/
+
+[linux-headers-3.13.0-85_3.13.0-85.129]
+file           = linux-headers-3.13.0-85_3.13.0-85.129_all.deb
+md5            = 8153507a22c943d64055df2a8490dc7d
+source         = repo:trusty-updates/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
@@ -1341,6 +1351,11 @@ file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 1488cbc687bebc497f2112f93131a727
 source         = repo:trusty-security/main/
 
+[linux-image-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = fc7234f99aff2a0f0dfb1c3b1a44dacf
+source         = repo:trusty-updates/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
@@ -1361,6 +1376,11 @@ file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 4832e8b6a6654b8d20ae53f279ff878d
 source         = repo:trusty-security/main/
 
+[linux-image-extra-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-extra-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = 5e660aae162edc373ecdb8668ab3d0b8
+source         = repo:trusty-updates/main/
+
 [linux-libc-dev_3.13.0-68.111]
 file           = linux-libc-dev_3.13.0-68.111_amd64.deb
 md5            = ac5595b89ffc06502e6ab57fa4db9aa1

diff --git a/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg b/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg
@@ -42,7 +42,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-nova-driver, contrail-vrouter-agent, contrail-vrouter-dkms,
           contrail-vrouter-dpdk, contrail-vrouter-source,
           contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
-          contrail-vrouter-3.13.0-40-generic, contrail-config-openstack,
+          contrail-vrouter-3.13.0-85-generic, contrail-config-openstack,
           contrail-dns, python-opencontrail-vrouter-netns, contrail-utils,
           contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg
@@ -762,6 +762,16 @@ file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
 md5            = 50bf914d576b43b2e28c1862c3638c82
 source         = repo:trusty-security/main/
 
+[linux-headers-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-headers-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = ea4e36e8e787115b19bddb3c74bac3cb
+source         = repo:trusty-updates/main/
+
+[linux-headers-3.13.0-85_3.13.0-85.129]
+file           = linux-headers-3.13.0-85_3.13.0-85.129_all.deb
+md5            = 8153507a22c943d64055df2a8490dc7d
+source         = repo:trusty-updates/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
@@ -772,6 +782,11 @@ file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 1488cbc687bebc497f2112f93131a727
 source         = repo:trusty-security/main/
 
+[linux-image-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = fc7234f99aff2a0f0dfb1c3b1a44dacf
+source         = repo:trusty-updates/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
@@ -782,6 +797,11 @@ file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 4832e8b6a6654b8d20ae53f279ff878d
 source         = repo:trusty-security/main/
 
+[linux-image-extra-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-extra-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = 5e660aae162edc373ecdb8668ab3d0b8
+source         = repo:trusty-updates/main/
+
 [lksctp-tools_1.0.15+dfsg-1]
 file           = lksctp-tools_1.0.15+dfsg-1_amd64.deb
 md5            = 39373482904f27eddebcef56b9bcf13f

diff --git a/build/package_configs/ubuntu1404/vcenter/contrail_packages.cfg b/build/package_configs/ubuntu1404/vcenter/contrail_packages.cfg
@@ -29,7 +29,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-vrouter-source, contrail-vrouter-utils, python-contrail,
           python-contrail-vrouter-api, contrail-dns,
           python-opencontrail-vrouter-netns, contrail-utils, 
-          contrail-vrouter-3.13.0-40-generic, contrail-nodemgr, contrail-docs
+          contrail-vrouter-3.13.0-85-generic, contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian
 builtloc  = build/packages
 

diff --git a/build/package_configs/ubuntu1404/vcenter/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/vcenter/depends_contrail_dependent_packages.cfg
@@ -877,6 +877,16 @@ file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
 md5            = 50bf914d576b43b2e28c1862c3638c82
 source         = repo:trusty-security/main/
 
+[linux-headers-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-headers-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = ea4e36e8e787115b19bddb3c74bac3cb
+source         = repo:trusty-updates/main/
+
+[linux-headers-3.13.0-85_3.13.0-85.129]
+file           = linux-headers-3.13.0-85_3.13.0-85.129_all.deb
+md5            = 8153507a22c943d64055df2a8490dc7d
+source         = repo:trusty-updates/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
@@ -886,6 +896,11 @@ file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 1488cbc687bebc497f2112f93131a727
 source         = repo:trusty-security/main/
 
+[linux-image-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = fc7234f99aff2a0f0dfb1c3b1a44dacf
+source         = repo:trusty-updates/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
@@ -895,6 +910,11 @@ file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
 md5            = 4832e8b6a6654b8d20ae53f279ff878d
 source         = repo:trusty-security/main/
 
+[linux-image-extra-3.13.0-85-generic_3.13.0-85.129]
+file           = linux-image-extra-3.13.0-85-generic_3.13.0-85.129_amd64.deb
+md5            = 5e660aae162edc373ecdb8668ab3d0b8
+source         = repo:trusty-updates/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
@@ -198,7 +198,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-83-generic
+                   3.13.0-40-generic 3.13.0-83-generic 3.13.0-85-generic
 
 AVAILABLE_KERNEL_VERSIONS := $(foreach kname, $(KERNEL_VERSIONS), $(shell [ -d /lib/modules/$(kname)/build ] && echo $(kname)))