forked from freifunk-franken/firmware
firmware_release: expose community via nodewatcher
Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de> Reviewed-by: Steffen Pankratz <kratz00@gmx.de>
This commit is contained in:
parent
459fd45daa
commit
e571c0f84f
|
@ -2,7 +2,7 @@
|
||||||
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
||||||
# License; GPL v3
|
# License; GPL v3
|
||||||
|
|
||||||
SCRIPT_VERSION="34"
|
SCRIPT_VERSION="35"
|
||||||
|
|
||||||
test -f /tmp/started || exit
|
test -f /tmp/started || exit
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ crawl() {
|
||||||
#OPENWRT_CORE_REVISION="35298"
|
#OPENWRT_CORE_REVISION="35298"
|
||||||
#OPENWRT_FEEDS_PACKAGES_REVISION="35298"
|
#OPENWRT_FEEDS_PACKAGES_REVISION="35298"
|
||||||
. /etc/firmware_release
|
. /etc/firmware_release
|
||||||
SYSTEM_DATA="<status>online</status><hostname>$hostname</hostname><distname>$distname</distname><distversion>$distversion</distversion>$cpu$model$memory$load$uptime<local_time>$local_time</local_time><batman_advanced_version>$batman_adv_version</batman_advanced_version><kernel_version>$kernel_version</kernel_version><fastd_version>$fastd_version</fastd_version><nodewatcher_version>$nodewatcher_version</nodewatcher_version><firmware_version>$FIRMWARE_VERSION</firmware_version><firmware_revision>$BUILD_DATE</firmware_revision><openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision><openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
|
SYSTEM_DATA="<status>online</status><hostname>$hostname</hostname><distname>$distname</distname><distversion>$distversion</distversion>$cpu$model$memory$load$uptime<local_time>$local_time</local_time><batman_advanced_version>$batman_adv_version</batman_advanced_version><kernel_version>$kernel_version</kernel_version><fastd_version>$fastd_version</fastd_version><nodewatcher_version>$nodewatcher_version</nodewatcher_version><firmware_version>$FIRMWARE_VERSION</firmware_version><firmware_community>$FIRMWARE_COMMUNITY</firmware_community><firmware_revision>$BUILD_DATE</firmware_revision><openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision><openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
|
||||||
|
|
||||||
err "`date`: Collecting information from network interfaces"
|
err "`date`: Collecting information from network interfaces"
|
||||||
|
|
||||||
|
|
|
@ -179,9 +179,11 @@ prebuild() {
|
||||||
|
|
||||||
#insert actual firware version informations into release file
|
#insert actual firware version informations into release file
|
||||||
version=$(git describe --tags --dirty)
|
version=$(git describe --tags --dirty)
|
||||||
|
community=$(basename "$(realpath selected_community)" .cfg)
|
||||||
|
|
||||||
{
|
{
|
||||||
echo "FIRMWARE_VERSION=\"$version\""
|
echo "FIRMWARE_VERSION=\"$version\""
|
||||||
|
echo "FIRMWARE_COMMUNITY=\"$community\""
|
||||||
echo "BUILD_DATE=\"build date: $(date)\""
|
echo "BUILD_DATE=\"build date: $(date)\""
|
||||||
echo "OPENWRT_CORE_REVISION=\"${OPENWRTREV}\""
|
echo "OPENWRT_CORE_REVISION=\"${OPENWRTREV}\""
|
||||||
echo "OPENWRT_FEEDS_PACKAGES_REVISION=\"${PACKAGEREV}\""
|
echo "OPENWRT_FEEDS_PACKAGES_REVISION=\"${PACKAGEREV}\""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user