[opkg] fix applying patch

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch
deleted file mode 100644 (file)
index 4553124..0000000
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Backport
-
-From 319d02609992273e887242ed9788db68d3310b6c Mon Sep 17 00:00:00 2001
-From: "pixdamix@gmail.com"
- <pixdamix@gmail.com@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
-Date: Thu, 19 Jan 2012 13:52:06 +0000
-Subject: [PATCH 01/10] Fixed opkg losing auto_installed flag on upgrading
-
-Thanks-to: Christian Hitz <christian.hitz@aizo.com>
-
-git-svn-id: http://opkg.googlecode.com/svn/trunk@635 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
----
- libopkg/opkg_install.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
-index 74a2ce1..3925f58 100644
---- a/libopkg/opkg_install.c
-+++ b/libopkg/opkg_install.c
-@@ -1449,6 +1449,9 @@ opkg_install_pkg(pkg_t *pkg, int from_upgrade)
-                /* removing files from old package, to avoid ghost files */
-                remove_data_files_and_list(old_pkg);
-                remove_maintainer_scripts(old_pkg);
-+
-+               /* maintain the "Auto-Installed: yes" flag */
-+               pkg->auto_installed = old_pkg->auto_installed;
-         }
- 
- 
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
index 5808c92..575c1e1 100644 (file)
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
+++ b/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
@@ -1,11 +1,23 @@
+From b925a520a63fb291675f707e602d04295236c85b Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@opendreambox.org>
+Date: Thu, 17 May 2012 01:17:52 +0200
+Subject: [PATCH 07/10] pkg_hash_fetch_conflicts: move iteration over
+ conflicts to subroutine
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+---
+ libopkg/pkg_depends.c |   46 ++++++++++++++++++++++++----------------------
+ 1 file changed, 24 insertions(+), 22 deletions(-)
+
 diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index 512d17f..ca3acbe 100644
+index 6ff75f1..1999b64 100644
 --- a/libopkg/pkg_depends.c
 +++ b/libopkg/pkg_depends.c
-@@ -369,40 +369,22 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
- }
+@@ -284,39 +284,22 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
  
+ }
  
+-
 -pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
 +static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_t * installed_conflicts)
  {
@@ -15,7 +27,6 @@ index 512d17f..ca3acbe 100644
      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;
@@ -35,11 +46,10 @@ index 512d17f..ca3acbe 100644
 -    }
 -    installed_conflicts = pkg_vec_alloc();
 -
--    count = pkg->conflicts_count;
 -
 -
 +    if(!conflicts)
-+        return;
++      return;
  
      /* foreach conflict */
      for(i = 0; i < pkg->conflicts_count; i++){
@@ -47,7 +57,7 @@ index 512d17f..ca3acbe 100644
        possible_satisfiers = conflicts->possibilities;
  
        /* foreach possible satisfier */
-@@ -438,11 +420,30 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
+@@ -352,11 +335,30 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
        }
        conflicts++;
      }
@@ -79,3 +89,6 @@ index 512d17f..ca3acbe 100644
  }
  
  int version_constraints_satisfied(depend_t * depends, pkg_t * pkg)
+-- 
+1.7.9.5
+

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch
deleted file mode 100644 (file)
index e581dc0..0000000
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-While removing a package with opkg, the process shouldn't be blocked if
-another package RECOMMENDS the package wanted to be removed. This is
-because, while generating the dependencies, opkg adds dependencies to
-depended_upon_by even if dependency's type is RECOMMEND. The fix is to
-skip dependencies of type RECOMMEND while constructing depended_upon_by.
-
-Bug info:
-https://bugzilla.yoctoproject.org/show_bug.cgi?id=2431
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: trunk/libopkg/pkg_depends.c
-===================================================================
---- trunk.orig/libopkg/pkg_depends.c   2011-09-03 05:54:56.000000000 +0300
-+++ trunk/libopkg/pkg_depends.c        2012-10-20 22:23:03.783573202 +0300
-@@ -785,8 +785,7 @@
-       for (i = 0; i < count; i++) {
-               depends = &pkg->depends[i];
-               if (depends->type != PREDEPEND
--                  && depends->type != DEPEND
--                  && depends->type != RECOMMEND)
-+                  && depends->type != DEPEND)
-                       continue;
-               for (j = 0; j < depends->possibility_count; j++) {
-                       ab_depend = depends->possibilities[j]->pkg;

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend b/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend
index 5ed2d30..17d44c3 100644 (file)
--- a/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend
+++ b/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend
@@ -9,6 +9,8 @@ PATCHES_virtclass-native = ""
 SRC_URI += " \
             file://0002-Don-t-mark-Conflicts-as-Depends.patch \
             file://0003-Statically-link-libopkg-and-libbb.patch \
+            file://0004-Makefile.am-remove-g-and-O-compiler-flags.patch \
+            file://0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch \
             file://0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch \
             file://0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch \
             file://0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch \