starlingx/integ
Code Issues Proposed changes

rebase net-snmp patch to CentOS 7.6 version

Browse Source 
Test:
Pass build and multi-node deploy test

Depends-On: https://review.openstack.org/627383

Story: 2004522
Task: 28406

Change-Id: If2654de0e3a5686d061cf1970b7454363f39c5b5
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>
This commit is contained in:
Martin, Chen 2018-12-26 19:20:41 +08:00
parent 2141fc213e
commit e1cbd10bc3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -15,8 +15,8 @@ index a59db4f..8a24ba1 100644
Summary: A collection of SNMP protocol tools and libraries Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp Name: net-snmp
Version: 5.7.2 Version: 5.7.2
-Release: 33%{?dist}.2 -Release: 37%{?dist}
+Release: 33.el7_5.2%{?_tis_dist}.%{tis_patch_ver} +Release: 37.el7%{?_tis_dist}.%{tis_patch_ver}
Epoch: 1 Epoch: 1
License: BSD License: BSD

6
base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch
View File

@ -9,7 +9,7 @@ index 8a24ba1..40af31f 100644
# use netsnmp_tcp_wrappers 0 to disable tcp_wrappers support # use netsnmp_tcp_wrappers 0 to disable tcp_wrappers support
%{!?netsnmp_tcp_wrappers:%global netsnmp_tcp_wrappers 1} %{!?netsnmp_tcp_wrappers:%global netsnmp_tcp_wrappers 1}
# use nestnmp_check 0 to speed up packaging by disabling 'make test' # use nestnmp_check 0 to speed up packaging by disabling 'make test'
@@ -333,7 +336,7 @@ rm testing/fulltests/default/T200* @@ -339,7 +342,7 @@ rm testing/fulltests/default/T200*
%endif %endif
%build %build
@ -18,7 +18,7 @@ index 8a24ba1..40af31f 100644
ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \ ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \
ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \ ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \
ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \ ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \
@@ -354,6 +357,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib" @@ -360,6 +363,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
--with-logfile="/var/log/snmpd.log" \ --with-logfile="/var/log/snmpd.log" \
--with-persistent-directory="/var/lib/net-snmp" \ --with-persistent-directory="/var/lib/net-snmp" \
--with-mib-modules="$MIBS" \ --with-mib-modules="$MIBS" \
@ -26,7 +26,7 @@ index 8a24ba1..40af31f 100644
%if %{netsnmp_tcp_wrappers} %if %{netsnmp_tcp_wrappers}
--with-libwrap=yes \ --with-libwrap=yes \
%endif %endif
@@ -372,6 +376,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib" @@ -378,6 +382,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
--with-security-modules=tsm \ --with-security-modules=tsm \
--with-mysql \ --with-mysql \
--with-systemd \ --with-systemd \

2
base/net-snmp/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/net-snmp-5.7.2-33.el7_5.2.src.rpm mirror:Source/net-snmp-5.7.2-37.el7.src.rpm