diff options
| author |   Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-29 11:36:22 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-29 11:36:22 +0100 |
| commit | c83c8a845f8a286b90ca6c186831900fc2246318 (patch) | |
| tree | 4b8ac74d2497ff20cdaab5ca397d1cba53bcc0e8 | |
| parent | f1fa8a2c36dd4b9fbe7c6116a093b6c5241eeefc (diff) | |
| parent | 1aa4cf26c3e74fd9db5a4c08aa0fa43398cfe06e (diff) | |
| download | openembedded-c83c8a845f8a286b90ca6c186831900fc2246318.tar.gz | |
Merge branch 'fso/milestone5' of git@git.openembedded.net:openembedded into fso/milestone5
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 2 | ||||
| -rw-r--r-- | packages/connman/connman_0.10.bb (renamed from packages/connman/connman_0.8.bb) | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 478a195d95..69cd471e86 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3338,6 +3338,10 @@ sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859 md5=493aa462d01d7c5f0461d6d7f9f549b1 sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1 +[ftp://ftp.moblin.org/connman/releases/connman-0.10.tar.gz] +md5=094743343e062ea370fcd461aa48a7fe +sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e + [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz] md5=bf48aa07d3c1e5fe272c7f139bc01fc9 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97 diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index b176b2c700..fc68b98a51 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -175,7 +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.8" +PREFERRED_VERSION_connman ?= "0.10" 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.8.bb b/packages/connman/connman_0.10.bb index c8f0d2ba55..0fa2108222 100644 --- a/packages/connman/connman_0.8.bb +++ b/packages/connman/connman_0.10.bb @@ -1,5 +1,5 @@ require connman.inc -PR = "r4" +PR = "r0" EXTRA_OECONF += "\ --disable-gtk-doc \ |