luci-0.9: merge r6016

diff --git a/build/mkversion.sh b/build/mkversion.sh
index 2361e5f3b9ab19086e8f2b3e855aa2fcf5528ccc..ce6eb836678d7c11f265811d03e4657f71e59871 100755 (executable)
--- a/build/mkversion.sh
+++ b/build/mkversion.sh
@@ -11,10 +11,17 @@ else
 fi
 
 cat <<EOF > $1
+local pcall, dofile, _G = pcall, dofile, _G
+
 module "luci.version"
 
-distname    = "${2:-OpenWrt}"
-distversion = "${3:-Development Snapshot}"
+if pcall(dofile, "/etc/openwrt_release") and _G.DISTRIB_DESCRIPTION then
+       distname    = ""
+       distversion = _G.DISTRIB_DESCRIPTION
+else
+       distname    = "${2:-OpenWrt}"
+       distversion = "${3:-Development Snapshot}"
+end
 
 luciname    = "$variant"
 luciversion = "${5:-svn}"