projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: get version from /etc/openwrt_release if applicable
[project/luci.git]
/
build
/
mkversion.sh
diff --git
a/build/mkversion.sh
b/build/mkversion.sh
index
2361e5f
..
ce6eb83
100755
(executable)
--- a/
build/mkversion.sh
+++ b/
build/mkversion.sh
@@
-11,10
+11,17
@@
else
fi
cat <<EOF > $1
fi
cat <<EOF > $1
+local pcall, dofile, _G = pcall, dofile, _G
+
module "luci.version"
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}"
luciname = "$variant"
luciversion = "${5:-svn}"