From 94e332731fefa7ea8a12f18873a7ef3c685b42ab Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 23 Mar 2017 09:07:18 +0100 Subject: [PATCH] questd: update Makefile --- questd/Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index f285a83dc..4d7dfc2a5 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.38 -PKG_SOURCE_VERSION:=c16d45c61f0708103c25749a9354805b8720f1f6 +PKG_SOURCE_VERSION:=8a89a36d534492f198305fb97da68adefccf5f5d PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd @@ -19,24 +19,31 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y) -QUESTD_CFLAGS:=-DIOPSYS_BROADCOM +QUESTD_TARGET:=-DIOPSYS_BROADCOM KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) -QUESTD_CFLAGS:=-DIOPSYS_BROADCOM +QUESTD_TARGET:=-DIOPSYS_BROADCOM else ifeq ($(CONFIG_TARGET_iopsys_linksys),y) -QUESTD_CFLAGS:=-DIOPSYS_MARVELL +QUESTD_TARGET:=-DIOPSYS_MARVELL else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y) -QUESTD_CFLAGS:=-DIOPSYS_LANTIQ +QUESTD_TARGET:=-DIOPSYS_LANTIQ +else ifeq ($(CONFIG_TARGET_iopsys_ramips_ex400),y) +QUESTD_TARGET:=-DIOPSYS_MEDIATEK +QUESTD_CFLAGS:=\ + -I$(STAGING_DIR)/usr/include \ + -I$(STAGING_DIR)/usr/include/libnl-tiny else $(info (UNEXPECTED CONFIG TARGET)) endif +QUESTD_CFLAGS:=$(QUESTD_CFLAGS) $(QUESTD_TARGET) +export QUESTD_TARGET export KERNEL_DIR export QUESTD_CFLAGS define Package/questd CATEGORY:=Utilities - DEPENDS:=+libuci +libubox +ubus +libpthread +libdbus + DEPENDS:=+libuci +libubox +ubus +libpthread +(TARGET_iopsys_ramips_ex400):swconfig +(TARGET_iopsys_ramips_ex400):libnl-tiny TITLE:=router info daemon endef @@ -53,9 +60,6 @@ define Package/questd/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/graphd $(1)/sbin/ $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/netcheck $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/libexec/rpcd - $(INSTALL_BIN) $(PKG_BUILD_DIR)/router.sh $(1)/usr/libexec/rpcd/router - #$(INSTALL_BIN) $(PKG_BUILD_DIR)/wps.sh $(1)/usr/libexec/rpcd/wps endef $(eval $(call BuildPackage,questd))