mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 18:35:55 +02:00
[package] opkg: update to r528, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21008 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
193c04bbe7
commit
e2cc8ca357
@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk
|
|||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=opkg
|
PKG_NAME:=opkg
|
||||||
PKG_REV:=513
|
PKG_REV:=528
|
||||||
PKG_VERSION:=$(PKG_REV)
|
PKG_VERSION:=$(PKG_REV)
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=svn
|
PKG_SOURCE_PROTO:=svn
|
||||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
http://code.google.com/p/opkg/source/detail?r=521
|
|
||||||
|
|
||||||
--- a/libopkg/opkg_cmd.c
|
|
||||||
+++ b/libopkg/opkg_cmd.c
|
|
||||||
@@ -390,8 +390,8 @@ opkg_configure_packages(char *pkg_name)
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
- for(i = 0; i < all->len; i++) {
|
|
||||||
- pkg = all->pkgs[i];
|
|
||||||
+ for(i = 0; i < ordered->len; i++) {
|
|
||||||
+ pkg = ordered->pkgs[i];
|
|
||||||
|
|
||||||
if (pkg_name && fnmatch(pkg_name, pkg->name, 0))
|
|
||||||
continue;
|
|
@ -18,7 +18,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
|
|||||||
+++ b/libopkg/opkg_conf.h
|
+++ b/libopkg/opkg_conf.h
|
||||||
@@ -76,6 +76,7 @@ struct opkg_conf
|
@@ -76,6 +76,7 @@ struct opkg_conf
|
||||||
int check_signature;
|
int check_signature;
|
||||||
int nodeps; /* do not follow dependences */
|
int nodeps; /* do not follow dependencies */
|
||||||
char *offline_root;
|
char *offline_root;
|
||||||
+ char *overlay_root;
|
+ char *overlay_root;
|
||||||
int query_all;
|
int query_all;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/libopkg/opkg_cmd.c
|
--- a/libopkg/opkg_cmd.c
|
||||||
+++ b/libopkg/opkg_cmd.c
|
+++ b/libopkg/opkg_cmd.c
|
||||||
@@ -498,17 +498,6 @@ opkg_upgrade_cmd(int argc, char **argv)
|
@@ -500,17 +500,6 @@ opkg_upgrade_cmd(int argc, char **argv)
|
||||||
opkg_install_by_name(arg);
|
opkg_install_by_name(arg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -17,8 +17,8 @@
|
|||||||
- pkg_vec_free(installed);
|
- pkg_vec_free(installed);
|
||||||
}
|
}
|
||||||
|
|
||||||
opkg_configure_packages(NULL);
|
r = opkg_configure_packages(NULL);
|
||||||
@@ -1166,7 +1155,7 @@ opkg_print_architecture_cmd(int argc, ch
|
@@ -1173,7 +1162,7 @@ opkg_print_architecture_cmd(int argc, ch
|
||||||
array for easier maintenance */
|
array for easier maintenance */
|
||||||
static opkg_cmd_t cmds[] = {
|
static opkg_cmd_t cmds[] = {
|
||||||
{"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE},
|
{"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE},
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/libopkg/opkg_cmd.c
|
--- a/libopkg/opkg_cmd.c
|
||||||
+++ b/libopkg/opkg_cmd.c
|
+++ b/libopkg/opkg_cmd.c
|
||||||
@@ -738,49 +738,6 @@ opkg_remove_cmd(int argc, char **argv)
|
@@ -745,49 +745,6 @@ opkg_remove_cmd(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
@ -50,7 +50,7 @@
|
|||||||
opkg_files_cmd(int argc, char **argv)
|
opkg_files_cmd(int argc, char **argv)
|
||||||
{
|
{
|
||||||
pkg_t *pkg;
|
pkg_t *pkg;
|
||||||
@@ -1162,7 +1119,6 @@ static opkg_cmd_t cmds[] = {
|
@@ -1169,7 +1126,6 @@ static opkg_cmd_t cmds[] = {
|
||||||
{"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},
|
||||||
{"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},
|
{"info", 0, (opkg_cmd_fun_t)opkg_info_cmd, 0},
|
||||||
|
Loading…
Reference in New Issue
Block a user