3 files changed, 55 insertions, 41 deletions
diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc
new file mode 100644
index 0000000000..cbc4010c32
--- /dev/null
+++ b/packages/connman/connman.inc
@@ -0,0 +1,42 @@
+HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
+SUMMARY  = "Moblin Connection Manager"
+LICENSE  = "GPL"
+
+DEPENDS  = "dbus glib-2.0"
+RDEPENDS = "dhcp-client wpa-supplicant resolvconf"
+
+EXTRA_OECONF += " \
+    ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
+    ac_cv_path_DHCLIENT=/sbin/dhclient "
+
+INITSCRIPT_NAME = "connman"
+INITSCRIPT_PARAMS = "defaults 22"
+
+inherit autotools pkgconfig update-rc.d
+
+do_install_append() {
+    install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
+}
+
+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*"
+FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
+                    ${libdir}/connman/scripts/.debug"
+
+python populate_packages_prepend() {
+	plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
+	plugin_name = bb.data.expand('${PN}-plugin-%s', d)
+        do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
+}
+
+do_stage() {
+    autotools_stage_all
+}
diff --git a/packages/connman/connman_0.1.bb b/packages/connman/connman_0.1.bb
new file mode 100644
index 0000000000..8159b9410d
--- /dev/null
+++ b/packages/connman/connman_0.1.bb
@@ -0,0 +1,11 @@
+require connman.inc
+PR       = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF += " \
+	--disable-gtk-doc "
+
+SRC_URI  = "ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
+            file://connman "
+
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index bc5840fb4c..f22125e16e 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,50 +1,11 @@
-HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
-SUMMARY  = "Moblin Connection Manager"
+require connman.inc
 PV       = "0.0+gitr${SRCREV}"
 PR       = "r4.02"
 PE       = "1"
 S        = "${WORKDIR}/git"
-LICENSE  = "GPL"
 
-DEPENDS  = "libgdbus dbus glib-2.0 hal"
-RDEPENDS = "dhcp-client wpa-supplicant resolvconf"
-
-EXTRA_OECONF += " \
-    ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
-    ac_cv_path_DHCLIENT=/sbin/dhclient "
+DEPENDS  += "libgdbus hal"
 
 SRC_URI  = "git://git.moblin.org/repos/projects/connman.git;protocol=http \
             file://use_nm_in_cross_compiling.patch;patch=1\
             file://connman "
-
-INITSCRIPT_NAME = "connman"
-INITSCRIPT_PARAMS = "defaults 22"
-
-inherit autotools pkgconfig update-rc.d
-
-do_install_append() {
-    install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
-}
-
-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*"
-FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
-                    ${libdir}/connman/scripts/.debug"
-
-python populate_packages_prepend() {
-	plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
-	plugin_name = bb.data.expand('${PN}-plugin-%s', d)
-        do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
-}
-
-do_stage() {
-    autotools_stage_all
-}