diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-12-16 09:45:59 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-12-16 09:45:59 +0100 |
| commit | fde85c6fedd02f0dab19e58afecd2f8133061d9d (patch) | |
| tree | e54dfef622c780a7b480108ce59943b15772ac4c | |
| parent | 19d4137e9dcebd905b830e45fa05a082785f66f2 (diff) | |
| parent | d4cc081669b2cbdfea1e5d1ae98bf9421a65307b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/checksums.ini | 8 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 1 | ||||
| -rw-r--r-- | packages/connman/connman_0.1.bb | 2 | ||||
| -rw-r--r-- | packages/connman/connman_0.2.bb | 9 | ||||
| -rw-r--r-- | packages/connman/connman_0.4.bb | 9 | ||||
| -rw-r--r-- | packages/tasks/task-fso-compliance.bb | 1 |
6 files changed, 28 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 7ba31c72ca..47f127b3d1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3218,6 +3218,14 @@ sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859 md5=493aa462d01d7c5f0461d6d7f9f549b1 sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1 +[ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz] +md5=bf48aa07d3c1e5fe272c7f139bc01fc9 +sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97 + +[ftp://ftp.moblin.org/connman/releases/connman-0.4.tar.gz] +md5=f5b84040e99eeff3a18e11e83b1eb12a +sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de + [http://www.conserver.com/conserver-8.1.14.tar.gz] md5=f7825728e5af8992ed4a99fb560a3df8 sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 243bf7ea1e..944fbfa47d 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -175,6 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02" PREFERRED_VERSION_confuse ?= "2.5" PREFERRED_VERSION_confuse-native ?= "2.5" PREFERRED_VERSION_connect ?= "0.1" +PREFERRED_VERSION_connman ?= "0.4" PREFERRED_VERSION_conserver ?= "8.1.14" PREFERRED_VERSION_console-tools ?= "0.3.2" PREFERRED_VERSION_contacts ?= "0.7" diff --git a/packages/connman/connman_0.1.bb b/packages/connman/connman_0.1.bb index 8159b9410d..c9eb90cab3 100644 --- a/packages/connman/connman_0.1.bb +++ b/packages/connman/connman_0.1.bb @@ -1,8 +1,6 @@ require connman.inc PR = "r0" -DEFAULT_PREFERENCE = "-1" - EXTRA_OECONF += " \ --disable-gtk-doc " diff --git a/packages/connman/connman_0.2.bb b/packages/connman/connman_0.2.bb new file mode 100644 index 0000000000..c9eb90cab3 --- /dev/null +++ b/packages/connman/connman_0.2.bb @@ -0,0 +1,9 @@ +require connman.inc +PR = "r0" + +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_0.4.bb b/packages/connman/connman_0.4.bb new file mode 100644 index 0000000000..c9eb90cab3 --- /dev/null +++ b/packages/connman/connman_0.4.bb @@ -0,0 +1,9 @@ +require connman.inc +PR = "r0" + +EXTRA_OECONF += " \ + --disable-gtk-doc " + +SRC_URI = "ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \ + file://connman " + diff --git a/packages/tasks/task-fso-compliance.bb b/packages/tasks/task-fso-compliance.bb index 770b7f8585..6ff09fe896 100644 --- a/packages/tasks/task-fso-compliance.bb +++ b/packages/tasks/task-fso-compliance.bb @@ -9,6 +9,7 @@ inherit task RDEPENDS_${PN} = "\ frameworkd \ fso-gpsd \ + connman \ " RRECOMMENDS_${PN} = "\ |