summaryrefslogtreecommitdiffstats
path: root/meta-moblin
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin')
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc1
-rw-r--r--meta-moblin/conf/distro/include/moblin-floating-revisions.inc1
-rw-r--r--meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch44
-rw-r--r--meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb11
4 files changed, 57 insertions, 0 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 013dd74e70..ed92778b60 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -45,6 +45,7 @@ SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
45SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" 45SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
46SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571" 46SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571"
47SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" 47SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
48SRCREV_pn-moblin-app-installer ?= "7f7d50079c8bcc63874fd60a61f23d849e025445"
48SRCREV_pn-moblin-gtk-engine ?= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f" 49SRCREV_pn-moblin-gtk-engine ?= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f"
49SRCREV_pn-moblin-icon-theme ?= "36b7ac1e57ea6d95e6432779c4769c14fce24899" 50SRCREV_pn-moblin-icon-theme ?= "36b7ac1e57ea6d95e6432779c4769c14fce24899"
50SRCREV_pn-moblin-menus ?= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a" 51SRCREV_pn-moblin-menus ?= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 360599695e..9792a99082 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -26,6 +26,7 @@ SRCREV_pn-libccss ?= "${AUTOREV}"
26SRCREV_pn-librest ?= "${AUTOREV}" 26SRCREV_pn-librest ?= "${AUTOREV}"
27SRCREV_pn-libsynthesis ?= "${AUTOREV}" 27SRCREV_pn-libsynthesis ?= "${AUTOREV}"
28SRCREV_pn-linux-moblin ?= "${AUTOREV}" 28SRCREV_pn-linux-moblin ?= "${AUTOREV}"
29SRCREV_pn-moblin-app-installer ?= "${AUTOREV}"
29SRCREV_pn-moblin-gtk-engine ?= "${AUTOREV}" 30SRCREV_pn-moblin-gtk-engine ?= "${AUTOREV}"
30SRCREV_pn-moblin-menus ?= "${AUTOREV}" 31SRCREV_pn-moblin-menus ?= "${AUTOREV}"
31SRCREV_pn-moblin-web-browser ?= "${AUTOREV}" 32SRCREV_pn-moblin-web-browser ?= "${AUTOREV}"
diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch b/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch
new file mode 100644
index 0000000000..1b57ffe32a
--- /dev/null
+++ b/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch
@@ -0,0 +1,44 @@
1Index: git/configure.ac
2===================================================================
3--- git.orig/configure.ac 2009-10-05 17:05:14.000000000 +0100
4+++ git/configure.ac 2009-10-05 21:02:48.000000000 +0100
5@@ -34,7 +34,7 @@
6 gtk+-2.0
7 packagekit-glib >= 0.4
8 packagekit-glib < 0.5
9- rpm >= 4.6'
10+ libopkg'
11
12 AC_MSG_CHECKING([for available nbtk version])
13 PKG_CHECK_EXISTS(nbtk-1.2,
14Index: git/src/mai-package.c
15===================================================================
16--- git.orig/src/mai-package.c 2009-10-05 17:05:06.000000000 +0100
17+++ git/src/mai-package.c 2009-10-05 21:01:57.000000000 +0100
18@@ -23,7 +23,7 @@
19 #include <gtk/gtk.h>
20
21 /* FIXME make conditional. */
22-#include <rpm/rpmlib.h>
23+#include <libopkg/opkg.h>
24
25 #include "mai-model-priv.h"
26 #include "mai-package.h"
27@@ -191,7 +191,7 @@
28
29 if (priv->package_id &&
30 priv->version &&
31- rpmvercmp (version, priv->version) < 0)
32+ opkg_compare_versions (version, priv->version) < 0)
33 {
34 g_debug (" skipping '%s'", version);
35 return;
36@@ -955,7 +955,7 @@
37 return -1;
38
39 /* FIXME support deb. */
40- return rpmvercmp (priv->version, version);
41+ return opkg_compare_versions (priv->version, version);
42 }
43
44 gboolean
diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb
new file mode 100644
index 0000000000..502db63a08
--- /dev/null
+++ b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "Moblin Appliction Installer"
2SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
3 file://opkg.patch;patch=1 "
4LICENSE = "GPLv2"
5PV = "0.0+git${SRCPV}"
6PR = "r0"
7
8S = "${WORKDIR}/git"
9DEPENDS = "clutter-1.0 glib-2.0 nbtk libxml2 gtk+ gnome-packagekit opkg"
10
11inherit autotools_stage