X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/936485f730801be1d724f5a011e11f6f4bc75d11..f9794518c7a41ffd1e962d77e1fd2b94cf9da9f7:/package/opkg/patches/009-remove-upgrade-all.patch

diff --git a/package/opkg/patches/009-remove-upgrade-all.patch b/package/opkg/patches/009-remove-upgrade-all.patch
index d73ef466e..395a2a6f9 100644
--- a/package/opkg/patches/009-remove-upgrade-all.patch
+++ b/package/opkg/patches/009-remove-upgrade-all.patch
@@ -1,7 +1,7 @@
 --- a/libopkg/opkg_cmd.c
 +++ b/libopkg/opkg_cmd.c
-@@ -498,17 +498,6 @@
- 		    opkg_install_by_name(arg);
+@@ -551,18 +551,6 @@ opkg_upgrade_cmd(int argc, char **argv)
+ 			    err = -1;
                 }
  	  }
 -     } else {
@@ -12,13 +12,14 @@
 -	  pkg_hash_fetch_all_installed(installed);
 -	  for (i = 0; i < installed->len; i++) {
 -	       pkg = installed->pkgs[i];
--	       opkg_upgrade_pkg(pkg);
+-	       if (opkg_upgrade_pkg(pkg))
+-		       err = -1;
 -	  }
 -	  pkg_vec_free(installed);
       }
  
-      opkg_configure_packages(NULL);
-@@ -1166,7 +1155,7 @@
+      if (opkg_configure_packages(NULL))
+@@ -1258,7 +1246,7 @@ opkg_print_architecture_cmd(int argc, ch
     array for easier maintenance */
  static opkg_cmd_t cmds[] = {
       {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE},
@@ -27,3 +28,14 @@
       {"list", 0, (opkg_cmd_fun_t)opkg_list_cmd, PFM_SOURCE},
       {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
       {"list-installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
+--- a/src/opkg-cl.c
++++ b/src/opkg-cl.c
+@@ -221,7 +221,7 @@ usage()
+ 
+ 	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");