Update openembedded-core / meta-openembedded / bitbake (1.25.0)

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-devtools / opkg / opkg / 0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
new file mode 100644 (file)
index 0000000..e2c9ff9
--- /dev/null
+++ b/meta-openvuplus/recipes-devtools/opkg/opkg/0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
@@ -0,0 +1,79 @@
+diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
+index eb630d1..de105bf 100644
+--- a/libopkg/pkg_depends.c
++++ b/libopkg/pkg_depends.c
+@@ -377,36 +377,23 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
+ }
+ 
+ 
+-pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
++static pkg_vec_t * __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_t * installed_conflicts)
+ {
+-    pkg_vec_t * installed_conflicts, * test_vec;
++    pkg_vec_t * test_vec;
+     compound_depend_t * conflicts;
+     depend_t ** possible_satisfiers;
+     depend_t * possible_satisfier;
+     int i, j, k;
+     int count;
+-    abstract_pkg_t * ab_pkg;
+     pkg_t **pkg_scouts;
+     pkg_t *pkg_scout;
+ 
+-    /*
+-     * this is a setup to check for redundant/cyclic dependency checks,
+-     * which are marked at the abstract_pkg level
+-     */
+-    if(!(ab_pkg = pkg->parent)){
+-      opkg_msg(ERROR, "Internal error: %s not in hash table\n", pkg->name);
+-      return (pkg_vec_t *)NULL;
+-    }
+-
+     conflicts = pkg->conflicts;
+-    if(!conflicts){
+-      return (pkg_vec_t *)NULL;
+-    }
+-    installed_conflicts = pkg_vec_alloc();
+-
+-    count = pkg->conflicts_count;
+ 
++      if(!conflicts)
++              return;
+ 
++    count = pkg->conflicts_count;
+ 
+     /* foreach conflict */
+     for(i = 0; i < pkg->conflicts_count; i++){
+@@ -446,10 +433,29 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
+       }
+       conflicts++;
+     }
++}
++
++pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
++{
++      pkg_vec_t * installed_conflicts;
++      abstract_pkg_t * ab_pkg;
++
++      /*
++       * this is a setup to check for redundant/cyclic dependency checks,
++       * which are marked at the abstract_pkg level
++       */
++      if(!(ab_pkg = pkg->parent)){
++              opkg_msg(ERROR, "Internal error: %s not in hash table\n", pkg->name);
++              return (pkg_vec_t *)NULL;
++      }
++
++      installed_conflicts = pkg_vec_alloc();
++
++      __pkg_hash_fetch_conflicts(pkg, installed_conflicts);
+ 
+-    if (installed_conflicts->len)
+-          return installed_conflicts;
+-    pkg_vec_free(installed_conflicts);
++      if (installed_conflicts->len)
++              return installed_conflicts;
++      pkg_vec_free(installed_conflicts);
+       return (pkg_vec_t *)NULL;
+ }
+