diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp index 17bec16f7..eba072514 100644 --- a/src/gui/opkg_manager.cpp +++ b/src/gui/opkg_manager.cpp @@ -5,8 +5,7 @@ OPKG-Manager Class for Neutrino-GUI Implementation: - Copyright (C) 2012-2020 T. Graf 'dbt' - www.dbox2-tuning.net + Copyright (C) 2012-2021 T. Graf 'dbt' Adaptions: Copyright (C) 2013 martii @@ -67,8 +66,6 @@ #define OPKG "opkg-cl" #endif -#define OPKG_TMP_DIR "/tmp/.opkg" -#define OPKG_TEST_DIR OPKG_TMP_DIR "/test" #if 0 #define OPKG_CONFIG_OPTIONS " -V2 --tmp-dir=/tmp --cache=" OPKG_TMP_DIR #else @@ -77,11 +74,6 @@ #define OPKG_BAD_PATTERN_LIST_FILE CONFIGDIR "/bad_package_pattern.list" #define OPKG_GOOD_PATTERN_LIST_FILE CONFIGDIR "/good_package_pattern.list" -#if 0 -#define OPKG_CONFIG_FILE "/etc/opkg/opkg.conf" -#else -#define OPKG_CONFIG_FILE "/etc/opkg/opkg.conf.borken" -#endif /* script to call instead of "opkg upgrade" * opkg fails to gracefully self-upgrade, and additionally has some ordering issues @@ -139,12 +131,6 @@ void COPKGManager::init(int wizard_mode) OPKG_ERRORS(); width = 80; - //define default dest keys - string dest_defaults[] = {"/", OPKG_TEST_DIR, OPKG_TMP_DIR, "/mnt"}; - for(size_t i=0; ihide(); int ret = showMenu(); - saveConfig(); - CFileHelpers::removeDir(OPKG_TMP_DIR); return ret; } @@ -1206,68 +1189,3 @@ bool COPKGManager::isUpgradable(const string& pkg_name) return true; return false; } - - -void COPKGManager::showMenuConfigFeed(CMenuWidget *feed_menu) -{ - feed_menu->addIntroItems(LOCALE_OPKG_FEED_ADDRESSES); - - for(size_t i=0; iaddItem( fw); - } -} - -void COPKGManager::loadConfig() -{ - opkg_conf.clear(); - bool load_defaults = false; - - if (!opkg_conf.loadConfig(OPKG_CONFIG_FILE, '\t')){ - dprintf(DEBUG_NORMAL, "[COPKGManager] [%s - %d] Error: error while loading opkg config file! -> %s. Using default settings!\n", __func__, __LINE__, OPKG_CONFIG_FILE); - load_defaults = true; - } - - //package feeds - for(size_t i=0; i %s\n", __func__, __LINE__, OPKG_CONFIG_FILE); - if (!silent) - DisplayErrorMessage("Error while saving opkg config file!"); - } -} diff --git a/src/gui/opkg_manager.h b/src/gui/opkg_manager.h index 7a47c1264..d1aabc31c 100644 --- a/src/gui/opkg_manager.h +++ b/src/gui/opkg_manager.h @@ -6,7 +6,6 @@ Implementation: Copyright (C) 2012-2021 T. Graf 'dbt' - www.dbox2-tuning.net Adaptions: Copyright (C) 2013 martii @@ -62,13 +61,8 @@ class COPKGManager : public CMenuTarget int is_wizard; std::string tmp_str; CConfigFile opkg_conf; - void saveConfig(); - void loadConfig(); void init(int wizard_mode); bool silent; // Controls some screen messages, eg, avoids unintended or disturbing messages on update checks at background. - //config - std::string config_src[OPKG_MAX_FEEDS]; - std::vector config_dest; //filter std::vector v_bad_pattern, v_good_pattern; @@ -140,7 +134,6 @@ class COPKGManager : public CMenuTarget std::string getKeyInfo(const std::string& input, const std::string& pkg_info_key, const std::string& delimiters); int showMenu(); - void showMenuConfigFeed(CMenuWidget *feed_menu); void updateMenu(); void refreshMenu();