From ec38598048b81fb5a65a17acc1b348c83b5e881f Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Thu, 28 Apr 2022 18:29:37 +0530
Subject: [PATCH] Removed libbbf_api.so and disabled libbbf_ubus

---
 .gitlab-ci.yml         | 17 -----------------
 Makefile.am            |  2 +-
 bin/Makefile.am        | 33 +--------------------------------
 configure.ac           |  2 +-
 gitlab-ci/shared.sh    |  6 +++---
 test/bbf_test/Makefile |  2 +-
 test/cmocka/Makefile   |  5 ++---
 7 files changed, 9 insertions(+), 58 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5a60b78..3ba56965 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,23 +56,6 @@ run_functional_api_test:
           - timestamp.log
           - functional-api-test-coverage.xml
 
-run_libbbf_ubus_test:
-  stage: functional_test
-  image: iopsys/code-analysis:latest
-  allow_failure: false
-  script:
-  - "./gitlab-ci/setup.sh"
-  - "./gitlab-ci/libbbf_ubus_api_test.sh"
-
-  artifacts:
-      when: always
-      reports:
-          junit: ./report/tap.xml
-      paths:
-          - timestamp.log
-          - memory-report.xml
-          - api-result.log
-
 run_tools_test:
   stage: unit_test
   image: iopsys/code-analysis:latest
diff --git a/Makefile.am b/Makefile.am
index 950975af..c19670ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,4 +9,4 @@ libbbfdm_include_HEADERS = *.h
 libbbf_api_include_HEADERS = libbbf_api/*.h
 libbbf_ubus_include_HEADERS = include/*.h
 
-SUBDIRS = bin libbbf_ubus
+SUBDIRS = bin
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 3c124fe4..e6cce1b9 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,35 +1,4 @@
-lib_LTLIBRARIES = libbbf_api.la
-
-libbbf_api_la_SOURCES =				\
-	../libbbf_api/dmbbf.c			\
-	../libbbf_api/dmubus.c			\
-	../libbbf_api/dmjson.c			\
-	../libbbf_api/dmuci.c			\
-	../libbbf_api/dmcommon.c 		\
-	../libbbf_api/dmmem.c			\
-	../libbbf_api/dmapi.c
-
-libbbf_api_la_CFLAGS =		\
-	$(AM_CFLAGS)			\
-	$(LIBUCI_CFLAGS)		\
-	$(LIBUBOX_CFLAGS)		\
-	$(LIBUBUS_CFLAGS)
-
-libbbf_api_la_LDFLAGS = 	\
-	$(AM_LDFLAGS)			\
-	$(LIBUCI_LDFLAGS)		\
-	$(LIBUBOX_LDFLAGS)		\
-	$(LIBUBUS_LDFLAGS)
-
-libbbf_api_la_LIBADD =		\
-	$(AM_LIBS)				\
-	$(LIBUCI_LIBS)			\
-	$(LIBUBOX_LIBS)			\
-	$(LIBUBUS_LIBS)			\
-	$(LIBJSON_LIBS)			\
-	$(LBLOBMSG_LIBS)
-
-lib_LTLIBRARIES += libbbfdm.la
+lib_LTLIBRARIES = libbbfdm.la
 
 libbbfdm_la_SOURCES =	\
 	../dmentry.c 		\
diff --git a/configure.ac b/configure.ac
index 8541e6a3..b2698b98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 
-AC_CONFIG_SUBDIRS([libbbf_ubus])
+#AC_CONFIG_SUBDIRS([libbbf_ubus])
 
 AC_ARG_ENABLE(tr181, [AS_HELP_STRING([--enable-tr181], [enable tr181 device feature])], AC_DEFINE(BBF_TR181),)
 AM_CONDITIONAL([BBF_TR181],[test "x$enable_tr181" = "xyes"])
diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh
index 59d272b9..a63dbc1b 100755
--- a/gitlab-ci/shared.sh
+++ b/gitlab-ci/shared.sh
@@ -105,9 +105,9 @@ function install_libbbf_test()
 	ldconfig
 	
 	# compile and install libbbf_ubus_test
-	echo "Compiling libbbf_ubus_test"
-	make clean -C test/dynamicdm_ubus_test/
-	make -C test/dynamicdm_ubus_test/
+	#echo "Compiling libbbf_ubus_test"
+	#make clean -C test/dynamicdm_ubus_test/
+	#make -C test/dynamicdm_ubus_test/
 }
 
 function install_libbulkdata()
diff --git a/test/bbf_test/Makefile b/test/bbf_test/Makefile
index 4c9b6b87..f754402c 100644
--- a/test/bbf_test/Makefile
+++ b/test/bbf_test/Makefile
@@ -4,7 +4,7 @@ BIN = bbf_dm
 BIN_OBJ = bbf_dm.o
 LIB_OBJS = libbbf_test.o
 LIB_CFLAGS = $(CFLAGS) -Wall -Werror -fPIC -I /usr/local/include/
-LIB_LDFLAGS = $(LDFLAGS) -lbbf_api -lubus
+LIB_LDFLAGS = $(LDFLAGS) -lubus
 BIN_LDFLAGS = $(LDFLAGS) -lbbfdm -lubus
 
 %.o: %.c
diff --git a/test/cmocka/Makefile b/test/cmocka/Makefile
index fe9d29ba..5e1e6c3f 100644
--- a/test/cmocka/Makefile
+++ b/test/cmocka/Makefile
@@ -1,7 +1,6 @@
 CC = gcc
 CFLAGS = -g -Wall -Werror
-LDFLAGS = -lcmocka -lbbfdm -lbbf_api -lubus
-LDFLAGS_API_TEST = -lcmocka -lbbf_api -lubus
+LDFLAGS = -lcmocka -lbbfdm -lubus
 UNIT_TESTS = unit_test_bbfd
 FUNCTIONAL_TESTS = functional_test_bbfd
 FUNCTIONAL_API_TESTS = functional_api_test_bbfd
@@ -17,7 +16,7 @@ functional_test_bbfd: functional_test_bbfd.o
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 functional_api_test_bbfd: functional_api_test_bbfd.o
-	$(CC) -o $@ $^ $(LDFLAGS_API_TEST)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
 unit-test: $(UNIT_TESTS)
 	$(foreach testprog, $(UNIT_TESTS), sudo $(VALGRIND) ./$(testprog);)