bluez-utils 3.23 and friends: Set FILESPATH explicitly and correctly.

* Having a "files" dir in a multi-package directory is shooting everyone
in leg. There should be per-package dirs or else stuff will be taken from
god-knows-where.
* So, add FILESPATH for all bluez-utils descendant packages.
* This fixes build of bluez-cups-backend, which failed in do_patch
because some patch wa taken from wrong, catch-all "files" dir.

diff --git a/packages/bluez/bluez-cups-backend_3.23.bb b/packages/bluez/bluez-cups-backend_3.23.bb
index d92b532..46ca0be 100644 (file)
--- 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 123259b..36e9ca3 100644 (file)
--- 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 5c4a07e..0d7836f 100644 (file)
--- 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 b995d69..3932d72 100644 (file)
--- 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 f96d1f2..37365f6 100644 (file)
--- 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 = " \