[oe-commits] org.oe.dev bluez: Stop 02dtl1_cs.sh the nasty hack from breaking everyone's BT connection.
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jul 5 02:58:10 UTC 2007
bluez: Stop 02dtl1_cs.sh the nasty hack from breaking everyone's BT connection.
* This sloppily written script just unconditionally breaks a BT connection on
suspend.
* So, instead, make only DTL1 victims suffer it thru:
1. Make a separate package for it.
2. Make kernel-module-dtl1-cs and nothing else RDEPENDS on it.
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 3e0dc8db46885f658b4c7339a550d0b35d3a1166
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3e0dc8db46885f658b4c7339a550d0b35d3a1166
Files:
1
packages/bluez/bluez-dtl1-workaround_1.0.bb
classes/kernel.bbclass
packages/bluez/bluez-utils.inc
packages/bluez/bluez-utils_3.11.bb
packages/bluez/bluez-utils_3.12.bb
packages/bluez/bluez-utils_3.4.bb
packages/bluez/bluez-utils_3.7.bb
packages/bluez/bluez-utils_3.8.bb
Diffs:
#
# mt diff -re25c5e38674da9988b268e6af89a90ecbbe1dac6 -r3e0dc8db46885f658b4c7339a550d0b35d3a1166
#
#
#
# add_file "packages/bluez/bluez-dtl1-workaround_1.0.bb"
# content [90cbf897612084f39d60148ab983370a7ff3bb17]
#
# patch "classes/kernel.bbclass"
# from [b3df4a5e97f27bbbdeedf06373b1f8a115c48333]
# to [ee5ce321b13cfb7f7f7a9981e5fc1c14e4f65e81]
#
# patch "packages/bluez/bluez-utils.inc"
# from [41deef17c0f5dace32506f5702ea35539c41bff6]
# to [13716750ab0571681b9e8449ea1ce394c881897e]
#
# patch "packages/bluez/bluez-utils_3.11.bb"
# from [4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10]
# to [0b6adc1cba101361b308c4adcb33d6ec603c6be6]
#
# patch "packages/bluez/bluez-utils_3.12.bb"
# from [c9a40ce5190424b1ede28c8cc855bb8d094a3186]
# to [bff8a6de03a41e1f81fd85fc8e43f72ae0ccc458]
#
# patch "packages/bluez/bluez-utils_3.4.bb"
# from [6e23c5824e702fbbaab762244716ebfd9bcdcc4b]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
# patch "packages/bluez/bluez-utils_3.7.bb"
# from [7644ffe67fd0cf94cfed472498a4263e024d4de3]
# to [997459c635cbd92f7c2b398e5962dd23bf5c9623]
#
# patch "packages/bluez/bluez-utils_3.8.bb"
# from [dd085c7f50957785f015790ff90f72a6eab37cf1]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
============================================================
--- packages/bluez/bluez-dtl1-workaround_1.0.bb 90cbf897612084f39d60148ab983370a7ff3bb17
+++ packages/bluez/bluez-dtl1-workaround_1.0.bb 90cbf897612084f39d60148ab983370a7ff3bb17
@@ -0,0 +1,14 @@
+DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume."
+SECTION = "console"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "file://02dtl1_cs.sh"
+
+do_install() {
+ install -d ${D}${sysconfdir}/apm/event.d/
+ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
============================================================
--- classes/kernel.bbclass b3df4a5e97f27bbbdeedf06373b1f8a115c48333
+++ classes/kernel.bbclass ee5ce321b13cfb7f7f7a9981e5fc1c14e4f65e81
@@ -183,6 +183,10 @@ ALLOW_EMPTY_kernel-image = "1"
ALLOW_EMPTY_kernel-base = "1"
ALLOW_EMPTY_kernel-image = "1"
+# Userspace workarounds for kernel modules issues
+# This is shame, fix the kernel instead!
+RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+
pkg_postinst_kernel-image () {
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
mkdir -p $D/lib/modules/${KERNEL_VERSION}
============================================================
--- packages/bluez/bluez-utils.inc 41deef17c0f5dace32506f5702ea35539c41bff6
+++ packages/bluez/bluez-utils.inc 13716750ab0571681b9e8449ea1ce394c881897e
@@ -10,7 +10,6 @@ SRC_URI = "http://bluez.sourceforge.net/
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 \
file://handle-eintr.patch;patch=1;status=applied"
@@ -41,7 +40,6 @@ do_install_append() {
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/
install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/
}
============================================================
--- packages/bluez/bluez-utils_3.11.bb 4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10
+++ packages/bluez/bluez-utils_3.11.bb 0b6adc1cba101361b308c4adcb33d6ec603c6be6
@@ -6,9 +6,8 @@ SRC_URI = "http://bluez.sourceforge.net/
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
"
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = " \
--enable-bccmd \
@@ -84,9 +83,6 @@ FILES_${PN} = " \
${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 \
"
============================================================
--- packages/bluez/bluez-utils_3.12.bb c9a40ce5190424b1ede28c8cc855bb8d094a3186
+++ packages/bluez/bluez-utils_3.12.bb bff8a6de03a41e1f81fd85fc8e43f72ae0ccc458
@@ -1,12 +1,11 @@ SRC_URI = "http://bluez.sourceforge.net/
require bluez-utils.inc
DEPENDS += "glib-2.0"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = " \
--enable-bccmd \
@@ -82,9 +81,6 @@ FILES_${PN} = " \
${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 \
"
============================================================
--- packages/bluez/bluez-utils_3.4.bb 6e23c5824e702fbbaab762244716ebfd9bcdcc4b
+++ packages/bluez/bluez-utils_3.4.bb 4bef33e5c1517513f7fef04b79b32f580b615259
@@ -11,7 +11,6 @@ SRC_URI = "http://bluez.sourceforge.net/
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
@@ -41,7 +40,6 @@ do_install_append() {
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 \
============================================================
--- packages/bluez/bluez-utils_3.7.bb 7644ffe67fd0cf94cfed472498a4263e024d4de3
+++ packages/bluez/bluez-utils_3.7.bb 997459c635cbd92f7c2b398e5962dd23bf5c9623
@@ -11,7 +11,6 @@ SRC_URI = "http://bluez.sourceforge.net/
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
@@ -41,7 +40,6 @@ do_install_append() {
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 \
============================================================
--- packages/bluez/bluez-utils_3.8.bb dd085c7f50957785f015790ff90f72a6eab37cf1
+++ packages/bluez/bluez-utils_3.8.bb 4bef33e5c1517513f7fef04b79b32f580b615259
@@ -7,11 +7,10 @@ LICENSE = "GPL"
RREPLACES = "bluez-utils-dbus"
RCONFLICTS_${PN} = "bluez-utils-nodbus"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
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
@@ -41,7 +40,6 @@ do_install_append() {
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 \
More information about the Openembedded-commits
mailing list