opkg: fallback to dest->root_dir if specified overlay_root does not exist on filesyst...

SVN-Revision: 19121

diff --git a/package/opkg/patches/003-fs_overlay_support.patch b/package/opkg/patches/003-fs_overlay_support.patch
index 0716ae4818d5d8e464100a410aec7a056b3642e4..0d4402ed12599737964d17317d09a49c598d0c97 100644 (file)
--- 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;