[PATCH] firmware_release: expose community via nodewatcher
Steffen Pankratz
kratz00 at gmx.de
So Nov 22 11:57:43 CET 2015
On Sat, 21 Nov 2015 22:46:28 +0100
Tim Niemeyer <tim.niemeyer at mastersword.de> wrote:
Hi Tim
Danke fuer den Patch, dieser ist jetzt im master Branch.
Ich habe noch ein paar "Quotes" spendiert:
community=$(basename "$(realpath selected_community)" .cfg)
Gruss
-Steffen
> Signed-off-by: Tim Niemeyer <tim.niemeyer at mastersword.de>
> ---
>
> 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 6083225..c1f5752 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="<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"
>
> diff --git a/buildscript b/buildscript
> index 4bdacc8..f0125d7 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}\""
> --
> 2.1.4
>
> --
> franken-dev mailing list
> franken-dev at freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
--
Hermes powered by Manjaro Linux (Linux 4.2.5)
Best regards, Steffen Pankratz.
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : nicht verfügbar
Dateityp : application/pgp-signature
Dateigröße : 181 bytes
Beschreibung: OpenPGP digital signature
URL : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20151122/8e45ff5b/attachment-0002.sig>
Mehr Informationen über die Mailingliste franken-dev