projects
/
oweals
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cli: default to /etc/opkg.conf
[oweals/opkg-lede.git]
/
src
/
opkg-cl.c
diff --git
a/src/opkg-cl.c
b/src/opkg-cl.c
index a09275f4adaa94c96d737c9d75385b03138ca807..687bb9e84581cdf859c8a6bd537611f091af0303 100644
(file)
--- a/
src/opkg-cl.c
+++ b/
src/opkg-cl.c
@@
-28,10
+28,11
@@
#include "opkg_cmd.h"
#include "file_util.h"
#include "opkg_message.h"
#include "opkg_cmd.h"
#include "file_util.h"
#include "opkg_message.h"
+#include "opkg_download.h"
#include "../libbb/libbb.h"
enum {
#include "../libbb/libbb.h"
enum {
- ARGS_OPT_FORCE_MAINTAINER = 129,
+ ARGS_OPT_FORCE_MAINTAINER = 129,
ARGS_OPT_FORCE_DEPENDS,
ARGS_OPT_FORCE_OVERWRITE,
ARGS_OPT_FORCE_DOWNGRADE,
ARGS_OPT_FORCE_DEPENDS,
ARGS_OPT_FORCE_OVERWRITE,
ARGS_OPT_FORCE_DOWNGRADE,
@@
-39,6
+40,10
@@
enum {
ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES,
ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES,
ARGS_OPT_FORCE_SPACE,
ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES,
ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES,
ARGS_OPT_FORCE_SPACE,
+ ARGS_OPT_FORCE_POSTINSTALL,
+ ARGS_OPT_FORCE_REMOVE,
+ ARGS_OPT_ADD_ARCH,
+ ARGS_OPT_ADD_DEST,
ARGS_OPT_NOACTION,
ARGS_OPT_DOWNLOAD_ONLY,
ARGS_OPT_NODEPS,
ARGS_OPT_NOACTION,
ARGS_OPT_DOWNLOAD_ONLY,
ARGS_OPT_NODEPS,
@@
-74,11
+79,17
@@
static struct option long_options[] = {
ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
{"force_removal_of_essential_packages", 0, 0,
ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
{"force_removal_of_essential_packages", 0, 0,
ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
+ {"force-postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
+ {"force_postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
+ {"force-remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
+ {"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
{"noaction", 0, 0, ARGS_OPT_NOACTION},
{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
{"nodeps", 0, 0, ARGS_OPT_NODEPS},
{"offline", 1, 0, 'o'},
{"offline-root", 1, 0, 'o'},
{"noaction", 0, 0, ARGS_OPT_NOACTION},
{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
{"nodeps", 0, 0, ARGS_OPT_NODEPS},
{"offline", 1, 0, 'o'},
{"offline-root", 1, 0, 'o'},
+ {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
+ {"add-dest", 1, 0, ARGS_OPT_ADD_DEST},
{"test", 0, 0, ARGS_OPT_NOACTION},
{"tmp-dir", 1, 0, 't'},
{"tmp_dir", 1, 0, 't'},
{"test", 0, 0, ARGS_OPT_NOACTION},
{"tmp-dir", 1, 0, 't'},
{"tmp_dir", 1, 0, 't'},
@@
-93,6
+104,7
@@
args_parse(int argc, char *argv[])
int c;
int option_index = 0;
int parse_err = 0;
int c;
int option_index = 0;
int parse_err = 0;
+ char *tuple, *targ;
while (1) {
c = getopt_long_only(argc, argv, "Ad:f:no:p:t:vV::",
while (1) {
c = getopt_long_only(argc, argv, "Ad:f:no:p:t:vV::",
@@
-155,9
+167,29
@@
args_parse(int argc, char *argv[])
case ARGS_OPT_FORCE_SPACE:
conf->force_space = 1;
break;
case ARGS_OPT_FORCE_SPACE:
conf->force_space = 1;
break;
+ case ARGS_OPT_FORCE_POSTINSTALL:
+ conf->force_postinstall = 1;
+ break;
+ case ARGS_OPT_FORCE_REMOVE:
+ conf->force_remove = 1;
+ break;
case ARGS_OPT_NODEPS:
conf->nodeps = 1;
break;
case ARGS_OPT_NODEPS:
conf->nodeps = 1;
break;
+ case ARGS_OPT_ADD_ARCH:
+ case ARGS_OPT_ADD_DEST:
+ tuple = xstrdup(optarg);
+ if ((targ = strchr(tuple, ':')) != NULL) {
+ *targ++ = 0;
+ if ((strlen(tuple) > 0) && (strlen(targ) > 0)) {
+ nv_pair_list_append(
+ (c == ARGS_OPT_ADD_ARCH)
+ ? &conf->arch_list : &conf->tmp_dest_list,
+ tuple, targ);
+ }
+ }
+ free(tuple);
+ break;
case ARGS_OPT_NOACTION:
conf->noaction = 1;
break;
case ARGS_OPT_NOACTION:
conf->noaction = 1;
break;
@@
-174,7
+206,10
@@
args_parse(int argc, char *argv[])
printf("Confusion: getopt_long returned %d\n", c);
}
}
printf("Confusion: getopt_long returned %d\n", c);
}
}
-
+
+ if(!conf->conf_file && !conf->offline_root)
+ conf->conf_file = xstrdup("/etc/opkg.conf");
+
if (parse_err)
return parse_err;
else
if (parse_err)
return parse_err;
else
@@
-189,7
+224,7
@@
usage()
printf("\nPackage Manipulation:\n");
printf("\tupdate Update list of available packages\n");
printf("\nPackage Manipulation:\n");
printf("\tupdate Update list of available packages\n");
- printf("\tupgrade
Upgrade installed
packages\n");
+ printf("\tupgrade
<pkgs> Upgrade
packages\n");
printf("\tinstall <pkgs> Install package(s)\n");
printf("\tconfigure <pkgs> Configure unpacked package(s)\n");
printf("\tremove <pkgs|regexp> Remove package(s)\n");
printf("\tinstall <pkgs> Install package(s)\n");
printf("\tconfigure <pkgs> Configure unpacked package(s)\n");
printf("\tremove <pkgs|regexp> Remove package(s)\n");
@@
-200,6
+235,7
@@
usage()
printf("\tlist List available packages\n");
printf("\tlist-installed List installed packages\n");
printf("\tlist-upgradable List installed and upgradable packages\n");
printf("\tlist List available packages\n");
printf("\tlist-installed List installed packages\n");
printf("\tlist-upgradable List installed and upgradable packages\n");
+ printf("\tlist-changed-conffiles List user modified configuration files\n");
printf("\tfiles <pkg> List files belonging to <pkg>\n");
printf("\tsearch <file|regexp> List package providing <file>\n");
printf("\tinfo [pkg|regexp] Display all info for <pkg>\n");
printf("\tfiles <pkg> List files belonging to <pkg>\n");
printf("\tsearch <file|regexp> List package providing <file>\n");
printf("\tinfo [pkg|regexp] Display all info for <pkg>\n");
@@
-208,14
+244,17
@@
usage()
printf("\tcompare-versions <v1> <op> <v2>\n");
printf("\t compare versions using <= < > >= = << >>\n");
printf("\tprint-architecture List installable package architectures\n");
printf("\tcompare-versions <v1> <op> <v2>\n");
printf("\t compare versions using <= < > >= = << >>\n");
printf("\tprint-architecture List installable package architectures\n");
+ printf("\tdepends [-A] [pkgname|pat]+\n");
printf("\twhatdepends [-A] [pkgname|pat]+\n");
printf("\twhatdependsrec [-A] [pkgname|pat]+\n");
printf("\twhatdepends [-A] [pkgname|pat]+\n");
printf("\twhatdependsrec [-A] [pkgname|pat]+\n");
+ printf("\twhatrecommends[-A] [pkgname|pat]+\n");
+ printf("\twhatsuggests[-A] [pkgname|pat]+\n");
printf("\twhatprovides [-A] [pkgname|pat]+\n");
printf("\twhatconflicts [-A] [pkgname|pat]+\n");
printf("\twhatreplaces [-A] [pkgname|pat]+\n");
printf("\nOptions:\n");
printf("\twhatprovides [-A] [pkgname|pat]+\n");
printf("\twhatconflicts [-A] [pkgname|pat]+\n");
printf("\twhatreplaces [-A] [pkgname|pat]+\n");
printf("\nOptions:\n");
- printf("\t-A Query all packages not just those installed\n");
+ printf("\t-A Query all packages not just those installed\n");
printf("\t-V[<level>] Set verbosity level to <level>.\n");
printf("\t--verbosity[=<level>] Verbosity levels:\n");
printf("\t 0 errors only\n");
printf("\t-V[<level>] Set verbosity level to <level>.\n");
printf("\t--verbosity[=<level>] Verbosity levels:\n");
printf("\t 0 errors only\n");
@@
-233,6
+272,8
@@
usage()
printf(" directory name in a pinch).\n");
printf("\t-o <dir> Use <dir> as the root directory for\n");
printf("\t--offline-root <dir> offline installation of packages.\n");
printf(" directory name in a pinch).\n");
printf("\t-o <dir> Use <dir> as the root directory for\n");
printf("\t--offline-root <dir> offline installation of packages.\n");
+ printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n");
+ printf("\t--add-dest <name>:<path> Register destination with given path\n");
printf("\nForce Options:\n");
printf("\t--force-depends Install/remove despite failed dependencies\n");
printf("\nForce Options:\n");
printf("\t--force-depends Install/remove despite failed dependencies\n");
@@
-241,6
+282,8
@@
usage()
printf("\t--force-overwrite Overwrite files from other package(s)\n");
printf("\t--force-downgrade Allow opkg to downgrade packages\n");
printf("\t--force-space Disable free space checks\n");
printf("\t--force-overwrite Overwrite files from other package(s)\n");
printf("\t--force-downgrade Allow opkg to downgrade packages\n");
printf("\t--force-space Disable free space checks\n");
+ printf("\t--force-postinstall Run postinstall scripts even in offline mode\n");
+ printf("\t--force-remove Remove package even if prerm script fails\n");
printf("\t--noaction No action -- test only\n");
printf("\t--download-only No action -- download only\n");
printf("\t--nodeps Do not follow dependencies\n");
printf("\t--noaction No action -- test only\n");
printf("\t--download-only No action -- download only\n");
printf("\t--nodeps Do not follow dependencies\n");
@@
-256,7
+299,7
@@
usage()
printf(" regexp could be something like 'pkgname*' '*file*' or similar\n");
printf(" e.g. opkg info 'libstd*' or opkg search '*libop*' or opkg remove 'libncur*'\n");
printf(" regexp could be something like 'pkgname*' '*file*' or similar\n");
printf(" e.g. opkg info 'libstd*' or opkg search '*libop*' or opkg remove 'libncur*'\n");
- /* --force-removal-of-essential-packages Let opkg remove essential packages.
+ /* --force-removal-of-essential-packages Let opkg remove essential packages.
Using this option is almost guaranteed to break your system, hence this option
is not even advertised in the usage statement. */
Using this option is almost guaranteed to break your system, hence this option
is not even advertised in the usage statement. */
@@
-272,6
+315,9
@@
main(int argc, char *argv[])
int nocheckfordirorfile = 0;
int noreadfeedsfile = 0;
int nocheckfordirorfile = 0;
int noreadfeedsfile = 0;
+ if (opkg_conf_init())
+ goto err0;
+
conf->verbosity = NOTICE;
opts = args_parse(argc, argv);
conf->verbosity = NOTICE;
opts = args_parse(argc, argv);
@@
-297,6
+343,8
@@
main(int argc, char *argv[])
!strcmp(cmd_name,"compare-versions") ||
!strcmp(cmd_name,"list_installed") ||
!strcmp(cmd_name,"list-installed") ||
!strcmp(cmd_name,"compare-versions") ||
!strcmp(cmd_name,"list_installed") ||
!strcmp(cmd_name,"list-installed") ||
+ !strcmp(cmd_name,"list_changed_conffiles") ||
+ !strcmp(cmd_name,"list-changed-conffiles") ||
!strcmp(cmd_name,"status") )
noreadfeedsfile = 1;
!strcmp(cmd_name,"status") )
noreadfeedsfile = 1;
@@
-309,7
+357,7
@@
main(int argc, char *argv[])
conf->pfm = cmd->pfm;
conf->pfm = cmd->pfm;
- if (opkg_conf_
init
())
+ if (opkg_conf_
load
())
goto err0;
if (!nocheckfordirorfile) {
goto err0;
if (!nocheckfordirorfile) {
@@
-317,7
+365,7
@@
main(int argc, char *argv[])
if (pkg_hash_load_feeds())
goto err1;
}
if (pkg_hash_load_feeds())
goto err1;
}
-
+
if (pkg_hash_load_status_files())
goto err1;
}
if (pkg_hash_load_status_files())
goto err1;
}