From 538af1e928648113a1214f369644b7196576fb21 Mon Sep 17 00:00:00 2001 From: Nat Meysenburg Date: Tue, 27 Aug 2013 12:10:13 -0400 Subject: [PATCH 1/9] Adding Commotion biboard send as a feed package. --- packages/commotion-bigboard-send/Makefile | 49 +++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 packages/commotion-bigboard-send/Makefile diff --git a/packages/commotion-bigboard-send/Makefile b/packages/commotion-bigboard-send/Makefile new file mode 100644 index 0000000..a42c953 --- /dev/null +++ b/packages/commotion-bigboard-send/Makefile @@ -0,0 +1,49 @@ +include $(TOPDIR)/rules.mk + +MODULE_NAME:=commotion-bigboard-send +MODULE_TITLE:=Commotion-Bigboard + +THEME_NAME:=commotion +THEME_TITLE:=Commotion + +PKG_NAME:=$(MODULE_NAME) +PKG_VERSION:=0.1 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://github.com/opentechinstitute/commotion-bigboard-send.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_VERSION) + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=commotion + CATEGORY:=Commotion + DEPENDS:=+curl + TITLE:=Commotion Bigboard Sender + URL:=https://commotionwireless.net +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/description + Provides a transport mechanism to a remote Commotion Bigboard +endef + +define Package/$(PKG_NAME)/install +$(CP) $(PKG_BUILD_DIR)/bin/commotion-bigboard-send /usr/bin/ +$(CP) $(PKG_BULD_DIR)/conf/commotion-dash /etc/config/ +endef + +define Package/$(PKG_NAME)/postinst +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) From b78195052ad28a6c43603af01140cec01883ae5b Mon Sep 17 00:00:00 2001 From: Nat Meysenburg Date: Tue, 27 Aug 2013 13:19:26 -0400 Subject: [PATCH 2/9] Add cron job to the feed install. --- packages/commotion-bigboard-send/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/commotion-bigboard-send/Makefile b/packages/commotion-bigboard-send/Makefile index a42c953..cdac452 100644 --- a/packages/commotion-bigboard-send/Makefile +++ b/packages/commotion-bigboard-send/Makefile @@ -44,6 +44,9 @@ $(CP) $(PKG_BULD_DIR)/conf/commotion-dash /etc/config/ endef define Package/$(PKG_NAME)/postinst +#!/bin/sh +cronline ='* * * * * /usr/bin/commotion-bigboard-send' +echo "$cronline" >> /etc/crontabs/root endef $(eval $(call BuildPackage,$(PKG_NAME))) From 914a91b9df7c85f2935b1494e52dcfce9cda4613 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Tue, 27 Aug 2013 13:41:46 -0400 Subject: [PATCH 3/9] added luci-commotion-dash package --- packages/luci-commotion-dash/Makefile | 58 +++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 packages/luci-commotion-dash/Makefile diff --git a/packages/luci-commotion-dash/Makefile b/packages/luci-commotion-dash/Makefile new file mode 100644 index 0000000..f8b1b47 --- /dev/null +++ b/packages/luci-commotion-dash/Makefile @@ -0,0 +1,58 @@ +include $(TOPDIR)/rules.mk + +MODULE_NAME:=commotion-dash +MODULE_TITLE:=Commotion Dashboard Config + +PKG_NAME:=luci-$(MODULE_NAME) +PKG_VERSION:=master +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://github.com/opentechinstitute/luci-commotion-dash.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_VERSION) + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + + +include $(INCLUDE_DIR)/package.mk + +define Package/luci-$(MODULE_NAME) + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=2. Modules + TITLE:=LuCI Module - $(MODULE_TITLE) + URL:=https://commotionwireless.net/ + DEPENDS:=+luci-commotion +commotion-bigboard-send +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/luci-$(MODULE_NAME)/description + Commotion dashboard plugin to project webGUI add-on +endef + +define Package/luci-$(MODULE_NAME)/conffile + /etc/config/commotion-dash +endef + +define Package/luci-$(MODULE_NAME)/install + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/$(MODULE_NAME) + $(CP) $(PKG_BUILD_DIR)/luasrc/controller/$(MODULE_NAME)/* $(1)/usr/lib/lua/luci/controller/$(MODULE_NAME)/ 2>/dev/null || true + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/$(MODULE_NAME) + $(CP) $(PKG_BUILD_DIR)/luasrc/view/$(MODULE_NAME)/* $(1)/usr/lib/lua/luci/view/$(MODULE_NAME)/ 2>/dev/null || true +endef + +define Package/luci-$(MODULE_NAME)/postinst +#!/bin/sh +[ -n "$${IPKG_INSTROOT}" ] || { + ( . /etc/uci-defaults/luci-$(MODULE_NAME) ) && rm -f /etc/uci-defaults/luci-$(MODULE_NAME) +} +endef + +$(eval $(call BuildPackage,luci-$(MODULE_NAME))) From dd47f8361af5f7cee04c1737a26506ea91ffaa8c Mon Sep 17 00:00:00 2001 From: Nat Meysenburg Date: Tue, 27 Aug 2013 15:18:36 -0400 Subject: [PATCH 4/9] Changing spaces to tabs. --- packages/commotion-bigboard-send/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/commotion-bigboard-send/Makefile b/packages/commotion-bigboard-send/Makefile index cdac452..a3785b8 100644 --- a/packages/commotion-bigboard-send/Makefile +++ b/packages/commotion-bigboard-send/Makefile @@ -21,11 +21,11 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=commotion - CATEGORY:=Commotion - DEPENDS:=+curl - TITLE:=Commotion Bigboard Sender - URL:=https://commotionwireless.net + SECTION:=commotion + CATEGORY:=Commotion + DEPENDS:=+curl + TITLE:=Commotion Bigboard Sender + URL:=https://commotionwireless.net endef define Build/Configure @@ -35,12 +35,12 @@ define Build/Compile endef define Package/$(PKG_NAME)/description - Provides a transport mechanism to a remote Commotion Bigboard + Provides a transport mechanism to a remote Commotion Bigboard endef define Package/$(PKG_NAME)/install -$(CP) $(PKG_BUILD_DIR)/bin/commotion-bigboard-send /usr/bin/ -$(CP) $(PKG_BULD_DIR)/conf/commotion-dash /etc/config/ + $(CP) $(PKG_BUILD_DIR)/bin/commotion-bigboard-send /usr/bin/ + $(CP) $(PKG_BULD_DIR)/conf/commotion-dash /etc/config/ endef define Package/$(PKG_NAME)/postinst From a3c893c6abe51679e4739ddc9c2fd81abaa71f29 Mon Sep 17 00:00:00 2001 From: Nat Meysenburg Date: Tue, 27 Aug 2013 15:36:54 -0400 Subject: [PATCH 5/9] Change package version. --- packages/commotion-bigboard-send/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/commotion-bigboard-send/Makefile b/packages/commotion-bigboard-send/Makefile index a3785b8..d546e13 100644 --- a/packages/commotion-bigboard-send/Makefile +++ b/packages/commotion-bigboard-send/Makefile @@ -7,7 +7,7 @@ THEME_NAME:=commotion THEME_TITLE:=Commotion PKG_NAME:=$(MODULE_NAME) -PKG_VERSION:=0.1 +PKG_VERSION:=1.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git From 63e03a54aedf68c8f5b6325fdece9c97daf99967 Mon Sep 17 00:00:00 2001 From: Nat Meysenburg Date: Tue, 27 Aug 2013 16:55:28 -0400 Subject: [PATCH 6/9] Update bigboard send Makefile, so that you can actually build images. --- packages/commotion-bigboard-send/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/commotion-bigboard-send/Makefile b/packages/commotion-bigboard-send/Makefile index d546e13..bf430dc 100644 --- a/packages/commotion-bigboard-send/Makefile +++ b/packages/commotion-bigboard-send/Makefile @@ -7,7 +7,7 @@ THEME_NAME:=commotion THEME_TITLE:=Commotion PKG_NAME:=$(MODULE_NAME) -PKG_VERSION:=1.0 +PKG_VERSION:=release-0.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git @@ -39,8 +39,10 @@ define Package/$(PKG_NAME)/description endef define Package/$(PKG_NAME)/install - $(CP) $(PKG_BUILD_DIR)/bin/commotion-bigboard-send /usr/bin/ - $(CP) $(PKG_BULD_DIR)/conf/commotion-dash /etc/config/ + $(INSTALL_DIR) $(1)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/bin/commotion-bigboard-send $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/config/ + $(CP) $(PKG_BUILD_DIR)/config/commotion-dash $(1)/etc/config/ endef define Package/$(PKG_NAME)/postinst From 4899ee09ba3486559f11d44674f9e7d718cd82e6 Mon Sep 17 00:00:00 2001 From: Nat Meysenburg Date: Wed, 28 Aug 2013 13:13:29 -0400 Subject: [PATCH 7/9] More attempts to fix the Makefile for the sender. --- packages/commotion-bigboard-send/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/commotion-bigboard-send/Makefile b/packages/commotion-bigboard-send/Makefile index bf430dc..a7cc071 100644 --- a/packages/commotion-bigboard-send/Makefile +++ b/packages/commotion-bigboard-send/Makefile @@ -43,12 +43,8 @@ define Package/$(PKG_NAME)/install $(CP) $(PKG_BUILD_DIR)/bin/commotion-bigboard-send $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/config/ $(CP) $(PKG_BUILD_DIR)/config/commotion-dash $(1)/etc/config/ -endef - -define Package/$(PKG_NAME)/postinst -#!/bin/sh -cronline ='* * * * * /usr/bin/commotion-bigboard-send' -echo "$cronline" >> /etc/crontabs/root + $(INSTALL_DIR) $(1)/etc/uci-defaults/ + $(CP) $(PKG_BUILD_DIR)/bin/commotion-bigboard-send-install-cron.sh $(1)/etc/uci-defaults/ endef $(eval $(call BuildPackage,$(PKG_NAME))) From 5e3ea5db2fd7503d20f2bed4f1335f91c33f38b0 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Wed, 28 Aug 2013 14:04:54 -0400 Subject: [PATCH 8/9] Fixed luci-commotion-dash install syntax --- packages/luci-commotion-dash/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/luci-commotion-dash/Makefile b/packages/luci-commotion-dash/Makefile index f8b1b47..c7440cb 100644 --- a/packages/luci-commotion-dash/Makefile +++ b/packages/luci-commotion-dash/Makefile @@ -42,10 +42,8 @@ define Package/luci-$(MODULE_NAME)/conffile endef define Package/luci-$(MODULE_NAME)/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/$(MODULE_NAME) - $(CP) $(PKG_BUILD_DIR)/luasrc/controller/$(MODULE_NAME)/* $(1)/usr/lib/lua/luci/controller/$(MODULE_NAME)/ 2>/dev/null || true - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/$(MODULE_NAME) - $(CP) $(PKG_BUILD_DIR)/luasrc/view/$(MODULE_NAME)/* $(1)/usr/lib/lua/luci/view/$(MODULE_NAME)/ 2>/dev/null || true + $(INSTALL_DIR) $(1) + $(CP) -a $(PKG_BUILD_DIR)/* $(1) 2>/dev/null || true endef define Package/luci-$(MODULE_NAME)/postinst From 30afad064f7d3a04e5f5f89ac4155832c7ecff16 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Thu, 29 Aug 2013 17:00:42 -0400 Subject: [PATCH 9/9] Fixed luci-commotion-dash install path --- packages/luci-commotion-dash/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/luci-commotion-dash/Makefile b/packages/luci-commotion-dash/Makefile index c7440cb..77ab7b4 100644 --- a/packages/luci-commotion-dash/Makefile +++ b/packages/luci-commotion-dash/Makefile @@ -42,8 +42,8 @@ define Package/luci-$(MODULE_NAME)/conffile endef define Package/luci-$(MODULE_NAME)/install - $(INSTALL_DIR) $(1) - $(CP) -a $(PKG_BUILD_DIR)/* $(1) 2>/dev/null || true + $(INSTALL_DIR) $(1)/usr/lib/lua/luci + $(CP) $(PKG_BUILD_DIR)/luasrc/* $(1)/usr/lib/lua/luci 2>/dev/null || true endef define Package/luci-$(MODULE_NAME)/postinst