From 58f6480a340bb48399a7ae2df9fbaf832a93c12d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 1 Sep 2013 20:11:30 +0200 Subject: [PATCH] neutrino: fix up non-extupdate build this complements commit 5b72a7fe3c after recent changes --- src/gui/update.cpp | 2 ++ src/gui/update_settings.cpp | 6 ++++++ src/neutrino.cpp | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index fb8dab40b..b6cfd59b3 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -591,9 +591,11 @@ void CFlashExpert::readmtd(int preadmtd) std::string hostName = netGetHostname(); std::string timeStr = getNowTimeStr("_%Y%m%d_%H%M"); +#if ENABLE_EXTUPDATE if (g_settings.softupdate_name_mode_backup == CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME) filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd) + timeStr + "_" + hostName + ".img"; else +#endif filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd) + timeStr + ".img"; if (preadmtd == -1) { diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp index c2ae697f1..c7a5a4c55 100644 --- a/src/gui/update_settings.cpp +++ b/src/gui/update_settings.cpp @@ -68,6 +68,7 @@ const CMenuOptionChooser::keyval FLASHUPDATE_UPDATEMODE_OPTIONS[FLASHUPDATE_UPDA { 1, LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET } }; +#if ENABLE_EXTUPDATE #define SOFTUPDATE_NAME_MODE1_OPTION_COUNT 3 const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE1_OPTIONS[SOFTUPDATE_NAME_MODE1_OPTION_COUNT] = { @@ -82,6 +83,7 @@ const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE2_OPTIONS[SOFTUPDATE_NAME_M { CExtUpdate::SOFTUPDATE_NAME_DEFAULT, LOCALE_FLASHUPDATE_NAMEMODE2_DEFAULT }, { CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME, LOCALE_FLASHUPDATE_NAMEMODE2_HOSTNAME_TIME } }; +#endif int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey) { @@ -129,6 +131,7 @@ int CUpdateSettings::initMenu() // fw_url->setHint("", LOCALE_MENU_HINT_XXX); CMenuForwarder * fw_update_dir = new CMenuForwarder(LOCALE_EXTRA_UPDATE_DIR, true, g_settings.update_dir , this, "update_dir", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); // fw_update_dir->setHint("", LOCALE_MENU_HINT_XXX); +#if ENABLE_EXTUPDATE CMenuOptionChooser *name_backup = new CMenuOptionChooser(LOCALE_FLASHUPDATE_NAMEMODE2, &g_settings.softupdate_name_mode_backup, SOFTUPDATE_NAME_MODE2_OPTIONS, SOFTUPDATE_NAME_MODE2_OPTION_COUNT, true); // name_backup->setHint("", LOCALE_MENU_HINT_XXX); @@ -140,6 +143,7 @@ int CUpdateSettings::initMenu() // name_apply->setHint("", LOCALE_MENU_HINT_XXX); OnOffNotifier->addItem(name_apply); #endif +#endif #if 0 CMenuOptionChooser *apply_kernel = new CMenuOptionChooser(LOCALE_FLASHUPDATE_MENU_APPLY_KERNEL, &g_settings.apply_kernel, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.apply_settings); @@ -149,12 +153,14 @@ int CUpdateSettings::initMenu() w_upsettings.addItem(fw_update_dir); w_upsettings.addItem(fw_url); +#if ENABLE_EXTUPDATE w_upsettings.addItem(name_backup); #ifndef BOXMODEL_APOLLO w_upsettings.addItem(GenericMenuSeparatorLine); w_upsettings.addItem(apply_settings); w_upsettings.addItem(name_apply); #endif +#endif #if 0 w_upsettings.addItem(apply_kernel); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7980f54bb..f9595a420 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -707,8 +707,13 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.softupdate_mode = configfile.getInt32( "softupdate_mode", 1 ); g_settings.apply_kernel = configfile.getBool("apply_kernel" , false); g_settings.apply_settings = configfile.getBool("apply_settings" , false); +#if ENABLE_EXTUPDATE g_settings.softupdate_name_mode_apply = configfile.getInt32( "softupdate_name_mode_apply", CExtUpdate::SOFTUPDATE_NAME_DEFAULT); g_settings.softupdate_name_mode_backup = configfile.getInt32( "softupdate_name_mode_backup", CExtUpdate::SOFTUPDATE_NAME_DEFAULT); +#else + g_settings.softupdate_name_mode_apply = 0; + g_settings.softupdate_name_mode_backup = 0; /* unused, but still initialize it */ +#endif strcpy(g_settings.softupdate_url_file, configfile.getString("softupdate_url_file", "/var/etc/update.urls").c_str()); strcpy(g_settings.softupdate_proxyserver, configfile.getString("softupdate_proxyserver", "" ).c_str());