diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-18 23:23:40 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-18 23:23:40 +0000 |
| commit | d429130518489e8186c5ea2ee8cd655d7f1aa2eb (patch) | |
| tree | d99db6f1ae5aa114180717d9e9e5761880221c7a | |
| parent | fa432efa8e500303bd9ed4f07fae63f2ab238c12 (diff) | |
| download | upstream-d429130518489e8186c5ea2ee8cd655d7f1aa2eb.tar.gz upstream-d429130518489e8186c5ea2ee8cd655d7f1aa2eb.tar.bz2 upstream-d429130518489e8186c5ea2ee8cd655d7f1aa2eb.zip | |
opkg: update to r528, refresh patches
SVN-Revision: 21008
| -rw-r--r-- | package/opkg/Makefile | 4 | ||||
| -rw-r--r-- | package/opkg/patches/000-upstream-fix_configure_order.patch | 15 | ||||
| -rw-r--r-- | package/opkg/patches/003-fs_overlay_support.patch | 2 | ||||
| -rw-r--r-- | package/opkg/patches/009-remove-upgrade-all.patch | 6 | ||||
| -rw-r--r-- | package/opkg/patches/010-remove-flag.patch | 4 |
5 files changed, 8 insertions, 23 deletions
diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 81f7b4a4a0..c18f8e7319 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=opkg -PKG_REV:=513 +PKG_REV:=528 PKG_VERSION:=$(PKG_REV) -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=svn PKG_SOURCE_VERSION:=$(PKG_REV) diff --git a/package/opkg/patches/000-upstream-fix_configure_order.patch b/package/opkg/patches/000-upstream-fix_configure_order.patch deleted file mode 100644 index dcd1b547c2..0000000000 --- a/package/opkg/patches/000-upstream-fix_configure_order.patch +++ /dev/null @@ -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; diff --git a/package/opkg/patches/003-fs_overlay_support.patch b/package/opkg/patches/003-fs_overlay_support.patch index 4fed4d12e2..49dd1ff655 100644 --- a/package/opkg/patches/003-fs_overlay_support.patch +++ b/package/opkg/patches/003-fs_overlay_support.patch @@ -18,7 +18,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org> +++ b/libopkg/opkg_conf.h @@ -76,6 +76,7 @@ struct opkg_conf int check_signature; - int nodeps; /* do not follow dependences */ + int nodeps; /* do not follow dependencies */ char *offline_root; + char *overlay_root; int query_all; diff --git a/package/opkg/patches/009-remove-upgrade-all.patch b/package/opkg/patches/009-remove-upgrade-all.patch index be76ef53ce..6dfa3db838 100644 --- a/package/opkg/patches/009-remove-upgrade-all.patch +++ b/package/opkg/patches/009-remove-upgrade-all.patch @@ -1,6 +1,6 @@ --- a/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); } } @@ -17,8 +17,8 @@ - pkg_vec_free(installed); } - opkg_configure_packages(NULL); -@@ -1166,7 +1155,7 @@ opkg_print_architecture_cmd(int argc, ch + r = opkg_configure_packages(NULL); +@@ -1173,7 +1162,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}, diff --git a/package/opkg/patches/010-remove-flag.patch b/package/opkg/patches/010-remove-flag.patch index c242bea31f..6659c29375 100644 --- a/package/opkg/patches/010-remove-flag.patch +++ b/package/opkg/patches/010-remove-flag.patch @@ -1,6 +1,6 @@ --- a/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 @@ -50,7 +50,7 @@ opkg_files_cmd(int argc, char **argv) { 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}, {"info", 0, (opkg_cmd_fun_t)opkg_info_cmd, 0}, |