From c90348dd1e8bda3c39414e9de06cbfc27f36409c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 27 Dec 2017 22:45:51 +0100 Subject: [PATCH] update: move image RELEASE_CYCLE define to configure.ac It should be more sensefull to set release cycle inside environment than hard coding inside neutrino code. Neutrino package version is not the same like image release cycle, therefore here it is separated from package info. --- configure.ac | 2 ++ src/gui/imageinfo.cpp | 2 +- src/gui/update.cpp | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f43bc563e..0b902a0eb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,8 @@ AC_INIT(Tuxbox-Neutrino,3.7.1) AM_INIT_AUTOMAKE([1.0.1 nostdinc]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) +AC_DEFINE(RELEASE_CYCLE, "2.4", [Release cycle information; used in update code]) + TUXBOX_APPS TUXBOX_APPS_DIRECTORY TUXBOX_APPS_PKGCONFIG diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 9e2f31084..1e0dccf2f 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -297,7 +297,7 @@ void CImageInfo::InitInfoData() version_string += versionInfo.getDate(); version_string += ")"; }else - printf("[CImageInfo]\t[%s - %d], WARNING! %s contains possible wrong version format, content = [%s]\n", __func__, __LINE__, VERSION_FILE, version_string.c_str()); + printf("[CImageInfo]\t[%s - %d], WARNING! %s contains possible wrong version format, content = [%s], internal release cycle [%s]\n", __func__, __LINE__, VERSION_FILE, version_string.c_str(), RELEASE_CYCLE); #endif struct utsname uts_info; diff --git a/src/gui/update.cpp b/src/gui/update.cpp index e15572cee..78dbe40bd 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -88,7 +88,6 @@ extern int allow_flash; #define LIST_OF_UPDATES_LOCAL_FILENAME "coolstream.list" #define UPDATE_LOCAL_FILENAME "update.img" -#define RELEASE_CYCLE "2.0" #define FILEBROWSER_UPDATE_FILTER "img" #define MTD_OF_WHOLE_IMAGE 0