From 2ddd5a8c596c59fe2e95ed177e42306bbd7a0502 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 9 Oct 2009 17:08:44 +0100 Subject: packagekit: Make sure connman is used, not network manager Signed-off-by: Richard Purdie --- meta-moblin/packages/packagekit/packagekit/no-nm.patch | 18 ++++++++++++++++++ meta-moblin/packages/packagekit/packagekit_0.4.9.bb | 7 ++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 meta-moblin/packages/packagekit/packagekit/no-nm.patch (limited to 'meta-moblin') diff --git a/meta-moblin/packages/packagekit/packagekit/no-nm.patch b/meta-moblin/packages/packagekit/packagekit/no-nm.patch new file mode 100644 index 0000000000..79592dc547 --- /dev/null +++ b/meta-moblin/packages/packagekit/packagekit/no-nm.patch @@ -0,0 +1,18 @@ +Index: PackageKit-0.4.9/configure.ac +=================================================================== +--- PackageKit-0.4.9.orig/configure.ac 2009-10-09 17:06:25.000000000 +0100 ++++ PackageKit-0.4.9/configure.ac 2009-10-09 17:06:48.000000000 +0100 +@@ -271,12 +271,7 @@ + dnl - Is NetworkManager available? + dnl --------------------------------------------------------------------------- + PKG_CHECK_MODULES(LIBNM, libnm_glib >= $LIBNM_GLIB_REQUIRED, PK_BUILD_NETWORKMANAGER="yes", PK_BUILD_NETWORKMANAGER="no") +-if test "x$PK_BUILD_NETWORKMANAGER" = "xyes"; then +- networking_apis="${networking_apis},NetworkManager" +- AC_DEFINE(PK_BUILD_NETWORKMANAGER, 1, [define if NetworkManager is installed]) +-else +- PK_BUILD_NETWORKMANAGER=no +-fi ++PK_BUILD_NETWORKMANAGER=no + + AM_CONDITIONAL(PK_BUILD_NETWORKMANAGER, test x$PK_BUILD_NETWORKMANAGER = xyes) + AC_SUBST(LIBNM_CFLAGS) diff --git a/meta-moblin/packages/packagekit/packagekit_0.4.9.bb b/meta-moblin/packages/packagekit/packagekit_0.4.9.bb index c2f075d21f..ce1f5702bb 100644 --- a/meta-moblin/packages/packagekit/packagekit_0.4.9.bb +++ b/meta-moblin/packages/packagekit/packagekit_0.4.9.bb @@ -2,14 +2,15 @@ DESCRIPTION = "PackageKit package management abstraction" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "gtk+ python policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +DEPENDS = "gtk+ python policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1) connman" RDEPENDS_${PN} = "opkg" inherit gnome autotools_stage SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ - file://no_validate.patch;patch=1" -PR = "r2" + file://no_validate.patch;patch=1 \ + file://no-nm.patch;patch=1" +PR = "r3" PE = "1" S = "${WORKDIR}/PackageKit-${PV}" -- cgit v1.2.3-54-g00ecf