From 3ee29b34c725a896aad814ece8f464ae3bbeb665 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 27 Jul 2010 12:22:26 +0200
Subject: [PATCH] connman: add metafile support, update to connman-0.55, use
 internally dhcp client

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/build             | 11 +----------
 packages/network/connman/init.d/40_connman |  1 -
 packages/network/connman/install           | 12 ------------
 packages/network/connman/meta              | 14 ++++++++++++++
 packages/network/connman/url               |  1 -
 5 files changed, 15 insertions(+), 24 deletions(-)
 create mode 100644 packages/network/connman/meta
 delete mode 100644 packages/network/connman/url

diff --git a/packages/network/connman/build b/packages/network/connman/build
index 314bd32dad..82d9150f23 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -2,15 +2,7 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-$SCRIPTS/build libnl
-$SCRIPTS/build dbus
-$SCRIPTS/build udev
-$SCRIPTS/build busybox
-#$SCRIPTS/build bluez
-
 cd $PKG_BUILD
-
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -26,7 +18,7 @@ cd $PKG_BUILD
             --disable-bluetooth \
             --disable-hh2serial-gps \
             --disable-ofono \
-            --enable-udhcp \
+            --disable-udhcp \
             --disable-dhclient \
             --disable-resolvconf \
             --disable-openconnect \
@@ -47,6 +39,5 @@ cd $PKG_BUILD
             --enable-udev \
             --enable-datafiles \
             --disable-silent-rules \
-            --with-udhcpc=/sbin/udhcpc \
 
 make
diff --git a/packages/network/connman/init.d/40_connman b/packages/network/connman/init.d/40_connman
index f12124f256..a2dfeb5d56 100755
--- a/packages/network/connman/init.d/40_connman
+++ b/packages/network/connman/init.d/40_connman
@@ -32,4 +32,3 @@ progress "Starting Connection Manager"
   $IONICE touch /var/run/resolv.conf
 
   connmand
-  udhcpc  > /dev/null 2>&1
diff --git a/packages/network/connman/install b/packages/network/connman/install
index b51dffd21c..0bd7eb601a 100755
--- a/packages/network/connman/install
+++ b/packages/network/connman/install
@@ -2,15 +2,6 @@
 
 . config/options $1
 
-$SCRIPTS/install libnl
-$SCRIPTS/install dbus
-$SCRIPTS/install udev
-$SCRIPTS/install Python
-$SCRIPTS/install dbus-python
-$SCRIPTS/install pygobject
-#$SCRIPTS/install bluez
-$SCRIPTS/install wpa_supplicant
-
 add_user system x 430 430 "service" "/var/run/connman" "/bin/sh"
 add_group system 430
 
@@ -20,9 +11,6 @@ mkdir -p $INSTALL/etc/dbus-1/system.d
 mkdir -p $INSTALL/usr/lib/connman/plugins
   cp $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins
 
-mkdir -p $INSTALL/usr/lib/connman/scripts
-  cp $PKG_BUILD/scripts/udhcpc-script $INSTALL/usr/lib/connman/scripts
-
 mkdir -p $INSTALL/usr/sbin
   cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
 
diff --git a/packages/network/connman/meta b/packages/network/connman/meta
new file mode 100644
index 0000000000..3da6f5c659
--- /dev/null
+++ b/packages/network/connman/meta
@@ -0,0 +1,14 @@
+PKG_NAME="connman"
+PKG_VERSION="0.55"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.connman.net"
+PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libnl iptables dbus udev Python dbus-python pygobject wpa_supplicant"
+PKG_BUILD_DEPENDS="toolchain libnl iptables dbus udev"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="connman: Network manager daemon"
+PKG_LONGDESC="The ConnMan project provides a daemon for managing internet connections within embedded devices running the Linux operating system. The Connection Manager is designed to be slim and to use as few resources as possible, so it can be easily integrated. It is a fully modular system that can be extended, through plug-ins, to support all kinds of wired or wireless technologies. Also, configuration methods, like DHCP and domain name resolving, are implemented using plug-ins. The plug-in approach allows for easy adaption and modification for various use cases."
+PKG_IS_ADDON="no"
diff --git a/packages/network/connman/url b/packages/network/connman/url
deleted file mode 100644
index 70560b9fba..0000000000
--- a/packages/network/connman/url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.kernel.org/pub/linux/network/connman/connman-0.54.tar.bz2