mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

opkg_manager: remove the dependency on opkg-key

Browse Source 
opkg-key does not work at all in standard installs (without gpg)
and is not needed for package management.
Slightly change the definition of opkg commands to not initialize
with find_executable function at startup which seems bogus.
This commit is contained in:
Stefan Seyfried
2015-02-08 00:22:33 +01:00
parent 66adad0811
commit e90c63d0d4
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/opkg_manager.cpp
View File

@@ -11,6 +11,7 @@
Adaptions: Adaptions:
Copyright (C) 2013 martii Copyright (C) 2013 martii
gitorious.org/neutrino-mp/martiis-neutrino-mp gitorious.org/neutrino-mp/martiis-neutrino-mp
Copyright (C) 2015 Stefan Seyfried
License: GPL License: GPL
@@ -51,8 +52,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <alloca.h> #include <alloca.h>
#define OPKG_CL find_executable("opkg-cl") /* later this can be changed to just "opkg" */
#define OPKG_KEY find_executable("opkg-key") #define OPKG_CL "opkg-cl"
enum enum
{ {
@@ -69,14 +70,14 @@ enum
static const std::string pkg_types[OM_MAX] = static const std::string pkg_types[OM_MAX] =
{ {
OPKG_CL + " list", OPKG_CL " list",
OPKG_CL + " list-installed", OPKG_CL " list-installed",
OPKG_CL + " list-upgradable", OPKG_CL " list-upgradable",
OPKG_CL + " update", OPKG_CL " update",
OPKG_CL + " upgrade ", OPKG_CL " upgrade ",
OPKG_CL + " remove ", OPKG_CL " remove ",
OPKG_CL + " info ", OPKG_CL " info ",
OPKG_CL + " install " OPKG_CL " install "
}; };
COPKGManager::COPKGManager() COPKGManager::COPKGManager()
@@ -268,9 +269,13 @@ int COPKGManager::showMenu()
bool COPKGManager::hasOpkgSupport() bool COPKGManager::hasOpkgSupport()
{ {
string deps[] = {OPKG_CL, OPKG_KEY, "/etc/opkg/opkg.conf", "/var/lib/opkg"}; string deps[] = {"/etc/opkg/opkg.conf", "/var/lib/opkg", ""};
for(size_t i=0; i<sizeof(deps)/sizeof(deps[0]) ;i++){ if (find_executable(OPKG_CL).empty()) {
dprintf(DEBUG_INFO, "[neutrino opkg] did not find " OPKG_CL " executable\n");
return false;
}
for (size_t i = 0; !deps[i].empty(); i++) {
dprintf(DEBUG_INFO, "[neutrino opkg] check if %s is available...\n", deps[i].c_str()); dprintf(DEBUG_INFO, "[neutrino opkg] check if %s is available...\n", deps[i].c_str());
if(access(deps[i].c_str(), R_OK) !=0) { if(access(deps[i].c_str(), R_OK) !=0) {
dprintf(DEBUG_INFO, "[neutrino opkg] %s not found\n", deps[i].c_str()); dprintf(DEBUG_INFO, "[neutrino opkg] %s not found\n", deps[i].c_str());