Adding packages related to kexec-tools and making contrail-setup depe…

…nds on kexec-tools if centos6.5 Change-Id: I3f2f8e68336f8e2f07ee1a4eeb071ed54d6a036b
Juniper · Jan 14, 2015 · f40ff09 · f40ff09
1 parent c59f24c
commit f40ff09
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 0 deletions.
diff --git a/build/package_configs/centos65/havana/depends_packages.cfg b/build/package_configs/centos65/havana/depends_packages.cfg
@@ -100,6 +100,10 @@ md5   = 7a8764ed76ec597ef033f2898f448f4a
 file  = avahi-libs-0.6.25-12.el6_5.1.x86_64.rpm
 md5   = 8c906ba182f2e1767cf76b95fff7a3cc
 
+[bc_1.06.95_1.el6]
+file  = bc-1.06.95-1.el6.x86_64.rpm
+md5   = 2b8bf4cb002ee337342008d94fa5bb81
+
 [bigtop-utils_0.3.0.incubating_1.el6]
 file  = bigtop-utils-0.3.0.incubating-1.el6.noarch.rpm
 md5   = 431061082498dbd313be5b4f7fbb388d
@@ -128,6 +132,10 @@ md5   = 9228fa7b26caf516214280cfe8db7d45
 file  = btrfs-progs-0.20-0.2.git91d9eec.el6.x86_64.rpm
 md5   = 3580d76210b11e58b9173f788b9a1687
 
+[busybox_1.15.1_20.el6]
+file  = busybox-1.15.1-20.el6.x86_64.rpm
+md5   = 5211883e9d501d729b14fd26d18addc7
+
 [cairo_1.8.8_3.1.el6]
 file  = cairo-1.8.8-3.1.el6.x86_64.rpm
 md5   = b1ad830d39e94707f0d3b4ec4be83510
@@ -148,6 +156,10 @@ md5   = fb0fd43ad45c05f78c67e39ed274df7e
 file  = cpp-4.4.7-4.el6.x86_64.rpm
 md5   = 7f1d49c96cabeb4427c0ac1c388988cf
 
+[crash_6.1.0_5.el6]
+file  = crash-6.1.0-5.el6.x86_64.rpm
+md5   = fa4b4145190aa834ec9c1fc83188c83a
+
 [cryptsetup-luks-libs_1.2.0_7.el6]
 file  = cryptsetup-luks-libs-1.2.0-7.el6.x86_64.rpm
 md5   = 216c630349bfa265fba0412c0d094a72
@@ -216,6 +228,10 @@ md5   = 8795431826cbd7c5bdcec9ec9ddcb137
 file  = eggdbus-0.6-3.el6.x86_64.rpm
 md5   = 797a6c02ca02a978f7dfea28be2f7708
 
+[elfutils-libs_0.152_1.el6]
+file  = elfutils-libs-0.152-1.el6.x86_64.rpm
+md5   = fa80b323686d3ee0cb842a7121ba5f54
+
 [esl-erlang-compat_R14B_1.el6]
 file  = esl-erlang-compat-R14B-1.el6.noarch.rpm
 md5   = e514ec8765ba14ccec3a74d555d2472e
@@ -388,10 +404,26 @@ md5   = eda855fee5a2fbd68e43a63a84c4c4d9
 file  = kernel-headers-2.6.32-431.20.3.el6.x86_64.rpm
 md5   = e22aaa17701effc6f21787af782e46ef
 
+[kernel-debug_2.6.32_431.29.2.el6]
+file  = kernel-debug-2.6.32-431.29.2.el6.x86_64.rpm
+md5   = a61095e012371a3bb79eaa4a3c99ada0
+
+[kernel-debuginfo_2.6.32_431.el6]
+file  = kernel-debuginfo-2.6.32-431.el6.x86_64.rpm
+md5   = 0a125acfe1095e98c9c213b73d2dbdd6
+
+[kexec-tools_2.0.0_273.el6_5.1]
+file  = kexec-tools-2.0.0-273.el6_5.1.x86_64.rpm
+md5   = d24f15ee9e60d9050d7a88a3df540916
+
 [keyutils_1.4_4.el6]
 file  = keyutils-1.4-4.el6.x86_64.rpm
 md5   = 0c8fe4e81847b78d7dae9451c39fdaa3
 
+[kpartx_0.4.9_72.el6_5.4]
+file  = kpartx-0.4.9-72.el6_5.4.x86_64.rpm
+md5   = 8c4287bb78405717b81c9d8dc5bc8be1
+
 [libICE_1.0.6_1.el6]
 file  = libICE-1.0.6-1.el6.x86_64.rpm
 md5   = b168eedfb882cc5d11e4c00cec4ff569
@@ -1500,6 +1532,10 @@ md5   = 50c3cb26b7423869ab143d652851d878
 file  = slf4j-1.5.8-8.el6.noarch.rpm
 md5   = ab181069de766b54fed49a07880a4d8a
 
+[snappy_1.1.0_1.el6]
+file  = snappy-1.1.0-1.el6.x86_64.rpm
+md5   = 6463c47dcf740298c4bdd77155774546
+
 [spice-server_0.12.4_6.el6_5.2]
 file  = spice-server-0.12.4-6.el6_5.2.x86_64.rpm
 md5   = 2d3063e232e627167982603d9a55f68e

diff --git a/build/package_configs/centos65/icehouse/depends_packages.cfg b/build/package_configs/centos65/icehouse/depends_packages.cfg
@@ -108,6 +108,10 @@ md5   = 7a8764ed76ec597ef033f2898f448f4a
 file  = avahi-libs-0.6.25-12.el6_5.1.x86_64.rpm
 md5   = 8c906ba182f2e1767cf76b95fff7a3cc
 
+[bc_1.06.95_1.el6]
+file  = bc-1.06.95-1.el6.x86_64.rpm
+md5   = 2b8bf4cb002ee337342008d94fa5bb81
+
 [bigtop-utils_0.3.0.incubating_1.el6]
 file  = bigtop-utils-0.3.0.incubating-1.el6.noarch.rpm
 md5   = 431061082498dbd313be5b4f7fbb388d
@@ -136,6 +140,10 @@ md5   = 9228fa7b26caf516214280cfe8db7d45
 file  = btrfs-progs-0.20-0.2.git91d9eec.el6.x86_64.rpm
 md5   = 3580d76210b11e58b9173f788b9a1687
 
+[busybox_1.15.1_20.el6]
+file  = busybox-1.15.1-20.el6.x86_64.rpm
+md5   = 5211883e9d501d729b14fd26d18addc7
+
 [cairo_1.8.8_3.1.el6]
 file  = cairo-1.8.8-3.1.el6.x86_64.rpm
 md5   = b1ad830d39e94707f0d3b4ec4be83510
@@ -160,6 +168,10 @@ md5   = 7f1d49c96cabeb4427c0ac1c388988cf
 file  = crudini-0.3-2.el6.noarch.rpm
 md5   = 42c007db81a564123c07eeb4b3047824
 
+[crash_6.1.0_5.el6]
+file  = crash-6.1.0-5.el6.x86_64.rpm
+md5   = fa4b4145190aa834ec9c1fc83188c83a
+
 [cryptsetup-luks-libs_1.2.0_7.el6]
 file  = cryptsetup-luks-libs-1.2.0-7.el6.x86_64.rpm
 md5   = 216c630349bfa265fba0412c0d094a72
@@ -208,6 +220,10 @@ md5   = 8795431826cbd7c5bdcec9ec9ddcb137
 file  = eggdbus-0.6-3.el6.x86_64.rpm
 md5   = 797a6c02ca02a978f7dfea28be2f7708
 
+[elfutils-libs_0.152_1.el6]
+file  = elfutils-libs-0.152-1.el6.x86_64.rpm
+md5   = fa80b323686d3ee0cb842a7121ba5f54
+
 [erlang-appmon_R14B_04.3.el6]
 file  = erlang-appmon-R14B-04.3.el6.x86_64.rpm
 md5   = 8cc11503be2e05fb2e5bb920a20797ae
@@ -650,10 +666,26 @@ md5   = e22aaa17701effc6f21787af782e46ef
 file  = kernel-headers-2.6.32-431.20.3.el6.centos.plus.x86_64.rpm
 md5   = e42fe959cc7a8d3456beed25aead93db
 
+[kernel-debug_2.6.32_431.29.2.el6]
+file  = kernel-debug-2.6.32-431.29.2.el6.x86_64.rpm
+md5   = a61095e012371a3bb79eaa4a3c99ada0
+
+[kernel-debuginfo_2.6.32_431.el6]
+file  = kernel-debuginfo-2.6.32-431.el6.x86_64.rpm
+md5   = 0a125acfe1095e98c9c213b73d2dbdd6
+
+[kexec-tools_2.0.0_273.el6_5.1]
+file  = kexec-tools-2.0.0-273.el6_5.1.x86_64.rpm
+md5   = d24f15ee9e60d9050d7a88a3df540916
+
 [keyutils_1.4_4.el6]
 file  = keyutils-1.4-4.el6.x86_64.rpm
 md5   = 0c8fe4e81847b78d7dae9451c39fdaa3
 
+[kpartx_0.4.9_72.el6_5.4]
+file  = kpartx-0.4.9-72.el6_5.4.x86_64.rpm
+md5   = 8c4287bb78405717b81c9d8dc5bc8be1
+
 [libICE_1.0.6_1.el6]
 file  = libICE-1.0.6-1.el6.x86_64.rpm
 md5   = b168eedfb882cc5d11e4c00cec4ff569
@@ -1867,6 +1899,10 @@ md5   = 50c3cb26b7423869ab143d652851d878
 file  = slf4j-1.5.8-8.el6.noarch.rpm
 md5   = ab181069de766b54fed49a07880a4d8a
 
+[snappy_1.1.0_1.el6]
+file  = snappy-1.1.0-1.el6.x86_64.rpm
+md5   = 6463c47dcf740298c4bdd77155774546
+
 [spice-server_0.12.4_6.el6_5.2]
 file  = spice-server-0.12.4-6.el6_5.2.x86_64.rpm
 md5   = 2d3063e232e627167982603d9a55f68e

diff --git a/common/rpm/contrail-setup.spec b/common/rpm/contrail-setup.spec
@@ -3,6 +3,7 @@
 %define         _contrailopt /opt/contrail
 %define         _distropkgdir tools/packaging/common/control_files
 %define         _provdir      %{_builddir}/../tools/provisioning
+%define         _is_centos65  %(grep -c 6.5 /etc/issue)
 
 %if 0%{?_buildTag:1}
 %define         _relstr      %{_buildTag}
@@ -55,6 +56,10 @@ Requires:	    gdb
 %if 0%{?rhel} > 6
 Requires:           net-tools
 %endif
+%if 0%{?_is_centos65} == 1
+Requires:           kexec-tools
+%endif
+
 %description
 Contrail Setup package with scripts for provisioning