From e571c0f84ffb06f94bd72d112765fc531f106685 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 21 Nov 2015 22:46:28 +0100 Subject: [PATCH] firmware_release: expose community via nodewatcher Signed-off-by: Tim Niemeyer Reviewed-by: Steffen Pankratz --- bsp/default/root_file_system/etc/nodewatcher.sh | 4 ++-- buildscript | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bsp/default/root_file_system/etc/nodewatcher.sh b/bsp/default/root_file_system/etc/nodewatcher.sh index 6083225d..c1f57527 100755 --- a/bsp/default/root_file_system/etc/nodewatcher.sh +++ b/bsp/default/root_file_system/etc/nodewatcher.sh @@ -2,7 +2,7 @@ # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg # License; GPL v3 -SCRIPT_VERSION="34" +SCRIPT_VERSION="35" test -f /tmp/started || exit @@ -96,7 +96,7 @@ crawl() { #OPENWRT_CORE_REVISION="35298" #OPENWRT_FEEDS_PACKAGES_REVISION="35298" . /etc/firmware_release - SYSTEM_DATA="online$hostname$distname$distversion$cpu$model$memory$load$uptime$local_time$batman_adv_version$kernel_version$fastd_version$nodewatcher_version$FIRMWARE_VERSION$BUILD_DATE$OPENWRT_CORE_REVISION$OPENWRT_FEEDS_PACKAGES_REVISION" + SYSTEM_DATA="online$hostname$distname$distversion$cpu$model$memory$load$uptime$local_time$batman_adv_version$kernel_version$fastd_version$nodewatcher_version$FIRMWARE_VERSION$FIRMWARE_COMMUNITY$BUILD_DATE$OPENWRT_CORE_REVISION$OPENWRT_FEEDS_PACKAGES_REVISION" err "`date`: Collecting information from network interfaces" diff --git a/buildscript b/buildscript index 4bdacc83..a026f9ae 100755 --- a/buildscript +++ b/buildscript @@ -179,9 +179,11 @@ prebuild() { #insert actual firware version informations into release file version=$(git describe --tags --dirty) + community=$(basename "$(realpath selected_community)" .cfg) { echo "FIRMWARE_VERSION=\"$version\"" + echo "FIRMWARE_COMMUNITY=\"$community\"" echo "BUILD_DATE=\"build date: $(date)\"" echo "OPENWRT_CORE_REVISION=\"${OPENWRTREV}\"" echo "OPENWRT_FEEDS_PACKAGES_REVISION=\"${PACKAGEREV}\""