summaryrefslogtreecommitdiff
path: root/package/opkg/patches/003-fs_overlay_support.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-02 03:25:35 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-02 03:25:35 +0000
commit986ed8c893222eb1a1868c0fe17fcabe96115008 (patch)
tree2168b5641ed12ae5bd3416b60d0e734f511b5a23 /package/opkg/patches/003-fs_overlay_support.patch
parent6ee9bd563bfa2f5797a034d49071f6c85c18001f (diff)
[package] opkg: reenable global upgrade, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23174 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/opkg/patches/003-fs_overlay_support.patch')
-rw-r--r--package/opkg/patches/003-fs_overlay_support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/opkg/patches/003-fs_overlay_support.patch b/package/opkg/patches/003-fs_overlay_support.patch
index 49dd1ff655..63933bd97d 100644
--- a/package/opkg/patches/003-fs_overlay_support.patch
+++ b/package/opkg/patches/003-fs_overlay_support.patch
@@ -6,7 +6,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
-@@ -62,6 +62,7 @@ opkg_option_t options[] = {
+@@ -63,6 +63,7 @@ opkg_option_t options[] = {
{ "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only },
{ "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps },
{ "offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root },
@@ -16,7 +16,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
{ "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all },
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
-@@ -76,6 +76,7 @@ struct opkg_conf
+@@ -78,6 +78,7 @@ struct opkg_conf
int check_signature;
int nodeps; /* do not follow dependencies */
char *offline_root;
@@ -34,7 +34,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
#include "pkg.h"
#include "pkg_hash.h"
-@@ -189,13 +190,24 @@ static int
+@@ -192,13 +193,24 @@ static int
verify_pkg_installable(pkg_t *pkg)
{
unsigned long kbs_available, pkg_size_kbs;