duplicate opkg removed..

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg-collateral.bbappend b/meta-openvuplus/recipes-enigma2/opkg/opkg-collateral.bbappend
deleted file mode 100644 (file)
index 429c37f..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg-collateral.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PR .= "-vuplus0"

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg-collateral/dest b/meta-openvuplus/recipes-enigma2/opkg/opkg-collateral/dest
deleted file mode 100644 (file)
index e041eb7..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg-collateral/dest
+++ /dev/null
@@ -1,5 +0,0 @@
-dest root /
-dest cf /media/cf/
-dest ram /media/ram/
-dest hdd /media/hdd/
-dest usb /media/usb/

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch
deleted file mode 100644 (file)
index 4553124..0000000
--- a/meta-openvuplus/recipes-enigma2/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-enigma2/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch
deleted file mode 100644 (file)
index 9e122de..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8c00c6be3723a0dcf05a10b5aba8c1c3b1fe4cf7 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Wed, 16 May 2012 23:29:04 +0200
-Subject: [PATCH 02/10] Don't mark Conflicts as Depends
-
-- Fixes 'whatconflicts' sub-command.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index 1e14d1f..a61e80e 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -609,8 +609,8 @@ void buildConflicts(pkg_t * pkg)
- 
-     conflicts = pkg->conflicts = xcalloc(pkg->conflicts_count, sizeof(compound_depend_t));
-     for (i = 0; i < pkg->conflicts_count; i++) {
--       conflicts->type = CONFLICTS;
-        parseDepends(conflicts, pkg->conflicts_str[i]);
-+       conflicts->type = CONFLICTS;
-        free(pkg->conflicts_str[i]);
-        conflicts++;
-     }
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch
deleted file mode 100644 (file)
index cfb7268..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 698fdfccb2b2855fbe73ecad159b7987b49ddded Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:23:43 +0200
-Subject: [PATCH 03/10] Statically link libopkg and libbb
-
-* Based on https://dev.openwrt.org/browser/trunk/package/opkg/patches/007-force_static.patch
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libbb/Makefile.am   |    8 ++++----
- libopkg/Makefile.am |   14 +++-----------
- src/Makefile.am     |    4 ++--
- tests/Makefile.am   |    6 +++---
- 4 files changed, 12 insertions(+), 20 deletions(-)
-
-diff --git a/libbb/Makefile.am b/libbb/Makefile.am
-index 1cc82df..337d94f 100644
---- a/libbb/Makefile.am
-+++ b/libbb/Makefile.am
-@@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@
- BUILD_CPU=@build_cpu@
- ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@
- 
--noinst_LTLIBRARIES = libbb.la
-+noinst_LIBRARIES = libbb.a
- 
--libbb_la_SOURCES = gz_open.c \
-+libbb_a_SOURCES = gz_open.c \
-       libbb.h \
-       unzip.c \
-       wfopen.c \
-@@ -22,5 +22,5 @@ libbb_la_SOURCES = gz_open.c \
-       all_read.c \
-       mode_string.c
- 
--libbb_la_CFLAGS = $(ALL_CFLAGS)
--#libbb_la_LDFLAGS = -static
-+libbb_a_CFLAGS = $(ALL_CFLAGS)
-+#libbb_a_LDFLAGS = -static
-diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
-index 043c5c4..5882595 100644
---- a/libopkg/Makefile.am
-+++ b/libopkg/Makefile.am
-@@ -38,18 +38,10 @@ if HAVE_SHA256
- opkg_util_sources += sha256.c sha256.h
- endif
- 
--lib_LTLIBRARIES = libopkg.la
--libopkg_la_SOURCES = \
-+noinst_LIBRARIES = libopkg.a
-+libopkg_a_SOURCES = \
-       $(opkg_libcore_sources) \
-       $(opkg_cmd_sources) $(opkg_db_sources) \
-       $(opkg_util_sources) $(opkg_list_sources)
- 
--libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
--
--libopkg_la_LDFLAGS = -version-info 1:0:0
--
--# make sure we only export symbols that are for public use
--#libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*"
--
--
--
-+libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index efdc19d..bb7a792 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${ALL_CFLAGS}
- bin_PROGRAMS = opkg-cl
- 
- opkg_cl_SOURCES = opkg-cl.c
--opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
--                $(top_builddir)/libbb/libbb.la 
-+opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \
-+                $(top_builddir)/libbb/libbb.a
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 1a6f565..132c792 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -4,11 +4,11 @@ AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 -I${top_srcdir}/libopkg
- #noinst_PROGRAMS = libopkg_test opkg_active_list_test
- noinst_PROGRAMS = libopkg_test
- 
--#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
-+#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
- #opkg_hash_test_SOURCES = opkg_hash_test.c
- #opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
- 
--#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
-+#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
- #opkg_extract_test_SOURCES = opkg_extract_test.c
- #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
- 
-@@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test
- #opkg_active_list_test_SOURCES = opkg_active_list_test.c
- #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
- 
--libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la
-+libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a
- libopkg_test_SOURCE = libopkg_test.c
- libopkg_test_LDFLAGS = -static
- 
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0004-Makefile.am-remove-g-and-O-compiler-flags.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0004-Makefile.am-remove-g-and-O-compiler-flags.patch
deleted file mode 100644 (file)
index c9b9d6b..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0004-Makefile.am-remove-g-and-O-compiler-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ca86fc9ad82713e17cd69e92ce2033631fa73675 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:32:43 +0200
-Subject: [PATCH 04/10] Makefile.am: remove -g and -O compiler flags
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- Makefile.am       |    2 +-
- libbb/Makefile.am |    2 +-
- tests/Makefile.am |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 26f2d99..1c6226f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ SUBDIRS = libbb libopkg src tests utils man
- HOST_CPU=@host_cpu@
- BUILD_CPU=@build_cpu@
- OPKGLIBDIR=@opkglibdir@ 
--ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\"
-+ALL_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\"
- 
- PATHFINDER_CFLAGS = @PATHFINDER_CFLAGS@
- PATHFINDER_LIBS   = @PATHFINDER_LIBS@
-diff --git a/libbb/Makefile.am b/libbb/Makefile.am
-index 337d94f..6af5f04 100644
---- a/libbb/Makefile.am
-+++ b/libbb/Makefile.am
-@@ -1,6 +1,6 @@
- HOST_CPU=@host_cpu@
- BUILD_CPU=@build_cpu@
--ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@
-+ALL_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@
- 
- noinst_LIBRARIES = libbb.a
- 
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 132c792..4dccb74 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 -I${top_srcdir}/libopkg
-+AM_CFLAGS = $(ALL_CFLAGS) -Wall -I${top_srcdir}/libopkg
- 
- #noinst_PROGRAMS = opkg_hash_test opkg_extract_test
- #noinst_PROGRAMS = libopkg_test opkg_active_list_test
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch
deleted file mode 100644 (file)
index 1820e52..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4a5bc6cbce81497442f79ded5c78389024df0e60 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:14:23 +0200
-Subject: [PATCH 05/10] pkg_depends: remove unused variables to fix compiler
- warnings
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c |    5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index a61e80e..68a81f9 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -269,13 +269,10 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
- {
-     int i ;
-     int replaces_count = pkg->replaces_count;
--    abstract_pkg_t **replaces;
- 
-     if (pkg->replaces_count==0)    // No replaces, it's surely a conflict
-         return 0;
- 
--    replaces = pkg->replaces;
--
-     for (i = 0; i < replaces_count; i++) {
-         if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) {      // Found
-             opkg_msg(DEBUG2, "Seems I've found a replace %s %s\n",
-@@ -295,7 +292,6 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
-     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;
-@@ -315,7 +311,6 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
-     }
-     installed_conflicts = pkg_vec_alloc();
- 
--    count = pkg->conflicts_count;
- 
- 
- 
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch
deleted file mode 100644 (file)
index 89934f2..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2b289330280e9f9fb5dd2cc10c736ca06d273f4 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:15:15 +0200
-Subject: [PATCH 06/10] pkg_hash_fetch_conflicts: fix possible segfaults
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index 68a81f9..6ff75f1 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -322,10 +322,14 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
-       /* foreach possible satisfier */
-       for(j = 0; j < conflicts->possibility_count; j++){
-             possible_satisfier = possible_satisfiers[j];
--            if (!possible_satisfier)
-+            if (!possible_satisfier) {
-                 opkg_msg(ERROR, "Internal error: possible_satisfier=NULL\n");
--            if (!possible_satisfier->pkg)
-+                continue;
-+            }
-+            if (!possible_satisfier->pkg) {
-                 opkg_msg(ERROR, "Internal error: possible_satisfier->pkg=NULL\n");
-+                continue;
-+            }
-           test_vec = possible_satisfier->pkg->pkgs;
-           if (test_vec) {
-                 /* pkg_vec found, it is an actual package conflict
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
deleted file mode 100644 (file)
index 575c1e1..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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 6ff75f1..1999b64 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)
- 
- }
- 
--
--pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
-+static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_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;
--    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();
--
--
--
-+    if(!conflicts)
-+      return;
- 
-     /* foreach conflict */
-     for(i = 0; i < pkg->conflicts_count; i++){
--
-       possible_satisfiers = conflicts->possibilities;
- 
-       /* foreach possible satisfier */
-@@ -352,11 +335,30 @@ 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);
--      return (pkg_vec_t *)NULL;
-+    return (pkg_vec_t *)NULL;
- }
- 
- int version_constraints_satisfied(depend_t * depends, pkg_t * pkg)
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch
deleted file mode 100644 (file)
index e958289..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 53de52b533ee30676d051ee941cfc0a517e9190e Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:18:42 +0200
-Subject: [PATCH 08/10] pkg_hash_fetch_conflicts: take into account conflicts
- of installed packages
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index 1999b64..f237733 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -337,6 +337,22 @@ static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_t * installed_confli
-     }
- }
- 
-+static void __pkg_hash_fetch_conflictees(pkg_t *pkg, pkg_vec_t *installed_conflicts)
-+{
-+    int i;
-+
-+    pkg_vec_t *available_pkgs = pkg_vec_alloc();
-+    pkg_hash_fetch_all_installed(available_pkgs);
-+
-+    for (i = 0; i < available_pkgs->len; i++) {
-+        pkg_t *cpkg = available_pkgs->pkgs[i];
-+        if (pkg_conflicts(cpkg, pkg) && !is_pkg_in_pkg_vec(installed_conflicts, cpkg))
-+            pkg_vec_insert(installed_conflicts, cpkg);
-+    }
-+
-+    pkg_vec_free(available_pkgs);
-+}
-+
- pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
- {
-     pkg_vec_t * installed_conflicts;
-@@ -354,6 +370,7 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
-     installed_conflicts = pkg_vec_alloc();
- 
-     __pkg_hash_fetch_conflicts(pkg, installed_conflicts);
-+    __pkg_hash_fetch_conflictees(pkg, installed_conflicts);
- 
-     if (installed_conflicts->len)
-           return installed_conflicts;
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch
deleted file mode 100644 (file)
index bf61aef..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 70d10c10288da23755055c881bea01b61a2d4df7 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 22:57:35 +0200
-Subject: [PATCH 09/10] Revert "Add Recommended packages to the
- depended_upon_by field."
-
-This reverts commit ac2222f7d6514fb403ce0848f6812a22a48f75c7.
----
- libopkg/pkg_depends.c |   70 ++++++++++++++++++++++---------------------------
- 1 file changed, 32 insertions(+), 38 deletions(-)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index f237733..ec60b99 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -787,49 +787,43 @@ pkg_depend_str(pkg_t *pkg, int idx)
-       return str;
- }
- 
-+/*
-+ * WARNING: This function assumes pre_depends and depends are at the
-+ * start of the pkg->depends array.
-+ */
- void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg)
- {
--      compound_depend_t * depends;
--      int count, othercount;
--      int i, j;
--      abstract_pkg_t * ab_depend;
--      abstract_pkg_t ** temp;
--
--      count = pkg->pre_depends_count +
--                      pkg->depends_count +
--                      pkg->recommends_count +
--                      pkg->suggests_count;
--
--      for (i = 0; i < count; i++) {
--              depends = &pkg->depends[i];
--              if (depends->type != PREDEPEND
--                  && depends->type != DEPEND
--                  && depends->type != RECOMMEND)
--                      continue;
--              for (j = 0; j < depends->possibility_count; j++) {
--                      ab_depend = depends->possibilities[j]->pkg;
--                      if (!ab_depend->depended_upon_by) {
--                              ab_depend->depended_upon_by =
--                                      xcalloc(1, sizeof(abstract_pkg_t *));
--                      }
-+     compound_depend_t * depends;
-+     int count, othercount;
-+     int i, j;
-+     abstract_pkg_t * ab_depend;
-+     abstract_pkg_t ** temp;
- 
--                      temp = ab_depend->depended_upon_by;
--                      othercount = 1;
--                      while (*temp) {
--                          temp++;
--                          othercount++;
--                      }
--                      *temp = ab_pkg;
-+     count = pkg->pre_depends_count + pkg->depends_count;
-+     depends = pkg->depends;
- 
--                      ab_depend->depended_upon_by =
--                              xrealloc(ab_depend->depended_upon_by,
--                              (othercount + 1) * sizeof(abstract_pkg_t *));
-+     for (i = 0; i < count; i++) {
-+        for (j = 0; j < depends->possibility_count; j++){
-+             ab_depend = depends->possibilities[j]->pkg;
-+             if(!ab_depend->depended_upon_by)
-+                  ab_depend->depended_upon_by = xcalloc(1, sizeof(abstract_pkg_t *));
-+
-+             temp = ab_depend->depended_upon_by;
-+             othercount = 1;
-+             while(*temp){
-+                  temp++;
-+                  othercount++;
-+             }
-+             *temp = ab_pkg;
- 
--                      /* the array may have been moved by realloc */
--                      temp = ab_depend->depended_upon_by + othercount;
--                      *temp = NULL;
--              }
--      }
-+             ab_depend->depended_upon_by = xrealloc(ab_depend->depended_upon_by,
-+                                                                      (othercount + 1) * sizeof(abstract_pkg_t *));
-+             /* the array may have moved */
-+             temp = ab_depend->depended_upon_by + othercount;
-+             *temp = NULL;
-+        }
-+        depends++;
-+     }
- }
- 
- static depend_t * depend_init(void)
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg/0010-opkg_remove-auto-delete-.pyo-files.patch b/meta-openvuplus/recipes-enigma2/opkg/opkg/0010-opkg_remove-auto-delete-.pyo-files.patch
deleted file mode 100644 (file)
index 3bc2e5d..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg/0010-opkg_remove-auto-delete-.pyo-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 719cc4ab765c008bd7e4f2d085692657c33d171e Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Mon, 21 May 2012 14:05:37 +0200
-Subject: [PATCH 10/10] opkg_remove: auto-delete .pyo files
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/opkg_remove.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
-index 5f4219b..4320dc3 100644
---- a/libopkg/opkg_remove.c
-+++ b/libopkg/opkg_remove.c
-@@ -375,8 +375,15 @@ remove_data_files_and_list(pkg_t *pkg)
-         }
- 
-         if (!conf->noaction) {
-+              size_t l = strlen(file_name);
-               opkg_msg(INFO, "Deleting %s.\n", file_name);
-              unlink(file_name);
-+              if (l >= 3 && !strcmp(&file_name[l - 3], ".py")) {
-+                      char pyo_file_name[l + 2];
-+                      strcpy(pyo_file_name, file_name);
-+                      strcat(pyo_file_name, "o");
-+                      unlink(pyo_file_name);
-+              }
-         } else
-               opkg_msg(INFO, "Not deleting %s. (noaction)\n",
-                               file_name);
--- 
-1.7.9.5
-

diff --git a/meta-openvuplus/recipes-enigma2/opkg/opkg_svn.bbappend b/meta-openvuplus/recipes-enigma2/opkg/opkg_svn.bbappend
deleted file mode 100644 (file)
index e5a54e4..0000000
--- a/meta-openvuplus/recipes-enigma2/opkg/opkg_svn.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-PR .= "-vuplus0"
-
-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://0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch \
-            file://0010-opkg_remove-auto-delete-.pyo-files.patch"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"