aboutsummaryrefslogtreecommitdiffstats
path: root/package/opkg/patches/010-remove-flag.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-12-20 21:21:14 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-12-20 21:21:14 +0000
commit608de324793e5e5705528f8dd14c1f2951704d8f (patch)
tree0b0719cc32d882e0fe919bfcf0dbd1c36b6dfd4b /package/opkg/patches/010-remove-flag.patch
parent9e86a8064a0787c4939c5e126c0dbd57654df469 (diff)
downloadupstream-608de324793e5e5705528f8dd14c1f2951704d8f.tar.gz
upstream-608de324793e5e5705528f8dd14c1f2951704d8f.tar.bz2
upstream-608de324793e5e5705528f8dd14c1f2951704d8f.zip
opkg: update to r503 - reduces peak memory usage by further 20%, rebased patches, restored old config file default
SVN-Revision: 18864
Diffstat (limited to 'package/opkg/patches/010-remove-flag.patch')
-rw-r--r--package/opkg/patches/010-remove-flag.patch66
1 files changed, 24 insertions, 42 deletions
diff --git a/package/opkg/patches/010-remove-flag.patch b/package/opkg/patches/010-remove-flag.patch
index 9b988b89e0..a85e06e6a7 100644
--- a/package/opkg/patches/010-remove-flag.patch
+++ b/package/opkg/patches/010-remove-flag.patch
@@ -1,78 +1,60 @@
---- a/libopkg/args.c
-+++ b/libopkg/args.c
-@@ -264,8 +264,6 @@
- printf("\tinstall <file.opk> Install package <file.opk>\n");
- printf("\tconfigure [<pkg>] Configure unpacked packages\n");
- printf("\tremove <pkg|regexp> Remove package <pkg|packages following regexp>\n");
-- printf("\tflag <flag> <pkg> ... Flag package(s) <pkg>\n");
-- printf("\t <flag>=hold|noprune|user|ok|installed|unpacked (one per invocation) \n");
-
- printf("\nInformational Commands:\n");
- printf("\tlist List available packages and descriptions\n");
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
-@@ -54,7 +54,6 @@
- static int opkg_list_upgradable_cmd(opkg_conf_t *conf, int argc, char **argv);
- static int opkg_remove_cmd(opkg_conf_t *conf, int argc, char **argv);
- static int opkg_purge_cmd(opkg_conf_t *conf, int argc, char **argv);
--static int opkg_flag_cmd(opkg_conf_t *conf, int argc, char **argv);
- static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv);
- static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv);
- static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv);
-@@ -80,7 +79,6 @@
- {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd},
- {"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd},
- {"info", 0, (opkg_cmd_fun_t)opkg_info_cmd},
-- {"flag", 1, (opkg_cmd_fun_t)opkg_flag_cmd},
- {"status", 0, (opkg_cmd_fun_t)opkg_status_cmd},
- {"install_pending", 0, (opkg_cmd_fun_t)opkg_install_pending_cmd},
- {"install", 1, (opkg_cmd_fun_t)opkg_install_cmd},
-@@ -960,48 +958,6 @@
- return 0;
+@@ -735,49 +735,6 @@
}
--static int opkg_flag_cmd(opkg_conf_t *conf, int argc, char **argv)
+ static int
+-opkg_flag_cmd(int argc, char **argv)
-{
- int i;
- pkg_t *pkg;
- const char *flags = argv[0];
-
-- global_conf = conf;
- signal(SIGINT, sigint_handler);
-
- for (i=1; i < argc; i++) {
- if (conf->restrict_to_default_dest) {
-- pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-- argv[i],
+- pkg = pkg_hash_fetch_installed_by_name_dest(argv[i],
- conf->default_dest);
- } else {
-- pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, argv[i]);
+- pkg = pkg_hash_fetch_installed_by_name(argv[i]);
- }
-
- if (pkg == NULL) {
-- opkg_message(conf, OPKG_ERROR,
-- "Package %s is not installed.\n", argv[i]);
+- opkg_msg(ERROR, "Package %s is not installed.\n", argv[i]);
- continue;
- }
- if (( strcmp(flags,"hold")==0)||( strcmp(flags,"noprune")==0)||
- ( strcmp(flags,"user")==0)||( strcmp(flags,"ok")==0)) {
- pkg->state_flag = pkg_state_flag_from_str(flags);
- }
--/* pb_ asked this feature 03292004 */
--/* Actually I will use only this two, but this is an open for various status */
+-
+- /*
+- * Useful if a package is installed in an offline_root, and
+- * should be configured by opkg-cl configure at a later date.
+- */
- if (( strcmp(flags,"installed")==0)||( strcmp(flags,"unpacked")==0)){
- pkg->state_status = pkg_state_status_from_str(flags);
- }
+-
- opkg_state_changed++;
-- opkg_message(conf, OPKG_NOTICE,
-- "Setting flags for package %s to %s\n",
+- opkg_msg(NOTICE, "Setting flags for package %s to %s.\n",
- pkg->name, flags);
- }
-
-- write_status_files_if_changed(conf);
+- write_status_files_if_changed();
- return 0;
-}
-
- static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv)
+-static int
+ opkg_files_cmd(int argc, char **argv)
{
pkg_t *pkg;
+@@ -1159,7 +1116,6 @@
+ {"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE},
+ {"list-upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE},
+ {"info", 0, (opkg_cmd_fun_t)opkg_info_cmd, 0},
+- {"flag", 1, (opkg_cmd_fun_t)opkg_flag_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+ {"status", 0, (opkg_cmd_fun_t)opkg_status_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+ {"install", 1, (opkg_cmd_fun_t)opkg_install_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+ {"remove", 1, (opkg_cmd_fun_t)opkg_remove_cmd, PFM_DESCRIPTION|PFM_SOURCE},