This email list is read-only.  Emails sent to this list will be discarded
----------------------------------
 meta-moblin/packages/linux/linux-moblin_2.6.27.bb |    2 +-
 meta-moblin/packages/tasks/task-moblin.bb         |    4 +-
 meta/packages/connman/connman.bb                  |   35 +++++++++++++++
 meta/packages/connman/connman_git.bb              |   48 ---------------------
 4 files changed, 39 insertions(+), 50 deletions(-)

New commits:
commit 2844e317e89130e231ec29bbf94529f4cf8ee49e
Author: Peter Zhu <[EMAIL PROTECTED]>
Date:   Mon Nov 17 18:13:59 2008 +0800

    update conmmman

commit 0cf9e5e7bb4296726e3ca3f1631e35a1f1eb45ea
Merge: d6740d45e56fce0feef261b4e5633816a76540ea 
3cb579e332dd7e2faf8b7a71e542714628970876
Author: Peter Zhu <[EMAIL PROTECTED]>
Date:   Mon Nov 17 10:23:22 2008 +0800

    Merge commit 'staging/martin/enable_connman'

commit 3cb579e332dd7e2faf8b7a71e542714628970876
Author: Martin Xu <[EMAIL PROTECTED]>
Date:   Fri Nov 14 16:42:38 2008 +0800

    upgrade task-moblin PR number

commit 2255b65ed1b791395cde5cd0e8eb274b26f43ef0
Author: Martin Xu <[EMAIL PROTECTED]>
Date:   Fri Nov 14 16:39:35 2008 +0800

    init connman bb file


Diff in this email is a maximum of 400 lines.
diff --git a/meta-moblin/packages/linux/linux-moblin_2.6.27.bb 
b/meta-moblin/packages/linux/linux-moblin_2.6.27.bb
index 8715401..e01e3b3 100644
--- a/meta-moblin/packages/linux/linux-moblin_2.6.27.bb
+++ b/meta-moblin/packages/linux/linux-moblin_2.6.27.bb
@@ -1,6 +1,6 @@
 require linux-moblin.inc
 
-PR = "r4"
+PR = "r5"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-moblin/packages/tasks/task-moblin.bb 
b/meta-moblin/packages/tasks/task-moblin.bb
index a886613..8bc94b1 100644
--- a/meta-moblin/packages/tasks/task-moblin.bb
+++ b/meta-moblin/packages/tasks/task-moblin.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Tasks for Moblin"
-PR = "r31"
+PR = "r33"
 
 PACKAGES = "\
     task-moblin-apps-console \
@@ -31,6 +31,8 @@ RDEPENDS_task-moblin-apps-console = "\
     avahi-daemon \
     dropbear \
     dbus \
+    connman \
+    ubootchart \
     portmap \
     psplash"
 
diff --git a/meta/packages/connman/connman.bb b/meta/packages/connman/connman.bb
new file mode 100644
index 0000000..3a7df8d
--- /dev/null
+++ b/meta/packages/connman/connman.bb
@@ -0,0 +1,35 @@
+HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php";
+SUMMARY  = "Moblin Connection Manager"
+PV       = "0.0.371-4a7178f"
+PR       = "r5"
+S        = "${WORKDIR}/connman-${PV}"
+LICENSE  = "GPL"
+
+DEPENDS  = "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 "
+
+SRC_URI  = "ftp://ftp.moblin.org/connman/snapshots/connman-${PV}.tar.gz\
+            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
+}
+
+FILES_${PN} = "/usr/sbin/* \
+              ${libdir}/connman/plugins/*.so \
+              ${libdir}/connman/scripts/* \
+               ${sysconfdir}/init.d/connman \
+              ${sysconfdir}/dbus-1/system.d/*.conf \
+              ${datadir}/dbus-1/system-services/*.service"
+FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
+                    ${libdir}/connman/scripts/.debug"
+
diff --git a/meta/packages/connman/connman_git.bb 
b/meta/packages/connman/connman_git.bb
deleted file mode 100644
index e8ad21e..0000000
--- a/meta/packages/connman/connman_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php";
-SUMMARY  = "Moblin Connection Manager"
-PV       = "0.0+git${SRCREV}"
-PR       = "r4"
-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 "
-
-SRC_URI  = "git://moblin.org/repos/projects/connman.git;protocol=http \
-            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, '^lib(.*).so$', plugin_name, '${PN} 
plugin for %s', extra_depends='' )
-}
-
-do_stage() {
-    autotools_stage_all
-}
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits

Reply via email to