From ac17ad8d7bea953c24b6538d60f617bdb1ad9ce0 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 1 Sep 2014 14:04:01 +0000 Subject: [PATCH] luci-0.12: branch for release --- contrib/package/luci-addons/Makefile | 2 +- contrib/package/luci/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile index 0838ed07e..f4650ff74 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 5ee13d4d4..2ee83f6d1 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 -- 2.25.1