From f36f7bcf26c2fe92772086e99cf88a63377bd7da 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
---
package/gluon-autoupdater/Makefile | 2 +-
.../generate/lib/gluon/release | 0
package/gluon-release/Makefile | 36 -------------------
3 files changed, 1 insertion(+), 37 deletions(-)
rename package/{gluon-release => gluon-core}/generate/lib/gluon/release (100%)
delete mode 100644 package/gluon-release/Makefile
diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile
index d856851f3..7d025176b 100644
--- a/package/gluon-autoupdater/Makefile
+++ b/package/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/package/gluon-release/generate/lib/gluon/release b/package/gluon-core/generate/lib/gluon/release
similarity index 100%
rename from package/gluon-release/generate/lib/gluon/release
rename to package/gluon-core/generate/lib/gluon/release
diff --git a/package/gluon-release/Makefile b/package/gluon-release/Makefile
deleted file mode 100644
index 0eaa181c6..000000000
--- a/package/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))
--
GitLab