Updates against mainline openembedded + removal of some unneeded files

git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 0 insertions, 42 deletions

diff --git a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch b/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
deleted file mode 100644
index e70f3af9ff..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- C/ipkg_install.c~remove-c99isms.patch
-+++ C/ipkg_install.c
-@@ -186,14 +186,16 @@
- {
-      abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name);
-      int i;
-+     ipkg_error_t err;
-+     abstract_pkg_t *ppkg;
- 
-      if (providers == NULL)
-          return IPKG_PKG_HAS_NO_CANDIDATE;
- 
-      for (i = 0; i < providers->len; i++) {
--         abstract_pkg_t *ppkg = abstract_pkg_vec_get(providers, i);
--     ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
--         ipkg_error_t err = ipkg_install_by_name(conf, ppkg->name);
-+         ppkg = abstract_pkg_vec_get(providers, i);
-+          ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
-+         err = ipkg_install_by_name(conf, ppkg->name);
-          if (err)
-               return err;
-      }
-@@ -614,12 +616,13 @@
- int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees)
- {
-      int i;
-+     int err;
-      int replaces_count = replacees->len;
-      for (i = 0; i < replaces_count; i++) {
-          pkg_t *replacee = replacees->pkgs[i];
-          if (replacee->state_status != SS_INSTALLED) {
-                ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
--              int err = ipkg_install_pkg(conf, replacee);
-+              err = ipkg_install_pkg(conf, replacee);
-               if (err)
-                    return err;
-          }