diff options
| author | Philip Balister <philip@balister.org> | 2009-07-19 16:22:23 -0400 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2009-07-19 16:22:23 -0400 |
| commit | 6568b9e34d43470336d0240fa8dbfc5122a9474e (patch) | |
| tree | 72392c0a276bde79fe4991b60081738d6e843f68 /recipes/bluez | |
| parent | ff4bd21194d38ee0b9f6892e3cae5ffc34504cad (diff) | |
| parent | 918aa5c5a17a342eaafad143cdc0ccff059e5884 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/bluez')
| -rw-r--r-- | recipes/bluez/bluez-libs.inc | 6 | ||||
| -rw-r--r-- | recipes/bluez/bluez-utils3.inc | 6 | ||||
| -rw-r--r-- | recipes/bluez/bluez4.inc | 5 |
3 files changed, 3 insertions, 14 deletions
diff --git a/recipes/bluez/bluez-libs.inc b/recipes/bluez/bluez-libs.inc index 1de371840a..d740bd80a9 100644 --- a/recipes/bluez/bluez-libs.inc +++ b/recipes/bluez/bluez-libs.inc @@ -5,12 +5,6 @@ HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" PR = "r0" -python () { - distro = bb.data.getVar("DISTRO_NAME", d, 1) - if distro == "Angstrom": - raise bb.parse.SkipPackage("Angstrom doesn't support bluez3 anymore, only bluez4") -} - SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc index 824a753cc1..df071b76d9 100644 --- a/recipes/bluez/bluez-utils3.inc +++ b/recipes/bluez/bluez-utils3.inc @@ -8,12 +8,6 @@ RREPLACES = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" -python () { - distro = bb.data.getVar("DISTRO_NAME", d, 1) - if distro == "Angstrom": - raise bb.parse.SkipPackage("Angstrom doesn't support bluez3 anymore, only bluez4") -} - FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc index 4c3bfb8e8c..431faf6152 100644 --- a/recipes/bluez/bluez4.inc +++ b/recipes/bluez/bluez4.inc @@ -4,10 +4,11 @@ PRIORITY = "optional" DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib" HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" -INC_PR = "r1" +INC_PR = "r2" # For angstrom we want this to replace at least bluez-libs -PROVIDES_append_angstrom = " bluez-utils bluez-libs" +PROVIDES_append_angstrom = " bluez-utils-dbus bluez-utils bluez-libs" +RPROVIDES_bluez4-dev_angstrom = "bluez-libs-dev" SRC_URI = "\ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ |