From a434e041d8f2ad0fd665d9628fb4c1631e3a091a Mon Sep 17 00:00:00 2001 From: hschang Date: Wed, 2 Jul 2014 14:34:39 +0900 Subject: [PATCH] [opkg] update to 0.2.2 --- ...tch_conflicts-move-iteration-over-conflic.patch | 27 ++++++---------------- .../recipes-devtools/opkg/opkg_0.2.2.bbappend | 19 +++++++++++++++ .../recipes-devtools/opkg/opkg_svn.bbappend | 21 ----------------- 3 files changed, 26 insertions(+), 41 deletions(-) create mode 100644 meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend delete mode 100644 meta-openvuplus/recipes-devtools/opkg/opkg_svn.bbappend 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 575c1e1..5808c92 100644 --- 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,23 +1,11 @@ -From b925a520a63fb291675f707e602d04295236c85b Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter -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 ---- - 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 6ff75f1..1999b64 100644 +index 512d17f..ca3acbe 100644 --- a/libopkg/pkg_depends.c +++ b/libopkg/pkg_depends.c -@@ -284,39 +284,22 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg) - +@@ -369,40 +369,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) { @@ -27,6 +15,7 @@ index 6ff75f1..1999b64 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; @@ -46,10 +35,11 @@ index 6ff75f1..1999b64 100644 - } - installed_conflicts = pkg_vec_alloc(); - +- count = pkg->conflicts_count; - - + if(!conflicts) -+ return; ++ return; /* foreach conflict */ for(i = 0; i < pkg->conflicts_count; i++){ @@ -57,7 +47,7 @@ index 6ff75f1..1999b64 100644 possible_satisfiers = conflicts->possibilities; /* foreach possible satisfier */ -@@ -352,11 +335,30 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) +@@ -438,11 +420,30 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) } conflicts++; } @@ -89,6 +79,3 @@ index 6ff75f1..1999b64 100644 } int version_constraints_satisfied(depend_t * depends, pkg_t * pkg) --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend b/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend new file mode 100644 index 0000000..5ed2d30 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend @@ -0,0 +1,19 @@ +PR .= "-vuplus0" + +PATCHES = " \ + file://0011-opkg-allow-package-move-from-depends-to-recommends.patch \ + file://0012-opkg-dont-handle-recommends-as-depends.patch" + +PATCHES_virtclass-native = "" + +SRC_URI += " \ + file://0002-Don-t-mark-Conflicts-as-Depends.patch \ + file://0003-Statically-link-libopkg-and-libbb.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 \ + file://0010-opkg_remove-auto-delete-.pyo-files.patch \ + ${PATCHES} \ + file://unarchive-fixed-uname-gname-cache.patch" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg_svn.bbappend b/meta-openvuplus/recipes-devtools/opkg/opkg_svn.bbappend deleted file mode 100644 index 3eadd64..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg_svn.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -PR .= "-vuplus2" - -PATCHES = "file://0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch \ - file://0011-opkg-allow-package-move-from-depends-to-recommends.patch \ - file://0012-opkg-dont-handle-recommends-as-depends.patch" - -PATCHES_virtclass-native = "" - -SRC_URI += "file://0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch \ - 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 \ - file://0010-opkg_remove-auto-delete-.pyo-files.patch \ - ${PATCHES} \ - file://unarchive-fixed-uname-gname-cache.patch" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -- 2.7.4