From 26563288d1443e47ce72622a4cfd96c8933019a1 Mon Sep 17 00:00:00 2001
From: Erich Cordoba <erich.cordoba.malibran@intel.com>
Date: Wed, 30 Jan 2019 12:29:08 -0600
Subject: [PATCH] Standardize makefile for snmp-ext

Changes made:
  - Simplify spec file.
  - Rename install_non_bb target.
  - Change tarball creation process.
  - mibs folder moved into source folder.

Story: 2004043
Task: 27545

Change-Id: I9cc026aa9c2dbe3f4171ee6b0639a2be6653420c
Signed-off-by: Marcela Rosales <marcela.a.rosales.jimenez@intel.com>
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
---
 snmp-ext/centos/build_srpm.data               |  1 -
 snmp-ext/centos/snmp-ext.spec                 | 35 +++++++------------
 snmp-ext/sources/Makefile                     | 26 ++++++++++++--
 .../{ => sources}/mibs/wrsAlarmMib.mib.txt    |  0
 .../mibs/wrsEnterpriseReg.mib.txt             |  0
 5 files changed, 36 insertions(+), 26 deletions(-)
 rename snmp-ext/{ => sources}/mibs/wrsAlarmMib.mib.txt (100%)
 rename snmp-ext/{ => sources}/mibs/wrsEnterpriseReg.mib.txt (100%)

diff --git a/snmp-ext/centos/build_srpm.data b/snmp-ext/centos/build_srpm.data
index 706c821c..ece454f7 100644
--- a/snmp-ext/centos/build_srpm.data
+++ b/snmp-ext/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="sources"
-COPY_LIST="mibs/*"
 TIS_PATCH_VER=1
diff --git a/snmp-ext/centos/snmp-ext.spec b/snmp-ext/centos/snmp-ext.spec
index 2c8e859b..362ca8a9 100644
--- a/snmp-ext/centos/snmp-ext.spec
+++ b/snmp-ext/centos/snmp-ext.spec
@@ -13,9 +13,6 @@ BuildRequires: libuuid-devel
 Requires: fm-common
 Requires: net-snmp
 
-Source1: wrsAlarmMib.mib.txt
-Source2: wrsEnterpriseReg.mib.txt
-
 %define mib_ver 2.0
 %define cgcs_sdk_deploy_dir /opt/deploy/cgcs_sdk
 
@@ -45,28 +42,20 @@ Group: devel
 %setup
 
 %build
-VER=%{version}
-MAJOR=`echo $VER | awk -F . '{print $1}'`
-MINOR=`echo $VER | awk -F . '{print $2}'`
-PATCHVER=` echo %{release} | awk -F r '{print $2}' | awk -F . '{print $1}'`
-make  MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCHVER %{?_smp_mflags}
+MAJOR=`echo %{version} | awk -F . '{print $1}'`
+MINOR=`echo %{version} | awk -F . '{print $2}'`
+make MAJOR=$MAJOR MINOR=$MINOR PATCH=%{tis_patch_ver} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-VER=%{version}
-MAJOR=`echo $VER | awk -F . '{print $1}'`
-MINOR=`echo $VER | awk -F . '{print $2}'`
-
-PATCHVER=` echo %{release} | awk -F r '{print $2}' | awk -F . '{print $1}'`
-make DEST_DIR=$RPM_BUILD_ROOT LIB_DIR=%{_libdir} MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCHVER install_non_bb
-
-MIBDIR=wrs-snmp-mib-${MAJOR}.%{mib_ver}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/snmp/mibs
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/snmp/mibs
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/snmp/mibs
-tar -zc --transform=s/^mibs/${MIBDIR}/ -f wrs-snmp-mib-${MAJOR}.%{mib_ver}.tgz -C $RPM_BUILD_ROOT%{_datadir}/snmp mibs
-mkdir -p $RPM_BUILD_ROOT%{cgcs_sdk_deploy_dir}
-install -m 644 wrs-snmp-mib-${MAJOR}.%{mib_ver}.tgz $RPM_BUILD_ROOT%{cgcs_sdk_deploy_dir}
+MAJOR=`echo %{version} | awk -F . '{print $1}'`
+MINOR=`echo %{version} | awk -F . '{print $2}'`
+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
 
 %files
 %defattr(-,root,root,-)
diff --git a/snmp-ext/sources/Makefile b/snmp-ext/sources/Makefile
index 07d004fc..a1e3f626 100644
--- a/snmp-ext/sources/Makefile
+++ b/snmp-ext/sources/Makefile
@@ -1,3 +1,17 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MAJOR ?= 1
+MINOR ?= 0
+PATCH ?= 0
+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
 
 OBJS = $(SRCS:.c=.o)
@@ -5,7 +19,10 @@ 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 $@
@@ -16,10 +33,15 @@ lib: $(OBJS)
 	ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO)
 
 clean:
-	@rm -f $(OBJ) *.o *.so.*
+	@rm -f $(OBJ) *.o *.so.* *.tgz
 
-install_non_bb:
+install:
 	install -m 755 -d $(DEST_DIR)$(LIB_DIR)
 	install -m 755 $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)
+	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)
diff --git a/snmp-ext/mibs/wrsAlarmMib.mib.txt b/snmp-ext/sources/mibs/wrsAlarmMib.mib.txt
similarity index 100%
rename from snmp-ext/mibs/wrsAlarmMib.mib.txt
rename to snmp-ext/sources/mibs/wrsAlarmMib.mib.txt
diff --git a/snmp-ext/mibs/wrsEnterpriseReg.mib.txt b/snmp-ext/sources/mibs/wrsEnterpriseReg.mib.txt
similarity index 100%
rename from snmp-ext/mibs/wrsEnterpriseReg.mib.txt
rename to snmp-ext/sources/mibs/wrsEnterpriseReg.mib.txt