mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

imageinfo: more align to OE image data

Browse Source
This commit is contained in:
Thilo Graf
2019-12-30 13:31:14 +01:00
parent 18380df200
commit 6f1463aacd
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/imageinfo.cpp
View File

@@ -53,8 +53,9 @@
#include <ctype.h> #include <ctype.h>
#define VERSION_FILE "/.version" #define VERSION_FILE "/.version"
#define RELEASE_FILE "/etc/os-release"
#define OS_RELEASE_FILE "/etc/os-release"
#define OE_IMAGE_VERSION_FILE "/etc/image-version"
using namespace std; using namespace std;
@@ -288,13 +289,20 @@ void CImageInfo::InitInfoData()
v_info.clear(); v_info.clear();
image_info_t pretty_name = {g_Locale->getText(LOCALE_IMAGEINFO_OS),""}; image_info_t pretty_name = {g_Locale->getText(LOCALE_IMAGEINFO_OS),""};
if (file_exists(RELEASE_FILE)){ if (file_exists(OS_RELEASE_FILE)){
config.loadConfig(RELEASE_FILE); config.loadConfig(OS_RELEASE_FILE);
string tmpstr = config.getString("PRETTY_NAME", ""); string tmpstr = config.getString("PRETTY_NAME", "");
pretty_name.info_text = str_replace("\"", "", tmpstr); pretty_name.info_text = str_replace("\"", "", tmpstr);
config.clear(); config.clear();
} }
string oe_image_version = "";
if (file_exists(OE_IMAGE_VERSION_FILE)){
config.loadConfig(OE_IMAGE_VERSION_FILE);
oe_image_version = config.getString("imageversion", "");
config.clear();
}
config.loadConfig(VERSION_FILE); config.loadConfig(VERSION_FILE);
#ifdef BUILT_DATE #ifdef BUILT_DATE
@@ -317,12 +325,15 @@ void CImageInfo::InitInfoData()
} }
if (is_version_code && version_string.size() == 16){ if (is_version_code && version_string.size() == 16){
static CFlashVersionInfo versionInfo(version_string.c_str()); static CFlashVersionInfo versionInfo(version_string.c_str());
if (oe_image_version.empty()){
version_string = versionInfo.getReleaseCycle(); version_string = versionInfo.getReleaseCycle();
version_string += " "; version_string += " ";
version_string += versionInfo.getType(); version_string += versionInfo.getType();
version_string += " ("; version_string += " (";
version_string += versionInfo.getDate(); version_string += versionInfo.getDate();
version_string += ")"; version_string += ")";
}else
version_string = oe_image_version;
}else }else
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); 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 #endif