starlingx
/
fault
Code Issues Proposed changes

Standardize makefile in snmp-audittrail. 

The target of install_non_bb was changed to install. The variables
were set to default values inside the makefile. All changes were
updated in the specfile as well.

An issue with an empty PATCH variable was fixed and the StarlingX
was updated.

Story: 2004043
Task: 27546

Change-Id: I5f2f8a0d681b106691f2cbf8b0a7a27977452edc
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
This commit is contained in:
Erich Cordoba 2018-10-30 10:42:36 -06:00
parent 4d82104ecf
commit ff2800d9fe
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
snmp-audittrail/centos/snmp-audittrail.spec
View File

@ -1,4 +1,4 @@
Summary: Titanium Cloud Platform SNMP Audit Trail Summary: StarlingX SNMP Audit Trail
Name: snmp-audittrail Name: snmp-audittrail
Version: 1.0 Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist} Release: %{tis_patch_ver}%{?_tis_dist}
@ -16,18 +16,18 @@ Requires: net-snmp
Requires: uuid Requires: uuid
%description %description
Titanium Cloud platform SNMP Audit Trail provides audit trail support for incoming StarlingX SNMP Audit Trail provides audit trail support for incoming
SNMP requests. SNMP requests.
%package -n snmp-audittrail-devel %package -n snmp-audittrail-devel
Summary: Titanium Cloud Platform SNMP Audit Trail Package - Development files Summary: StarlingX SNMP Audit Trail Package - Development files
Group: devel Group: devel
Requires: snmp-audittrail = %{version}-%{release} Requires: snmp-audittrail = %{version}-%{release}
%description -n snmp-audittrail-devel %description -n snmp-audittrail-devel
Titanium Cloud platform SNMP Audit Trail provides audit trail support for incoming StarlingX SNMP Audit Trail provides audit trail support for incoming SNMP requests.
SNMP requests. This package contains symbolic links, header files, and related This package contains symbolic links, header files, and related items necessary
items necessary for software development. for software development.
%prep %prep
%setup %setup
@ -36,16 +36,14 @@ items necessary for software development.
VER=%{version} VER=%{version}
MAJOR=`echo $VER | awk -F . '{print $1}'` MAJOR=`echo $VER | awk -F . '{print $1}'`
MINOR=`echo $VER | awk -F . '{print $2}'` 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=%{tis_patch_ver} %{?_smp_mflags}
make MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCHVER %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
VER=%{version} VER=%{version}
MAJOR=`echo $VER | awk -F . '{print $1}'` MAJOR=`echo $VER | awk -F . '{print $1}'`
MINOR=`echo $VER | awk -F . '{print $2}'` MINOR=`echo $VER | awk -F . '{print $2}'`
PATCHVER=` echo %{release} | awk -F r '{print $2}' | awk -F . '{print $1}'` make install DESTDIR=$RPM_BUILD_ROOT LIB_DIR=%{_libdir} MAJOR=$MAJOR MINOR=$MINOR PATCH=%{tis_patch_ver}
make DEST_DIR=$RPM_BUILD_ROOT LIB_DIR=%{_libdir} MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCHVER install_non_bb
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)

15
snmp-audittrail/sources/Makefile
View File

@ -5,6 +5,11 @@ LDLIBS = -lfmcommon -lnetsnmp -lnetsnmpagent -luuid
INCLUDES += -I./ INCLUDES += -I./
CCFLAGS = -fPIC -g -O2 -Wall -Werror CCFLAGS = -fPIC -g -O2 -Wall -Werror
LIBCGTSAGENT_SO := libsnmpAuditPlugin.so LIBCGTSAGENT_SO := libsnmpAuditPlugin.so
MAJOR ?= 1
MINOR ?= 0
PATCH ?= 0
DESTDIR ?= /usr/lib64
build: lib build: lib
.c.o: .c.o:
@ -18,8 +23,8 @@ lib: $(OBJS)
clean: clean:
@rm -f $(OBJ) *.o *.so.* @rm -f $(OBJ) *.o *.so.*
install_non_bb: install:
install -m 755 -d $(DEST_DIR)$(LIB_DIR) install -m 755 -d $(DESTDIR)$(LIB_DIR)
install -m 755 $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR) install -m 755 $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DESTDIR)$(LIB_DIR)
ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO).$(MAJOR) ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DESTDIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO).$(MAJOR)
ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO) ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DESTDIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO)