Patchwork [5/5] bluez5: Set udev variables using pkg-config

login
register
mail settings
Submitter Cristian Iorga
Date July 12, 2013, 2:06 p.m.
Message ID <1373637989-24991-6-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/53577/
State New
Headers show

Comments

Cristian Iorga - July 12, 2013, 2:06 p.m.
From: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc    |    4 ++--
 meta/recipes-connectivity/bluez5/bluez5_5.7.bb |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Ross Burton - July 12, 2013, 4:05 p.m.
On 12 July 2013 15:06, Cristian Iorga <cristian.iorga@intel.com> wrote:
> +  --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \

Again this commit should be squashed, but if we're doing this line in
particular then we're negating the point of fix-udev-paths.patch
introduced in 1/5.  Drop the patch and this argument.

Ross

Patch

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 86a9bbe..240e13d 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -37,8 +37,8 @@  EXTRA_OECONF = "\
   --disable-cups \
   --enable-test \
   --enable-datafiles \
-  --with-udevdir=${base_libdir}/udev \
-  --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d \
+  --with-udevdir=`pkg-config --variable=udevdir udev` \
+  --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
   ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--disable-systemd', d)} \
 "
 
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.7.bb b/meta/recipes-connectivity/bluez5/bluez5_5.7.bb
index 824800b..0160f61 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.7.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.7.bb
@@ -34,5 +34,5 @@  FILES_${PN}-dbg += "\
   ${libdir}/${PN}/bluetooth/.debug \
   ${libdir}/bluetooth/plugins/.debug \
   ${libdir}/*/.debug \
-  ${base_libdir}/udev/.debug \
+  */udev/.debug \
   "