diff --git a/snmp-ext/centos/build_srpm.data b/snmp-ext/centos/build_srpm.data index ece454f7..9b409b6c 100644 --- a/snmp-ext/centos/build_srpm.data +++ b/snmp-ext/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="sources" -TIS_PATCH_VER=1 +TIS_PATCH_VER=2 diff --git a/snmp-ext/centos/snmp-ext.spec b/snmp-ext/centos/snmp-ext.spec index 362ca8a9..0db16ebd 100644 --- a/snmp-ext/centos/snmp-ext.spec +++ b/snmp-ext/centos/snmp-ext.spec @@ -14,7 +14,6 @@ Requires: fm-common Requires: net-snmp %define mib_ver 2.0 -%define cgcs_sdk_deploy_dir /opt/deploy/cgcs_sdk %description Titanium Cloud platform SNMP extension provides Wind River enterprise MIBs support @@ -32,12 +31,6 @@ and it serves as SNMP based alarm surveillance module for Network Manager System. This package contains symbolic links, header files, and related items necessary for software development. -%package -n %{name}-cgts-sdk -Summary: Titanium Cloud Platform SNMP extension Package - SDK -Group: devel - -%description -n %{name}-cgts-sdk - %prep %setup @@ -53,7 +46,6 @@ make DEST_DIR=%{buildroot} \ LIB_DIR=%{_libdir} \ MAJOR=$MAJOR \ MINOR=$MINOR \ - SDK_DEPLOY_DIR=%{buildroot}%{cgcs_sdk_deploy_dir} \ MIBVER=%{mib_ver} \ PATCH=%{tis_patch_ver} install @@ -66,6 +58,3 @@ make DEST_DIR=%{buildroot} \ %files -n snmp-ext-devel %defattr(-,root,root,-) %{_libdir}/*.so - -%files -n %{name}-cgts-sdk -%{cgcs_sdk_deploy_dir}/wrs-snmp-mib-*.%{mib_ver}.tgz diff --git a/snmp-ext/sources/Makefile b/snmp-ext/sources/Makefile index a1e3f626..408ea342 100644 --- a/snmp-ext/sources/Makefile +++ b/snmp-ext/sources/Makefile @@ -10,7 +10,6 @@ MIBVER ?= 2.0 DEST_DIR ?= / DATA_DIR ?= /usr/share LIB_DIR ?= /usr/lib64 -SDK_DEPLOY_DIR ?= /opt/deploy/cgcs_sdk SRCS = cgtsActiveAlarms.c cgtsAgentPlugin.c cgtsEventLogs.c @@ -19,10 +18,6 @@ LDLIBS = -lfmcommon -lnetsnmp -lnetsnmpagent -luuid INCLUDES += -I./ CCFLAGS = -fPIC -g -O2 -Wall -Werror -Wformat -Wformat-security LIBCGTSAGENT_SO := libcgtsAgentPlugin.so -MIBDIR = wrs-snmp-mib-$(MAJOR).$(MIBVER) - -build: lib - tar -zc --transform=s/^mibs/$(MIBDIR)/ -f wrs-snmp-mib-$(MAJOR).$(MIBVER).tgz mibs .c.o: $(CXX) $(CCFLAGS) $(INCLUDES) -c $< -o $@ @@ -41,7 +36,5 @@ install: install -m 755 -d $(DEST_DIR)$(DATA_DIR)/snmp/mibs install -m 644 mibs/wrsAlarmMib.mib.txt $(DEST_DIR)$(DATA_DIR)/snmp/mibs/ install -m 644 mibs/wrsEnterpriseReg.mib.txt $(DEST_DIR)$(DATA_DIR)/snmp/mibs/ - install -m 755 -d $(SDK_DEPLOY_DIR) - install -m 644 wrs-snmp-mib-$(MAJOR).$(MIBVER).tgz $(SDK_DEPLOY_DIR)/ ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO).$(MAJOR) ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO)