aboutsummaryrefslogtreecommitdiffstats
path: root/package/opkg/patches
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-01-13 20:21:39 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-01-13 20:21:39 +0000
commitd9ca4041c52cdf8eab2ade087714a773b482de41 (patch)
tree6504a8317c848f46f4419d3e4b729e43848b9666 /package/opkg/patches
parent4d904cf081a5a5ab33c8ab149865217cceb4c5fa (diff)
downloadupstream-d9ca4041c52cdf8eab2ade087714a773b482de41.tar.gz
upstream-d9ca4041c52cdf8eab2ade087714a773b482de41.tar.bz2
upstream-d9ca4041c52cdf8eab2ade087714a773b482de41.zip
opkg: fallback to dest->root_dir if specified overlay_root does not exist on filesystem (#6498)
SVN-Revision: 19121
Diffstat (limited to 'package/opkg/patches')
-rw-r--r--package/opkg/patches/003-fs_overlay_support.patch23
1 files changed, 18 insertions, 5 deletions
diff --git a/package/opkg/patches/003-fs_overlay_support.patch b/package/opkg/patches/003-fs_overlay_support.patch
index 0716ae4818..0d4402ed12 100644
--- a/package/opkg/patches/003-fs_overlay_support.patch
+++ b/package/opkg/patches/003-fs_overlay_support.patch
@@ -26,22 +26,35 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
int noaction;
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
-@@ -189,13 +189,19 @@
+@@ -21,6 +21,7 @@
+ #include <time.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+
+ #include "pkg.h"
+ #include "pkg_hash.h"
+@@ -189,13 +190,24 @@
verify_pkg_installable(pkg_t *pkg)
{
unsigned long kbs_available, pkg_size_kbs;
- char *root_dir;
+ char *root_dir = NULL;
++ struct stat s;
if (conf->force_space || pkg->installed_size == 0)
return 0;
- root_dir = pkg->dest ? pkg->dest->root_dir :
- conf->default_dest->root_dir;
-+ if( !pkg->dest || !strcmp(pkg->dest->name, "root") )
-+ root_dir = conf->overlay_root;
-+ else
-+ root_dir = pkg->dest->root_dir;
++ if( pkg->dest )
++ {
++ if( !strcmp(pkg->dest->name, "root") && conf->overlay_root
++ && !stat(conf->overlay_root, &s) && (s.st_mode & S_IFDIR) )
++ root_dir = conf->overlay_root;
++ else
++ root_dir = pkg->dest->root_dir;
++ }
+
+ if( !root_dir )
+ root_dir = conf->default_dest->root_dir;