[oe-commits] org.oe.dev bluez-utils: enhance 3.10.1, move some stuff from include
koen commit
openembedded-commits at lists.openembedded.org
Tue May 15 12:52:38 UTC 2007
bluez-utils: enhance 3.10.1, move some stuff from include
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: f77fcd9ae9729a45714c2409aef8df3febe70022
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f77fcd9ae9729a45714c2409aef8df3febe70022
Files:
1
packages/bluez/bluez-utils.inc
packages/bluez/bluez-utils_3.10.1.bb
packages/bluez/bluez-utils_3.9.bb
Diffs:
#
# mt diff -r9b6c5160cff651f4a9456777e0128466a236ebe4 -rf77fcd9ae9729a45714c2409aef8df3febe70022
#
#
#
# patch "packages/bluez/bluez-utils.inc"
# from [2472f8b5df3750d77d906ea4d6b2dae0eac37125]
# to [41deef17c0f5dace32506f5702ea35539c41bff6]
#
# patch "packages/bluez/bluez-utils_3.10.1.bb"
# from [edf378325f445ecf5fcf771066aa921b46d7edb2]
# to [fd4419b18e6b9a21aefd2216ea12ad5ac819765d]
#
# patch "packages/bluez/bluez-utils_3.9.bb"
# from [e762ad252986d2f0701aed3a80d0d310c0f13b6d]
# to [a20b7cda425b77d5d8a2ed2700f88ba4d5298129]
#
============================================================
--- packages/bluez/bluez-utils.inc 2472f8b5df3750d77d906ea4d6b2dae0eac37125
+++ packages/bluez/bluez-utils.inc 41deef17c0f5dace32506f5702ea35539c41bff6
@@ -48,10 +48,10 @@ CONFFILES_${PN} = "${sysconfdir}/bluetoo
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
${sysconfdir}/default/bluetooth"
-PACKAGES =+ "${PN}-ciptool bluez-cups-backend"
-FILES_${PN}-ciptool = "/bin/ciptool"
-RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
-RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
+PACKAGES =+ " bluez-cups-backend"
+FILES_${PN} += " ${libdir}/alsa-lib/*.so "
+FILES_${PN}-dev += " ${libdir}/alsa-lib/*.la "
+
FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
RDEPENDS_bluez-cups-backend = "cups"
============================================================
--- packages/bluez/bluez-utils_3.10.1.bb edf378325f445ecf5fcf771066aa921b46d7edb2
+++ packages/bluez/bluez-utils_3.10.1.bb fd4419b18e6b9a21aefd2216ea12ad5ac819765d
@@ -8,11 +8,10 @@ SRC_URI = "http://bluez.sourceforge.net/
file://hcid.conf \
file://02dtl1_cs.sh \
"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = " \
--enable-bccmd \
- --enable-bcm203x \
--disable-hid2hci \
--disable-alsa \
--enable-cups \
@@ -63,7 +62,7 @@ EXTRA_OECONF = " \
# --disable-hid2hci
-PACKAGES =+ "${PN}-compat bluez-cups-backend"
+PACKAGES =+ "${PN}-compat"
CONFFILES_${PN} = " \
${sysconfdir}/bluetooth/hcid.conf \
@@ -75,30 +74,38 @@ FILES_${PN} = " \
"
FILES_${PN} = " \
- ${sbindir}/hcid \
+ ${base_sbindir}/hcid \
${libdir}/bluetooth \
${sysconfdir}/init.d/bluetooth \
${sysconfdir}/bluetooth/*.service \
${sysconfdir}/bluetooth/hcid.conf \
${sysconfdir}/default \
${sysconfdir}/dbus-1 \
- ${bindir}/hciattach \
- "
+ ${base_sbindir}/hciattach \
+ "
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/.debug \
+ "
+
FILES_${PN}-compat = " \
- ${bindir}/sdptool \
- ${bindir}/dund \
- ${bindir}/rctest \
- ${bindir}/ciptool \
- ${bindir}/l2test \
- ${bindir}/rfcomm \
- ${bindir}/hcitool \
- ${bindir}/pand \
- ${bindir}/hidd \
- ${bindir}/l2ping \
- ${bindir}/hciconfig \
- ${bindir}/bccmd \
- ${bindir}/hciemu \
+ ${base_bindir}/sdptool \
+ ${base_bindir}/dund \
+ ${base_bindir}/rctest \
+ ${base_bindir}/ciptool \
+ ${base_bindir}/l2test \
+ ${base_bindir}/rfcomm \
+ ${base_bindir}/hcitool \
+ ${base_bindir}/pand \
+ ${base_bindir}/hidd \
+ ${base_bindir}/l2ping \
+ ${base_sbindir}/hciconfig \
+ ${base_sbindir}/bccmd \
+ ${base_sbindir}/hciemu \
+ ${base_bindir}/passkey-agent \
${sysconfdir}/bluetooth/rfcomm.conf \
"
============================================================
--- packages/bluez/bluez-utils_3.9.bb e762ad252986d2f0701aed3a80d0d310c0f13b6d
+++ packages/bluez/bluez-utils_3.9.bb a20b7cda425b77d5d8a2ed2700f88ba4d5298129
@@ -1,3 +1,10 @@ require bluez-utils.inc
require bluez-utils.inc
+PACKAGES =+ "${PN}-ciptool"
+
+FILES_${PN}-ciptool = "/bin/ciptool"
+RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
+RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
+
+
PR = "r4"
More information about the Openembedded-commits
mailing list