From e45268ec831c439a5159e147a02dccce7a6b4d0e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Jul 2007 23:34:18 +0000 Subject: 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. --- packages/bluez/bluez-dtl1-workaround_1.0.bb | 14 ++++++++++++++ packages/bluez/bluez-utils.inc | 2 -- packages/bluez/bluez-utils_3.11.bb | 6 +----- packages/bluez/bluez-utils_3.12.bb | 6 +----- packages/bluez/bluez-utils_3.4.bb | 2 -- packages/bluez/bluez-utils_3.7.bb | 2 -- packages/bluez/bluez-utils_3.8.bb | 4 +--- 7 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 packages/bluez/bluez-dtl1-workaround_1.0.bb (limited to 'packages') diff --git a/packages/bluez/bluez-dtl1-workaround_1.0.bb b/packages/bluez/bluez-dtl1-workaround_1.0.bb new file mode 100644 index 0000000000..7c08d347db --- /dev/null +++ b/packages/bluez/bluez-dtl1-workaround_1.0.bb @@ -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/" diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index b6f9660fa7..8eb4fbfbf0 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -10,7 +10,6 @@ LICENSE = "GPL" 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}/ } diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb index 2419f431f6..6cadfc1a53 100644 --- a/packages/bluez/bluez-utils_3.11.bb +++ b/packages/bluez/bluez-utils_3.11.bb @@ -6,9 +6,8 @@ DEPENDS += "glib-2.0" 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 \ " diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb index e543eed649..4710aa6779 100644 --- a/packages/bluez/bluez-utils_3.12.bb +++ b/packages/bluez/bluez-utils_3.12.bb @@ -4,9 +4,8 @@ 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 \ " diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb index 49e6ded250..f2bbd15507 100644 --- a/packages/bluez/bluez-utils_3.4.bb +++ b/packages/bluez/bluez-utils_3.4.bb @@ -11,7 +11,6 @@ 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 \ diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb index 3dbaa030c1..7a76cb3200 100644 --- a/packages/bluez/bluez-utils_3.7.bb +++ b/packages/bluez/bluez-utils_3.7.bb @@ -11,7 +11,6 @@ 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 @@ -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 \ diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb index d549d12d30..f2bbd15507 100644 --- a/packages/bluez/bluez-utils_3.8.bb +++ b/packages/bluez/bluez-utils_3.8.bb @@ -7,11 +7,10 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" 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 \ -- cgit v1.2.3 From 74483949144780cf56a850628b6405520911c204 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Jul 2007 23:51:53 +0000 Subject: udev: Stop questionable device-specific hacks from contaminating PACKAGE_ARCH. * Instead, put into own package and make machines RDEPEND on it per their likes. --- packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb | 9 +++++++++ packages/udev/udev_092.bb | 9 +-------- packages/udev/udev_097.bb | 5 +---- packages/udev/udev_100.bb | 9 +-------- 4 files changed, 12 insertions(+), 20 deletions(-) create mode 100644 packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb (limited to 'packages') diff --git a/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb new file mode 100644 index 0000000000..e6e15e1597 --- /dev/null +++ b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \ +card one sweet day." + +SRC_URI = " file://50-hostap_cs.rules " + +do_install() { + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 06b18d8baa..b946b98c56 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r19" +PR = "r20" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -14,9 +14,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz file://mount.blacklist \ " -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - require udev.inc INITSCRIPT_PARAMS = "start 03 S ." @@ -55,10 +52,6 @@ do_install () { install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize } -do_install_append_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} - pkg_postinst_append() { # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter, diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index c1eff0d083..360e6019d5 100644 --- a/packages/udev/udev_097.bb +++ b/packages/udev/udev_097.bb @@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r9" +PR = "r10" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -18,9 +18,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz require udev.inc -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - INITSCRIPT_PARAMS = "start 03 S ." FILES_${PN} += "${base_libdir}/udev/*" diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index f36a75ac29..e4ef8395a6 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -19,9 +19,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz require udev.inc -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - INITSCRIPT_PARAMS = "start 03 S ." FILES_${PN} += "${base_libdir}/udev/*" @@ -56,10 +53,6 @@ do_install () { install -d ${D}${base_libdir}/udev/ } -do_install_append_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} - pkg_postinst_append() { # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter, -- cgit v1.2.3 From 123c45b2d0658297c007e260acd4be91735d43cc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Jul 2007 23:54:47 +0000 Subject: udev-hostap-cs-vcc-workaround: PACKAGE_ARCH = "all" --- packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb index e6e15e1597..4076cb2dd6 100644 --- a/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb +++ b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb @@ -1,5 +1,6 @@ DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \ card one sweet day." +PR = "r1" SRC_URI = " file://50-hostap_cs.rules " @@ -7,3 +8,5 @@ do_install() { install -d ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules } + +PACKAGE_ARCH = "all" -- cgit v1.2.3 From ee101f706452f88687f4233311e7dc89aca88afa Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Jul 2007 23:55:42 +0000 Subject: bluez-dtl1-workaround: PACKAGE_ARCH = "all" --- packages/bluez/bluez-dtl1-workaround_1.0.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/bluez/bluez-dtl1-workaround_1.0.bb b/packages/bluez/bluez-dtl1-workaround_1.0.bb index 7c08d347db..413d220508 100644 --- a/packages/bluez/bluez-dtl1-workaround_1.0.bb +++ b/packages/bluez/bluez-dtl1-workaround_1.0.bb @@ -2,6 +2,7 @@ DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume. SECTION = "console" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" SRC_URI = "file://02dtl1_cs.sh" @@ -12,3 +13,5 @@ do_install() { #Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume FILES_${PN} += "${sysconfdir}/apm/" + +PACKAGE_ARCH = "all" -- cgit v1.2.3