From 2501484ac24aed486c39df31902dc4b4e2755ec7 Mon Sep 17 00:00:00 2001
From: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: Wed, 28 Sep 2022 08:59:09 +0100
Subject: [PATCH] bulkdata: 2.0.6

---
 bulkdata/Makefile                   | 10 ++++------
 bulkdata/files/etc/init.d/bulkdatad | 11 +++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/bulkdata/Makefile b/bulkdata/Makefile
index f5f294c41..43acc4abc 100755
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
+PKG_SOURCE_VERSION:=b6e731bcaa7b3b41d5565c4d9c54d3ef9e315084
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,8 +25,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -50,8 +48,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
 	$(CP) ./files/* $(1)/
 endef
 
diff --git a/bulkdata/files/etc/init.d/bulkdatad b/bulkdata/files/etc/init.d/bulkdatad
index 88b1d5588..9a2c6fb1d 100755
--- a/bulkdata/files/etc/init.d/bulkdatad
+++ b/bulkdata/files/etc/init.d/bulkdatad
@@ -7,9 +7,12 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
 start_service() {
-	local enable=$(uci -q get bulkdata.bulkdata.enable)
+	local enable
 
-	[ "$enable" != "1" ] && {
+	config_load bulkdata
+	config_get_bool enable bulkdata enable 1
+
+	[ "$enable" -ne "1" ] && {
 		return 0
 	}
 
@@ -19,10 +22,6 @@ start_service() {
 	procd_close_instance
 }
 
-boot() {
-	start
-}
-
 reload_service() {
 	stop
 	start