From 17b9514e388a9911417bb5d02e5af5ca070246b0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 13 May 2014 20:09:28 +0200
Subject: [PATCH] Add gluon-config package containing the site config

---
 package/gluon-config/Makefile | 36 +++++++++++++++++++++++++++++++++++
 package/gluon-core/Makefile   |  7 +++----
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 package/gluon-config/Makefile

diff --git a/package/gluon-config/Makefile b/package/gluon-config/Makefile
new file mode 100644
index 00000000..ccaf57c3
--- /dev/null
+++ b/package/gluon-config/Makefile
@@ -0,0 +1,36 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-config
+PKG_VERSION:=$(GLUON_SITE_CODE)
+PKG_RELEASE:=$(shell $(MD5SUM) $(GLUON_SITEDIR)/site.conf)
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/gluon-config
+  SECTION:=gluon
+  CATEGORY:=Gluon
+  TITLE:=Site-specific config files of Gluon
+endef
+
+define Package/gluon-config/description
+	Gluon community wifi mesh firmware framework: site configuration
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/gluon-config/install
+	$(INSTALL_DIR) $(1)/lib/gluon
+	$(CP) $(GLUON_SITEDIR)/site.conf $(1)/lib/gluon/site.conf
+endef
+
+$(eval $(call BuildPackage,gluon-config))
diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 7bee0846..3dd28766 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-core
-PKG_VERSION:=1
-PKG_RELEASE:=$(GLUON_VERSION).$(GLUON_SITE_CODE)-$(GLUON_RELEASE).$(GLUON_CONFIG_VERSION)
+PKG_VERSION:=2
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
@@ -12,7 +12,7 @@ define Package/gluon-core
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Base files of Gluon
-  DEPENDS:=+odhcp6c
+  DEPENDS:=+gluon-config +odhcp6c
 endef
 
 define Package/gluon-core/description
@@ -35,7 +35,6 @@ define Package/gluon-core/install
 
 	$(INSTALL_DIR) $(1)/lib/gluon
 	echo "$(GLUON_VERSION)" > $(1)/lib/gluon/gluon-version
-	echo "$(GLUON_RELEASE)" > $(1)/lib/gluon/release
 endef
 
 $(eval $(call BuildPackage,gluon-core))