summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2014-09-01 14:04:01 +0000
committerJo-Philipp Wich <jow@openwrt.org>2014-09-01 14:04:01 +0000
commitac17ad8d7bea953c24b6538d60f617bdb1ad9ce0 (patch)
tree83efe740f902e64ee69d482b4cc8ddf215df05c7
parent3ccdaa9b48f5da6073ac5f0badd23de2e18f3242 (diff)
luci-0.12: branch for release
-rw-r--r--contrib/package/luci-addons/Makefile2
-rw-r--r--contrib/package/luci/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index 0838ed07ea..f4650ff741 100644
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=1
PKG_BUILD_PARALLEL:=0
-PKG_VERSION:=$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
+PKG_VERSION:=0.12+$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 5ee13d4d4b..2ee83f6d1f 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=1
PKG_BUILD_PARALLEL:=0
-PKG_VERSION:=$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
+PKG_VERSION:=0.12+$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host) iwinfo
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -48,7 +48,7 @@ define Package/luci-base/install
$(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
"OpenWrt Firmware" \
"$(OPENWRTVERSION)" \
- "trunk" \
+ "luci-0.12" \
"$(PKG_VERSION)"
endef