[include] autotools.mk: set AUTOPOINT to "true", not all hosts have it install and...

[openwrt.git] / package / opkg / patches / 003-fs_overlay_support.patch

diff --git a/package/opkg/patches/003-fs_overlay_support.patch b/package/opkg/patches/003-fs_overlay_support.patch
index 8d18c28..63933bd 100644 (file)
--- a/package/opkg/patches/003-fs_overlay_support.patch
+++ b/package/opkg/patches/003-fs_overlay_support.patch
@@ -6,8 +6,8 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
 
 --- a/libopkg/opkg_conf.c
 +++ b/libopkg/opkg_conf.c
-@@ -58,6 +58,7 @@
-         { "noaction", OPKG_OPT_TYPE_BOOL, &_conf.noaction },
+@@ -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 },
 +        { "overlay_root", OPKG_OPT_TYPE_STRING, &_conf.overlay_root },
@@ -16,9 +16,9 @@ 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
-@@ -74,6 +74,7 @@
+@@ -78,6 +78,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;
@@ -26,17 +26,39 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
       int noaction;
 --- a/libopkg/opkg_install.c
 +++ b/libopkg/opkg_install.c
-@@ -194,8 +194,11 @@
+@@ -21,6 +21,7 @@
+ #include <time.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ 
+ #include "pkg.h"
+ #include "pkg_hash.h"
+@@ -192,13 +193,24 @@ static int
+ 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;
-+      root_dir = pkg->dest
-+              ? pkg->dest->root_dir
-+              : conf->overlay_root
-+                      ? conf->overlay_root
-+                      : conf->default_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;
++
        kbs_available = get_available_kbytes(root_dir);
  
        pkg_size_kbs = (pkg->installed_size + 1023)/1024;