summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2008-01-28 00:12:34 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2008-01-28 00:12:34 +0000
commit3e3426a943c22b95ca15c1c9b72c47502ecc4e28 (patch)
tree48f0b6937ff6063eecc345fdb4c54e621b410d69 /packages
parentb91082455470d09ff8302e07ccac9920c8a2a924 (diff)
parentc291df04a3913d8559159f82c3b0ffa4dae7de33 (diff)
merge of '2b629c70f36efd84d9157bcab5d582d59fa8258e'
and 'a99dc9b34551aa3889d7057538bf2e37b0471af1'
Diffstat (limited to 'packages')
-rw-r--r--packages/bluez/bluez-cups-backend_3.23.bb2
-rw-r--r--packages/bluez/bluez-gstreamer-plugin_3.23.bb2
-rw-r--r--packages/bluez/bluez-utils-alsa_3.23.bb1
-rw-r--r--packages/bluez/bluez-utils3.inc3
-rw-r--r--packages/bluez/bluez-utils_3.23.bb2
5 files changed, 7 insertions, 3 deletions
diff --git a/packages/bluez/bluez-cups-backend_3.23.bb b/packages/bluez/bluez-cups-backend_3.23.bb
index d92b53220f..46ca0becf0 100644
--- a/packages/bluez/bluez-cups-backend_3.23.bb
+++ b/packages/bluez/bluez-cups-backend_3.23.bb
@@ -1,5 +1,5 @@
require bluez-utils3.inc
-
+PR = "r1"
DEPENDS += "cups"
# see bluez-utils3.inc for the explanation of these option
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.23.bb b/packages/bluez/bluez-gstreamer-plugin_3.23.bb
index 123259b3a7..36e9ca3d91 100644
--- a/packages/bluez/bluez-gstreamer-plugin_3.23.bb
+++ b/packages/bluez/bluez-gstreamer-plugin_3.23.bb
@@ -1,5 +1,5 @@
require bluez-utils3.inc
-
+PR = "r1"
DEPENDS += "gstreamer gst-plugins-base "
# see bluez-utils3.inc for the explanation of these option
diff --git a/packages/bluez/bluez-utils-alsa_3.23.bb b/packages/bluez/bluez-utils-alsa_3.23.bb
index 5c4a07e8ab..0d7836fa65 100644
--- a/packages/bluez/bluez-utils-alsa_3.23.bb
+++ b/packages/bluez/bluez-utils-alsa_3.23.bb
@@ -1,4 +1,5 @@
require bluez-utils3.inc
+PR = "r1"
DEPENDS += "alsa-lib"
diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index b995d6990c..3932d722ee 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -8,11 +8,14 @@ RREPLACES = "bluez-utils-dbus"
RCONFLICTS_${PN} = "bluez-utils-nodbus"
LICENSE = "GPL"
+FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
+
# ti patch should be sent it upstream!
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
file://hciattach-ti-bts.patch;patch=1"
+
S = "${WORKDIR}/bluez-utils-${PV}"
inherit autotools update-rc.d
diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb
index f96d1f2ba4..37365f67fc 100644
--- a/packages/bluez/bluez-utils_3.23.bb
+++ b/packages/bluez/bluez-utils_3.23.bb
@@ -1,5 +1,5 @@
require bluez-utils3.inc
-PR = "r1"
+PR = "r2"
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \