diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/connman/connman_git.bb | 17 | ||||
| -rw-r--r-- | meta/packages/connman/files/dbusperms.patch | 12 | ||||
| -rw-r--r-- | meta/packages/connman/files/dhclientreorder.patch | 40 | ||||
| -rw-r--r-- | meta/packages/connman/files/udevfix.patch | 12 |
4 files changed, 73 insertions, 8 deletions
diff --git a/meta/packages/connman/connman_git.bb b/meta/packages/connman/connman_git.bb index 8a6ea26b8..b86c39a77 100644 --- a/meta/packages/connman/connman_git.bb +++ b/meta/packages/connman/connman_git.bb @@ -1,23 +1,25 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" SUMMARY = "Moblin Connection Manager" PV = "0.19+git${SRCREV}" -PR = "r6" +PR = "r14" S = "${WORKDIR}/git" LICENSE = "GPL" DEPENDS = "libgdbus dbus glib-2.0 hal" -RDEPENDS = "dhcp-client wpa-supplicant resolvconf" +RDEPENDS_${PN} = "dhcp-client wpa-supplicant resolvconf" EXTRA_OECONF += " \ --enable-ethernet=builtin --enable-wifi=builtin --enable-dhclient=builtin \ --enable-bluetooth=builtin --enable-udev --enable-loopback=builtin \ --enable-dnsproxy=builtin --enable-threads --enable-resolvconf=builtin \ - --enable-client --enable-fake \ - ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ - ac_cv_path_DHCLIENT=/sbin/dhclient " + --enable-client --enable-fake --with-dhclient=/sbin/dhclient \ + ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant" SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \ file://connman-install-tests.patch;patch=1 \ + file://udevfix.patch;patch=1 \ + file://dhclientreorder.patch;patch=1 \ + file://dbusperms.patch;patch=1 \ file://connman " INITSCRIPT_NAME = "connman" @@ -30,15 +32,14 @@ do_install_append() { } PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-script-dhclient" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers \ - ${datadir}/dbus-1/system-services/*" -FILES_${PN}-script-dhclient += "${libdir}/connman/scripts/dhclient*" + ${datadir}/dbus-1/system-services/* \ + ${libdir}/connman/scripts/dhclient*" FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ ${libdir}/connman/scripts/.debug" diff --git a/meta/packages/connman/files/dbusperms.patch b/meta/packages/connman/files/dbusperms.patch new file mode 100644 index 000000000..100af0367 --- /dev/null +++ b/meta/packages/connman/files/dbusperms.patch @@ -0,0 +1,12 @@ +Index: git/src/connman-dbus.conf +=================================================================== +--- git.orig/src/connman-dbus.conf 2009-05-26 00:34:35.000000000 +0100 ++++ git/src/connman-dbus.conf 2009-05-26 00:34:48.000000000 +0100 +@@ -10,6 +10,6 @@ + <allow send_destination="org.moblin.connman"/> + </policy> + <policy context="default"> +- <deny send_destination="org.moblin.connman"/> ++ <allow send_destination="org.moblin.connman"/> + </policy> + </busconfig> diff --git a/meta/packages/connman/files/dhclientreorder.patch b/meta/packages/connman/files/dhclientreorder.patch new file mode 100644 index 000000000..04da0252d --- /dev/null +++ b/meta/packages/connman/files/dhclientreorder.patch @@ -0,0 +1,40 @@ +The -n option must appear after the iface options, else dhclient +just prints its help text. Crazy. + +RP - 25/5/09 + +Index: git/plugins/dhclient.c +=================================================================== +--- git.orig/plugins/dhclient.c 2009-05-26 00:01:02.000000000 +0100 ++++ git/plugins/dhclient.c 2009-05-26 00:01:38.000000000 +0100 +@@ -165,18 +165,18 @@ + argv[0] = DHCLIENT; + argv[1] = "-d"; + argv[2] = "-q"; +- argv[3] = "-n"; +- argv[4] = "-e"; +- argv[5] = address; +- argv[6] = "-pf"; +- argv[7] = pidfile; +- argv[8] = "-lf"; +- argv[9] = leases; +- argv[10] = "-cf"; +- argv[11] = config; +- argv[12] = "-sf"; +- argv[13] = script; +- argv[14] = task->ifname; ++ argv[3] = "-e"; ++ argv[4] = address; ++ argv[5] = "-pf"; ++ argv[6] = pidfile; ++ argv[7] = "-lf"; ++ argv[8] = leases; ++ argv[9] = "-cf"; ++ argv[10] = config; ++ argv[11] = "-sf"; ++ argv[12] = script; ++ argv[13] = task->ifname; ++ argv[14] = "-n"; + argv[15] = NULL; + + envp[0] = NULL; diff --git a/meta/packages/connman/files/udevfix.patch b/meta/packages/connman/files/udevfix.patch new file mode 100644 index 000000000..803bec528 --- /dev/null +++ b/meta/packages/connman/files/udevfix.patch @@ -0,0 +1,12 @@ +Index: git/src/connman.rules +=================================================================== +--- git.orig/src/connman.rules 2009-05-25 14:24:53.000000000 +0100 ++++ git/src/connman.rules 2009-05-25 14:25:16.000000000 +0100 +@@ -3,6 +3,7 @@ + + SUBSYSTEM=="net", KERNEL=="eth*", ENV{CONNMAN_TYPE}="ethernet" + SUBSYSTEM=="net", KERNEL=="wlan*", ENV{CONNMAN_TYPE}="wifi" ++SUBSYSTEM=="net", KERNEL=="ra0", ENV{CONNMAN_TYPE}="wifi" + + SUBSYSTEM=="net", DRIVERS=="hso", ENV{CONNMAN_TYPE}="hso" + |