From 56fc4fe7d024d2689dee4f023f8717b983541d34 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 20 Jan 2014 01:59:10 +0100
Subject: [PATCH] Merge gluon-release into gluon-core

---
 gluon/gluon-autoupdater/Makefile              |  2 +-
 .../generate/lib/gluon/release                |  0
 gluon/gluon-release/Makefile                  | 36 -------------------
 3 files changed, 1 insertion(+), 37 deletions(-)
 rename gluon/{gluon-release => gluon-core}/generate/lib/gluon/release (100%)
 delete mode 100644 gluon/gluon-release/Makefile

diff --git a/gluon/gluon-autoupdater/Makefile b/gluon/gluon-autoupdater/Makefile
index d856851..7d02517 100644
--- a/gluon/gluon-autoupdater/Makefile
+++ b/gluon/gluon-autoupdater/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gluon-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
-  DEPENDS:=+ecdsautils +gluon-cron +gluon-release
+  DEPENDS:=+gluon-core +gluon-cron +ecdsautils
   TITLE:=Automatically update firmware
 endef
 
diff --git a/gluon/gluon-release/generate/lib/gluon/release b/gluon/gluon-core/generate/lib/gluon/release
similarity index 100%
rename from gluon/gluon-release/generate/lib/gluon/release
rename to gluon/gluon-core/generate/lib/gluon/release
diff --git a/gluon/gluon-release/Makefile b/gluon/gluon-release/Makefile
deleted file mode 100644
index 0eaa181..0000000
--- a/gluon/gluon-release/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-release
-PKG_VERSION:=1
-PKG_RELEASE:=1.$(GLUON_CONFIG_VERSION)
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gluon-release
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=A file containing the current release
-  DEPENDS:=+gluon-core
-endef
-
-define Package/gluon-release/description
-	This packages creates /lib/gluon/release.
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/gluon-release/install
-	$(GLUON_GENERATE) ./generate/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gluon-release))