build saiserver and saiserver-dbg packages (#888)

Signed-off-by: Guohan Lu <gulv@microsoft.com>
opencomputeproject · Nov 8, 2018 · 13d8b44 · 13d8b44
1 parent 842bc88
commit 13d8b44
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 1 deletion.
diff --git a/debian/control b/debian/control
@@ -5,6 +5,17 @@ Priority: optional
 Build-Depends: dh-exec (>=0.3), debhelper (>= 9)
 Standards-Version: 0.9.4
 
+Package: saiserver
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Pre-Depends}
+Description: This package contains SAI thrift server
+
+Package: saiserver-dbg
+Architecture: any
+Depends: saiserver (= ${binary:Version}), ${misc:Depends}
+Section: debug
+Description: debugging symbols for SAI thrift server
+
 Package: libsaithrift-dev
 Architecture: any
 Depends: ${shlibs:Depends}

diff --git a/debian/rules b/debian/rules
@@ -34,3 +34,5 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf *.egg-info
 
+override_dh_strip:
+	dh_strip -psaiserver --dbg-package=saiserver-dbg
diff --git a/debian/saiserver.install b/debian/saiserver.install
@@ -0,0 +1 @@
+debian/usr/sbin/saiserver usr/sbin
diff --git a/test/Makefile b/test/Makefile
@@ -53,6 +53,7 @@ sai_ut:
 clean :
 	rm -f $(TESTS) $(USER_ODIR)/gtest.a $(USER_ODIR)/gtest_main.a $(USER_ODIR)/*.o
 	make -C sai_ut clean
+	make -C saithrift clean
 
 
 ###########################################################

diff --git a/test/sai_ut/switching/sai_fdb_unit_test.o b/test/sai_ut/switching/sai_fdb_unit_test.o
diff --git a/test/saithrift/Makefile b/test/saithrift/Makefile
@@ -28,7 +28,7 @@ SAIDIR = ./include
 SRC = ./src
 THRIFT = /usr/bin/thrift
 CTYPESGEN = /usr/local/bin/ctypesgen.py
-LIBS = -lthrift -lpthread  -lsai
+LIBS = -lthrift -lpthread -lsai
 SAI_LIBRARY_DIR ?= $(SAI_PREFIX)/lib
 LDFLAGS = -L$(SAI_LIBRARY_DIR) -Wl,-rpath=$(SAI_LIBRARY_DIR)
 CPP_SOURCES = \
@@ -88,6 +88,7 @@ saiserver: $(ODIR)/saiserver.o $(ODIR)/librpcserver.a
 
 install-lib: $(ODIR)/librpcserver.a 
 	$(INSTALL) -D $(ODIR)/librpcserver.a $(DESTDIR)/usr/lib/librpcserver.a
+	$(INSTALL) -D saiserver $(DESTDIR)/usr/sbin/saiserver
 	$(INSTALL) -D $(SRC)/switch_sai_rpc_server.h $(DESTDIR)/usr/include/switch_sai_rpc_server.h
 
 install-pylib: $(PY_SOURCES) $(SAI_PY_HEADERS)