[oe-commits] Constantin Musca : bluez: set correct udevdir
git at git.openembedded.org
git at git.openembedded.org
Wed Dec 19 17:53:47 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 9e6cb6326ab688046a712e08fd073efb010db451
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9e6cb6326ab688046a712e08fd073efb010db451
Author: Constantin Musca <constantinx.musca at intel.com>
Date: Fri Dec 14 16:20:09 2012 +0200
bluez: set correct udevdir
fix-udev-paths.patch: add udevdir/udevrulesdir options
Fix the following warning:
WARNING: QA Issue: bluez4: Files/directories were installed but not shipped
/lib/udev/hid2hci
/lib/udev/.debug
/lib/udev/.debug/hid2hci
[YOCTO #3438]
Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
.../bluez/bluez4-4.101/fix-udev-paths.patch | 37 ++++++++++++++++++++
meta/recipes-connectivity/bluez/bluez4.inc | 2 +
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 7 ++--
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
new file mode 100644
index 0000000..8089914
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
@@ -0,0 +1,37 @@
+Add udevdir/udevrulesdir options
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
+
+Index: bluez-4.101/Makefile.am
+===================================================================
+--- bluez-4.101.orig/Makefile.am
++++ bluez-4.101/Makefile.am
+@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf
+ include Makefile.tools
+
+ if DATAFILES
+-rulesdir = @UDEV_DIR@/rules.d
++rulesdir = @UDEV_RULES_DIR@
+
+ udev_files =
+
+Index: bluez-4.101/configure.ac
+===================================================================
+--- bluez-4.101.orig/configure.ac
++++ bluez-4.101/configure.ac
+@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then
+ fi
+ AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
+
++AC_ARG_WITH([udevdir],
++ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
++ [], [with_udevdir=/lib/udev/])
++AC_SUBST([UDEV_DIR], [$with_udevdir])
++
++AC_ARG_WITH([udevrulesdir],
++ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
++ [], [with_udevrulesdir=/lib/udev/rules.d])
++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
++
+ AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 6ddd58d..bff24d3 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -39,5 +39,7 @@ EXTRA_OECONF = "\
--disable-cups \
--enable-test \
--enable-datafiles \
+ --with-udevdir=${base_libdir}/udev \
+ --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d \
"
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index f1a2fe7..4225999 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -1,9 +1,10 @@
require bluez4.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://bluetooth.conf \
- file://sbc_mmx.patch"
+ file://sbc_mmx.patch \
+ file://fix-udev-paths.patch"
SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
@@ -22,7 +23,7 @@ ALLOW_EMPTY_libasound-module-bluez = "1"
PACKAGES =+ "libasound-module-bluez"
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
+FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
${libdir}/alsa-lib/*.la \
More information about the Openembedded-commits
mailing list