X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/936485f730801be1d724f5a011e11f6f4bc75d11..f0589f7290ba958bbefaf5394b155d37c72a185e:/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 0716ae481..63933bd97 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 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c -@@ -62,6 +62,7 @@ +@@ -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,9 +16,9 @@ Signed-off-by: Nicolas Thill { "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all }, --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h -@@ -76,6 +76,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,22 +26,35 @@ Signed-off-by: Nicolas Thill int noaction; --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c -@@ -189,13 +189,19 @@ +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #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; -+ 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;