3 files changed, 74 insertions, 0 deletions

diff --git a/meta/recipes-devtools/opkg/opkg/add_vercmp.patch b/meta/recipes-devtools/opkg/opkg/add_vercmp.patch
new file mode 100644
index 0000000000..540be83950
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/add_vercmp.patch
@@ -0,0 +1,34 @@
+Index: trunk/libopkg/opkg.c
+===================================================================
+--- trunk.orig/libopkg/opkg.c   2010-01-26 20:32:19.000000000 +0000
++++ trunk/libopkg/opkg.c        2010-01-26 20:40:34.000000000 +0000
+@@ -876,3 +876,18 @@
+ 
+        return ret;
+ }
++
++int
++opkg_compare_versions (const char *ver1, const char *ver2)
++{
++  pkg_t *pkg1, *pkg2;
++
++  pkg1 = pkg_new();
++  pkg2 = pkg_new();
++
++  parse_version(pkg1, ver1);
++  parse_version(pkg2, ver2);
++
++  return pkg_compare_versions(pkg1, pkg2);
++}
++
+Index: trunk/libopkg/opkg.h
+===================================================================
+--- trunk.orig/libopkg/opkg.h   2010-01-26 20:32:19.000000000 +0000
++++ trunk/libopkg/opkg.h        2010-01-26 20:35:19.000000000 +0000
+@@ -58,4 +58,6 @@
+ 
+ int opkg_repository_accessibility_check(void);
+ 
++int opkg_compare_versions (const char *ver1, const char *ver2);
++
+ #endif /* OPKG_H */
diff --git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch
new file mode 100644
index 0000000000..d0711ecd0e
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/headerfix.patch
@@ -0,0 +1,17 @@
+Without this, the FILE reference in this header can cause compile issues.
+
+RP - 29/1/10
+
+Index: trunk/libopkg/pkg_dest.h
+===================================================================
+--- trunk.orig/libopkg/pkg_dest.h       2010-01-29 09:37:22.000000000 +0000
++++ trunk/libopkg/pkg_dest.h    2010-01-29 09:37:33.000000000 +0000
+@@ -18,6 +18,8 @@
+ #ifndef PKG_DEST_H
+ #define PKG_DEST_H
+ 
++#include <stdio.h>
++
+ typedef struct pkg_dest pkg_dest_t;
+ struct pkg_dest
+ {
diff --git a/meta/recipes-devtools/opkg/opkg/logfix.patch b/meta/recipes-devtools/opkg/opkg/logfix.patch
new file mode 100644
index 0000000000..da06f00bd0
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/logfix.patch
@@ -0,0 +1,23 @@
+Patch to remove "duplicate" bits of logs from opkg output, which 
+massively simplifies do_rootfs logs. The reason is we get unflushed 
+data passed to the children and duplicated.
+
+RP - 26/1/10
+
+Index: trunk/libbb/gz_open.c
+===================================================================
+--- trunk.orig/libbb/gz_open.c  2010-01-26 23:12:10.000000000 +0000
++++ trunk/libbb/gz_open.c       2010-01-26 23:12:17.000000000 +0000
+@@ -38,6 +38,12 @@
+                perror_msg("pipe");
+                return(NULL);
+        }
++
++    /* If we don't flush, we end up with two copies of anything pending, 
++       one from the parent, one from the child */
++    fflush(stdout);
++    fflush(stderr);
++
+        if ((*pid = fork()) == -1) {
+                perror_msg("fork");
+                return(NULL);