ar71xx: refresh 2.6.30 patches

[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 c746cc3..f84060a 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
 
 --- a/libopkg/opkg_conf.c
 +++ b/libopkg/opkg_conf.c

-@@ -64,6 +64,7 @@ int opkg_init_options_array(const opkg_c
-         { "offline_root", OPKG_OPT_TYPE_STRING, &conf->offline_root },
+@@ -72,6 +72,7 @@
+         { "offline_root_path", OPKG_OPT_TYPE_STRING, &conf->offline_root_path },

          { "offline_root_post_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd },
          { "offline_root_pre_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
 +        { "overlay_root", OPKG_OPT_TYPE_STRING, &conf->overlay_root },
          { "offline_root_post_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd },
          { "offline_root_pre_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
 +        { "overlay_root", OPKG_OPT_TYPE_STRING, &conf->overlay_root },


@@ -16,8 +16,8 @@ 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
          { "query-all", OPKG_OPT_TYPE_BOOL, &conf->query_all },
 --- a/libopkg/opkg_conf.h
 +++ b/libopkg/opkg_conf.h

-@@ -67,6 +67,7 @@ struct opkg_conf
-      char *offline_root;
+@@ -70,6 +70,7 @@
+      char *offline_root_path;

       char *offline_root_pre_script_cmd;
       char *offline_root_post_script_cmd;
 +     char *overlay_root;
       char *offline_root_pre_script_cmd;
       char *offline_root_post_script_cmd;
 +     char *overlay_root;


@@ -26,35 +26,36 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
       int noaction;
 --- a/libopkg/opkg_install.c
 +++ b/libopkg/opkg_install.c
       int noaction;
 --- a/libopkg/opkg_install.c
 +++ b/libopkg/opkg_install.c

-@@ -524,10 +524,13 @@ static int verify_pkg_installable(opkg_c
+@@ -470,12 +470,15 @@

       *    my diddling with the .opk file size below isn't going to cut it.
       * 3) return a proper error code instead of 1
       */
 -     int comp_size, blocks_available;
       *    my diddling with the .opk file size below isn't going to cut it.
       * 3) return a proper error code instead of 1
       */
 -     int comp_size, blocks_available;

--    

 +     int comp_size, blocks_available = -1;
 +     int comp_size, blocks_available = -1;

-+
+      char *root_dir;
+     

       if (!conf->force_space && pkg->installed_size != NULL) {
       if (!conf->force_space && pkg->installed_size != NULL) {

--        blocks_available = get_available_blocks(conf->default_dest->root_dir);
-+          if (conf->overlay_root != NULL)
-+               blocks_available = get_available_blocks(conf->overlay_root);
-+          if (blocks_available < 0)
-+               blocks_available = get_available_blocks(conf->default_dest->root_dir);
+           root_dir = pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir;
+-        blocks_available = get_available_blocks(root_dir);
++        if (conf->overlay_root != NULL)
++              blocks_available = get_available_blocks(conf->overlay_root);
++        if (blocks_available < 0)
++              blocks_available = get_available_blocks(root_dir);

  
          comp_size = strtoul(pkg->installed_size, NULL, 0);
          /* round up a blocks count without doing fancy-but-slow casting jazz */ 
 --- a/libopkg/opkg_utils.c
 +++ b/libopkg/opkg_utils.c
  
          comp_size = strtoul(pkg->installed_size, NULL, 0);
          /* round up a blocks count without doing fancy-but-slow casting jazz */ 
 --- a/libopkg/opkg_utils.c
 +++ b/libopkg/opkg_utils.c

-@@ -30,10 +30,8 @@ int get_available_blocks(char * filesyst
+@@ -31,10 +31,8 @@

  {
  {

-      struct statfs sfs;
+     struct statfs sfs;

  
  

--     if(statfs(filesystem, &sfs)){
--        fprintf(stderr, "bad statfs\n");
--        return 0;
--     }
-+     if(statfs(filesystem, &sfs))
-+        return -1;
-      /*    fprintf(stderr, "reported fs type %x\n", sfs.f_type); */
-      return ((sfs.f_bavail * sfs.f_bsize) / 1024);
- }
+-    if(statfs(filesystem, &sfs)){
+-        fprintf(stderr, "bad statfs\n");
+-        return 0;
+-    }
++    if(statfs(filesystem, &sfs))
++        return -1;
+     /*    fprintf(stderr, "reported fs type %x\n", sfs.f_type); */
+ 
+     // Actually ((sfs.f_bavail * sfs.f_bsize) / 1024)