qosmngr: add integration for the actual code that is built

easy-soc-libs/Makefile

@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bd7e58eda7382d2b58908fa140f18c7066ae6a82
+PKG_SOURCE_VERSION:=57bb02b7fa529dc79d781d87003344ccd143e896
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -57,6 +57,13 @@ define Package/libethernet
   DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
 endef
 
+define Package/libqos
+  $(call Package/easy-soc-libs)
+  TITLE:= QoS library (libqos)
+  DEPENDS+=+libeasy
+  DEPENDS+=+TARGET_iopsys_brcm63xx_arm:bcmkernel
+endef
+
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
   TARGET_PLATFORM=BROADCOM
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
@@ -73,7 +80,14 @@ else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_eagle),y)
     TARGET_CFLAGS +=-DCONFIG_BCM963178
   else
-    TARGET_CFLAGS +=-DCONFIG_BCM963138
+    BCM_SDK_KERNEL=bcmkernel-4.1-502070
+    RDPA_INCLUDE=bcm963xx/rdp/drivers/rdpa_gpl/include
+    BDMF_INCLUDE=bcm963xx/rdp/drivers/bdmf/framework
+    TARGET_CFLAGS +=-DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
+	-I$(BUILD_DIR)/$(BCM_SDK_KERNEL)/$(RDPA_INCLUDE) \
+	-I$(BUILD_DIR)/$(BCM_SDK_KERNEL)/$(BDMF_INCLUDE)
   endif
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
@@ -95,6 +109,7 @@ else
 endif
 
 export TARGET_PLATFORM
+export TARGET_CFLAGS
 
 ifdef CONFIG_IOP_LLA_LIBS_DEBUG
   TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
@@ -110,7 +125,8 @@ subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
+	$(if $(CONFIG_PACKAGE_libqos),libqos)
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
@@ -162,6 +178,13 @@ define Build/InstallDev/libethernet
 	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
 endef
 
+define Build/InstallDev/libqos
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libqos/qos.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so $(1)/usr/lib/
+endef
+
 define Build/Compile
 	$(call Build/Compile/Default)
 ifeq ($(CONFIG_LIBDSL_TEST),y)
@@ -188,6 +211,11 @@ define Package/libethernet/install
 	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
 endef
 
+define Package/libqos/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so* $(1)/usr/lib/
+endef
+
 define Package/libdsl/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/bin
@@ -205,3 +233,4 @@ $(eval $(call BuildPackage,libeasy))
 $(eval $(call BuildPackage,libwifi))
 $(eval $(call BuildPackage,libdsl))
 $(eval $(call BuildPackage,libethernet))
+$(eval $(call BuildPackage,libqos))

qosmngr/Makefile

@@ -8,6 +8,14 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=qosmngr
 PKG_VERSION:=1.0.0
 
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=1853ea3ebc915c433dd0d0d217271669918944ea
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+endif
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
@@ -19,21 +27,22 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm)
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm) +libubox +ubus +libeasy +libqos +libuci
 endef
 
 define Package/qosmngr/description
 	Configures L2 QoS and collects queue statistics
 endef
 
-#define Build/Prepare
-#        $(CP) -rf ./qosmngr/* $(PKG_BUILD_DIR)/
-#endef
-
-define Build/Compile
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ~/git/qosmngr/* $(PKG_BUILD_DIR)/
 endef
+endif
 
 define Package/qosmngr/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin
 	$(CP) ./files/* $(1)/
 endef