[oe-commits] org.oe.dev bluez-utils: enable cups backend and package it seperately so only bluez-cups-backend depends on cups at runtime

[koen commit]

bluez-utils: enable cups backend and package it seperately so only bluez-cups-backend depends on cups at runtime

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b884b1b98f879e3e7f879b8aa5d83b205eada606
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b884b1b98f879e3e7f879b8aa5d83b205eada606
Files:
1
packages/bluez/bluez-utils_3.7.bb
packages/bluez/bluez-utils.inc
packages/bluez/bluez-utils_3.9.bb
Diffs:

#
# mt diff -r42e4a37b3bc1bce6b8ffb4ca48e06f8b74e5797a -rb884b1b98f879e3e7f879b8aa5d83b205eada606
#
# 
# 
# add_file "packages/bluez/bluez-utils_3.7.bb"
#  content [7644ffe67fd0cf94cfed472498a4263e024d4de3]
# 
# patch "packages/bluez/bluez-utils.inc"
#  from [66a706c3dab2e5328b98afbba43e831eeea1ccd8]
#    to [b6f94ad872bf8f1fdc0b84bee413223558ae0c61]
# 
# patch "packages/bluez/bluez-utils_3.9.bb"
#  from [76237d6bf0ea493d83984610efaade19e986aca9]
#    to [16ab945ab8701ac172bb97516712338ec13a8b7e]
# 
============================================================
--- packages/bluez/bluez-utils_3.7.bb	7644ffe67fd0cf94cfed472498a4263e024d4de3
+++ packages/bluez/bluez-utils_3.7.bb	7644ffe67fd0cf94cfed472498a4263e024d4de3
@@ -0,0 +1,56 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs-${PV} dbus cups alsa-lib openobex"
+PROVIDES = "bluez-utils-dbus"
+RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
+RREPLACES = "bluez-utils-dbus"
+RCONFLICTS_${PN} = "bluez-utils-nodbus"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+	file://hcid.conf \
+	file://02dtl1_cs.sh \
+	file://hciattach-ti-bts.patch;patch=1"
+
+# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
+# Let's default to that instead of 'any' until further notice...
+SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
+
+S = "${WORKDIR}/bluez-utils-${PV}"
+
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-obex --enable-alsa --enable-cups"
+#  --enable-obex           enable OBEX support
+#  --enable-alsa           enable ALSA support
+#  --enable-cups           install CUPS backend support
+#  --enable-bccmd          install BCCMD interface utility
+#  --enable-avctrl         install Audio/Video control utility
+#  --enable-hid2hci        install HID mode switching utility
+#  --enable-dfutool        install DFU firmware upgrade utility
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
+do_install_append() {
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/  ${D}${sysconfdir}/apm/event.d/
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+	install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+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"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups" 
============================================================
--- packages/bluez/bluez-utils.inc	66a706c3dab2e5328b98afbba43e831eeea1ccd8
+++ packages/bluez/bluez-utils.inc	b6f94ad872bf8f1fdc0b84bee413223558ae0c61
@@ -1,7 +1,7 @@ PRIORITY = "optional"
 DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
 SECTION = "console"
 PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} dbus"
+DEPENDS = "bluez-libs-${PV} dbus cups"
 PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
@@ -20,7 +20,7 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-cups"
 #  --enable-obex           enable OBEX support
 #  --enable-alsa           enable ALSA support
 #  --enable-cups           install CUPS backend support
@@ -48,7 +48,10 @@ CONFFILES_${PN} = "${sysconfdir}/bluetoo
 CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
 	${sysconfdir}/default/bluetooth"
 
-PACKAGES =+ "${PN}-ciptool"
+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"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
============================================================
--- packages/bluez/bluez-utils_3.9.bb	76237d6bf0ea493d83984610efaade19e986aca9
+++ packages/bluez/bluez-utils_3.9.bb	16ab945ab8701ac172bb97516712338ec13a8b7e
@@ -1,3 +1,3 @@ require bluez-utils.inc
 require bluez-utils.inc
 
+PR = "r3"
-PR = "r2"