From a2cf8beaed5983eb22b9e65e26956d370dc9c821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Wed, 13 Apr 2016 12:41:01 +0200 Subject: [PATCH 1/7] lantiq's build system does not like "tmp" directory name. --- questd/Makefile | 3 --- questd/files/tmp/igmp_snooping | 5 ----- 2 files changed, 8 deletions(-) delete mode 100644 questd/files/tmp/igmp_snooping diff --git a/questd/Makefile b/questd/Makefile index 1dc4e2b22..c7dd22818 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -43,10 +43,7 @@ endef define Package/questd/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/sbin - $(INSTALL_DIR) $(1)/tmp $(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/ endef $(eval $(call BuildPackage,questd)) diff --git a/questd/files/tmp/igmp_snooping b/questd/files/tmp/igmp_snooping deleted file mode 100644 index 795f34e8d..000000000 --- a/questd/files/tmp/igmp_snooping +++ /dev/null @@ -1,5 +0,0 @@ -igmp snooping 2 proxy 1 lan2lan-snooping 0/0, rate-limit 0pps, priority -1 -bridge device src-dev #tags lan-tci wan-tci group mode RxGroup source reporter timeout Index ExcludPt -br-lan eth5 eth2.1 00 0x0000 0xffffffff 0xe0027ffe EX 0xe0027ffe 0x00000000 0xc0a801f1 258 0x401e0001 -1 -br-lan eth5 eth2.1 00 0x0000 0xffffffff 0xefc3ffff EX 0xefc3ffff 0x00000000 0xc0a801f1 258 0x400e0001 -1 -br-lan eth5 eth2.1 00 0x0000 0xffffffff 0xefffffff EX 0xefffffff 0x00000000 0xc0a801f1 258 0x40070001 -1 From 905423d589f57a659d86736d90473239ac5172a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Wed, 13 Apr 2016 13:03:38 +0200 Subject: [PATCH 2/7] Makefile: update questd --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index c7dd22818..dcc44c8bf 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.0.2 -PKG_SOURCE_VERSION:=9022b06ecd73e1515b499a04894205fa95188deb +PKG_SOURCE_VERSION:=95c24cc391e08baa65e8f82493fa804c9e80c550 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From 6fdf16fc8167a72cf01f9203c1612959e648d347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Wed, 13 Apr 2016 14:31:31 +0200 Subject: [PATCH 3/7] Makefile: update --- ice-client/Makefile | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/ice-client/Makefile b/ice-client/Makefile index 9da4a6974..4cfab0622 100644 --- a/ice-client/Makefile +++ b/ice-client/Makefile @@ -1,3 +1,5 @@ +CONFIG_ICE_OPEN:=n + include $(TOPDIR)/rules.mk # We use the foldername as main package name @@ -22,22 +24,29 @@ export PKG_VERSION ###########################--RELEASE--################################ -PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git -PKG_SOURCE_VERSION:=ecad8b60183b43ecf86543c0c29db46cda8aae29 -ifeq ($(CONFIG_ICE_OPEN),y) -BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g) -PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/ -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) +#PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git +#PKG_SOURCE_VERSION:=ecad8b60183b43ecf86543c0c29db46cda8aae29 +#ifeq ($(CONFIG_ICE_OPEN),y) +#BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g) +#PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz +#PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/ +#PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) #PKG_NAME:=ice-client-open -else -PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git +#else +#PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git +#PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION) +#PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz + +#PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION) +#endif + +PKG_SOURCE_VERSION:=ecad8b60183b43ecf86543c0c29db46cda8aae29 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git@private.inteno.se:ice-client + +PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION) -endif - +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION) ###########################--RELEASE--################################ From f59e3fa4bfc735a739d9bdd644d7b8ff5141293b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Wed, 13 Apr 2016 14:37:21 +0200 Subject: [PATCH 4/7] ice-client: missing pthread --- ice-client/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ice-client/Makefile b/ice-client/Makefile index 4cfab0622..34d40a885 100644 --- a/ice-client/Makefile +++ b/ice-client/Makefile @@ -62,7 +62,7 @@ define Package/ice-client $(call Package/ice-client/Default) TITLE:=ice-client MENU:=1 - DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox + DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox +libpthread endef ###########################--DEVELOPMENT--################################ From 667e0b1073eb0cfdb2d2f5bcb14df9e794657d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Tue, 19 Apr 2016 15:16:00 +0200 Subject: [PATCH 5/7] questd: lantiq --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index dcc44c8bf..534ff91f8 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.0.2 -PKG_SOURCE_VERSION:=95c24cc391e08baa65e8f82493fa804c9e80c550 +PKG_SOURCE_VERSION:=f8f700aafa65aac82f9aec6b224c7bafc404dd93 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From c1363317ba762f1ee8bc482aee9eaec0d17a1ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Tue, 19 Apr 2016 15:20:31 +0200 Subject: [PATCH 6/7] questd: lantiq --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 534ff91f8..3be48788b 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -10,7 +10,7 @@ PKG_VERSION:=3.0.2 PKG_SOURCE_VERSION:=f8f700aafa65aac82f9aec6b224c7bafc404dd93 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=http://public.inteno.se:/questd +PKG_SOURCE_URL:=git@private.inteno.se:questd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From 3a7e94e956d4899664bc779cbb32d7c5a148a1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Tue, 19 Apr 2016 15:39:17 +0200 Subject: [PATCH 7/7] correct repo --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 3be48788b..87f0e4110 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -10,7 +10,7 @@ PKG_VERSION:=3.0.2 PKG_SOURCE_VERSION:=f8f700aafa65aac82f9aec6b224c7bafc404dd93 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git@private.inteno.se:questd +PKG_SOURCE_URL:=git@private.inteno.se:fredrik_questd_lantiq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)