From: Pacho Ramos Date: Mon, 9 Jan 2012 23:01:55 +0000 (+0000) Subject: Reintroduce a bluetooth init.d script to trigger bluetooth devices after dbus is... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a53dd584a9ab3e8be8c8cec0fa382507ab738df0;p=gentoo.git Reintroduce a bluetooth init.d script to trigger bluetooth devices after dbus is started because, as talked with WilliamH, udev-postmount will be removed in the near future due upstream no longer detecting failed triggers at early boot. This should also solve bug 397673 by a.m. Drop old. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog index 80ec2a82b469..e3ab24b2f874 100644 --- a/net-wireless/bluez/ChangeLog +++ b/net-wireless/bluez/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-wireless/bluez # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.111 2012/01/06 22:34:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.112 2012/01/09 23:01:55 pacho Exp $ + +*bluez-4.97-r3 (09 Jan 2012) +*bluez-4.97-r2 (09 Jan 2012) + + 09 Jan 2012; Pacho Ramos +bluez-4.97-r2.ebuild, + +bluez-4.97-r3.ebuild, +files/bluetooth-init.d-r1, -bluez-4.97-r1.ebuild, + -bluez-4.97.ebuild: + Reintroduce a bluetooth init.d script to trigger bluetooth devices after dbus + is started because, as talked with WilliamH, udev-postmount will be removed in + the near future due upstream no longer detecting failed triggers at early + boot. This should also solve bug 397673 by a.m. Drop old. 06 Jan 2012; Mike Frysinger bluez-4.97.ebuild, bluez-4.97-r1.ebuild: diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 5089182a5d5a..9e0e77a5684b 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 AUX bluetooth-conf.d 181 RMD160 287e1806e25a4f74b4a9f6fc401b78dac31d44ee SHA1 595f897553a6e99000b4a4757f8973b9f39ce11d SHA256 63a96c907996158f637abc3202235b81e7c8a998df487b3e83554062433dd2f8 AUX bluetooth-init.d 767 RMD160 7afb50646e359ed1ede5abdc4e5e01319dc9e3c4 SHA1 3685d4dbbf56802cb03a483dad23825968dc57f8 SHA256 38efb9dffaab70477f7525dd6657dffc725c61e29c05b0649e95c31f589b31ce +AUX bluetooth-init.d-r1 454 RMD160 c4521bba34ef4fc8fa2a624f55c900531d110b83 SHA1 3a0eccc0b2cf4801e594760660143fe1e2d8a53a SHA256 04de6c5bd2d2c702b0e27d7b379a284643cf2f5a03f3c5e3eaf1ac728d47b886 AUX bluez-4.18-udev.rules 228 RMD160 ab9b4ce8907c62eb9d1f14406cc2ff3f5ec69a19 SHA1 14e652de6cfed28f215727800460e600129007c2 SHA256 7577c2ed295b67f960f17ac65a44889c6536c125b34e33860d6d9f128a59fa82 AUX bluez-4.18-udev.script 752 RMD160 d8f60749dbe497bef7362a4c3f56b2b83ca079cb SHA1 0c39b4b4f4c57fb334daa793f89c0ffac046b956 SHA256 cb41a4eeea5137fb27d82d74f34e5e7dd725ddf8442c39ea623afe0d3c041fcf AUX bluez-4.67-udev.script 663 RMD160 324c46add5a485c759fa1a8fcdc658da2e9f69b8 SHA1 8b54b09d3cb6c715204ff58ef2432bbd73032bfe SHA256 9b134049b1c46fc57a497733a8dec8e354bfdc4186152fe739ae18abde702f24 @@ -18,24 +19,14 @@ DIST bluez-4.97.tar.xz 838040 RMD160 b03737dd4f30715b0823862226ffc9cdd226de8c SH DIST oui-20110801.txt.xz 520980 RMD160 2f7c863825fa8ae35d9beebe6bbd49fddd32f32e SHA1 a210a711e4e8046627676e5adf56132c977b663c SHA256 47be96b0e7b4a3235260f94ad77445fbf5226832ede588d9ea67d61759ff32e3 DIST oui-20111231.txt.xz 540056 RMD160 7ea3ba9ae3ce2e11f3da951799ae3fbfe47c7b1f SHA1 0d79c83b7564f298c8ca55ddd3790359f63d4c73 SHA256 0a141f649cf999e101efc2e36bd876f264d75bb8ebf4d2997153067132f85d17 EBUILD bluez-4.96.ebuild 4830 RMD160 b16236cc76ee923fe5b263c675540fd6ddd4612e SHA1 3a56c6fbe2911b0b02e69c0b808351af3cf2ce8b SHA256 349ad45c64c56b196554ef31b46980914d5ecfb47badadd4e8d27ab1d04e5ccf -EBUILD bluez-4.97-r1.ebuild 4305 RMD160 31a43a692b043c0b82567785c2a2b6e5eb212c7c SHA1 c5faf3be7e334b232c31c78c2e365b98d8dea21d SHA256 13a0193ed8a059a46a8a572a1075c9fbec632c3a3c9ba336c942cd3dccf163fa -EBUILD bluez-4.97.ebuild 4289 RMD160 1ddcaf34c290969e388e339ac0ddb41acc8a264e SHA1 d3f3cd1258642636debbc153f5e95ab7722b2cd7 SHA256 31e7a605bb88f1832f92a14e7aa40a58f0318a1ef4f40b5ba7867ac3f7bc21ca -MISC ChangeLog 22404 RMD160 67422291a3d1714366cc3c01882da422318696f1 SHA1 c07c8a93015de6ae05ce6c9ead89c050fd10a912 SHA256 1814d5169daa2831ed895f78df818579f520982598b1b6558c32b4bdcaf8c0be +EBUILD bluez-4.97-r2.ebuild 4477 RMD160 b57ac8c1205ceb94786daed121d0211a2812c021 SHA1 805039357b6633c0fa768e1f7b5578100cdc1fa6 SHA256 792c601542e58156964a08811627e0cbe064bb005cf9b9b8103f3c1c2f8d344f +EBUILD bluez-4.97-r3.ebuild 4490 RMD160 8f7e50ac660660f8c3e8818e4ea9134828bfe0e5 SHA1 f3ce19dac5b51b2661d0fd28cd32c29d1732d2b2 SHA256 f7809a7c2cc937a0f6c4012d10c0db8369f78cd191695291dbcfb9cc922a0649 +MISC ChangeLog 22927 RMD160 502a601ca7f865a79c2d0db078315c1f6e9bc91c SHA1 a7ccffc3b959eca68935187c8393704d711e9918 SHA256 847486d16a585dee6c69c2d56dfbdf2dad6777f099513b35172b4b1b63b38bb5 MISC metadata.xml 1002 RMD160 39cba3b507b69bcf58bb5561d8d6af1fd4a9aef4 SHA1 b7eaf92005d3a6f1a697f179f87a2b31e52cf50e SHA256 eefe2611dfa35dc04b39e2c7b36d9ebdfb3764bf945249bf994bd20606dfdeef -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPB3cqAAoJELEHsLL7fEFWECkQAIS4+cUaPzuS4ZKYNb0BFGUX -Us3Hz+BLXCdTy4UlnILtm9qVSH6oV8Rq2+ua3+GnLfXGM42ipVNc5j4+5a0mxu+K -rGrWBKLrgPZ6LrYjJuTUPhovt+V0bpeyFuz/0P0Het6Bo3cGKbMBo0rIj2DlyaQG -Ep9EeAz1upNTkmGEP5r5fiUOGUP+1EEM4s7rMHl57G01I5PlYSZegp0DdMfLP9rc -dgrlT+EqRG+/cCdtex8hWVVUclC/4WlmKgbmDvCwaGEXmOXQwe8WnIVbMnAwNGeU -4yH4GJlnBMuQjb8uFiLUo3dHVML/nUmEuSQi8VXeHDIHHayMrk+gDwzmHirXiJC7 -Q86S6TMaNNYoenFT+6gCHKul8QTNbhj5NInfEApMkxVhIWaIz2jArc9uusuKazBJ -ReP19ZEOH9aY6/JbDQighMISXM1JVHf/XKUkYzEkWyBNqoNIM86toewyJuyjUqpk -RVrw/NMuNWKYbN+cAn+6ieH7YfvFPkvavIGHm+F0Zc+WL6J82PKZ8wVLaZUiYscx -1OTm3GXQysj2vSUe8eoU9bIoXg6sZZnhLqRIUH/Y6CgVwAKmzIUPr3/MKbFtpE6F -fwezW3NdJS5+qdpwt8q3j7uW11u5XuMWDxoCR02bz8fF1WehvaVrljIzUpZuSAqg -n8PO/ThgLFSmovwSnRo0 -=TZeh +iEYEARECAAYFAk8LcekACgkQCaWpQKGI+9TnEQCeMAhqVxaGt2cyrYOWQQ+pdnA7 +NvAAnjRgI7RDwFsppEY7KH6/S6CGjcXn +=loFh -----END PGP SIGNATURE----- diff --git a/net-wireless/bluez/bluez-4.97.ebuild b/net-wireless/bluez/bluez-4.97-r2.ebuild similarity index 90% rename from net-wireless/bluez/bluez-4.97.ebuild rename to net-wireless/bluez/bluez-4.97-r2.ebuild index 04a55ff6fbba..cde2c129adf5 100644 --- a/net-wireless/bluez/bluez-4.97.ebuild +++ b/net-wireless/bluez/bluez-4.97-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97.ebuild,v 1.2 2012/01/06 22:34:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r2.ebuild,v 1.1 2012/01/09 23:01:55 pacho Exp $ EAPI="4" PYTHON_DEPEND="test-programs? 2" @@ -134,11 +134,7 @@ src_install() { network/network.conf \ serial/serial.conf - insinto /lib/udev/rules.d/ - newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules - exeinto /lib/udev/ - newexe "${FILESDIR}/${PN}-4.67-udev.script" bluetooth.sh - + newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth newinitd "${FILESDIR}/rfcomm-init.d" rfcomm newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm @@ -165,4 +161,11 @@ pkg_postinst() { elog "a regular user, you need to enable the consolekit use flag for this package or" elog "to add the user to the plugdev group." fi + + if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then + elog "You will need to add bluetooth service to default runlevel" + elog "for getting your devices detected from startup without needing" + elog "to reconnect them. For that please run:" + elog "'rc-update add bluetooth default'" + fi } diff --git a/net-wireless/bluez/bluez-4.97-r1.ebuild b/net-wireless/bluez/bluez-4.97-r3.ebuild similarity index 91% rename from net-wireless/bluez/bluez-4.97-r1.ebuild rename to net-wireless/bluez/bluez-4.97-r3.ebuild index 9d2d9367e2d8..7c3fcfbf0e20 100644 --- a/net-wireless/bluez/bluez-4.97-r1.ebuild +++ b/net-wireless/bluez/bluez-4.97-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r1.ebuild,v 1.2 2012/01/06 22:34:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r3.ebuild,v 1.1 2012/01/09 23:01:55 pacho Exp $ EAPI="4" PYTHON_DEPEND="test-programs? 2" @@ -135,11 +135,7 @@ src_install() { network/network.conf \ serial/serial.conf - insinto /lib/udev/rules.d/ - newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules - exeinto /lib/udev/ - newexe "${FILESDIR}/${PN}-4.67-udev.script" bluetooth.sh - + newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth newinitd "${FILESDIR}/rfcomm-init.d" rfcomm newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm @@ -166,4 +162,11 @@ pkg_postinst() { elog "a regular user, you need to enable the consolekit use flag for this package or" elog "to add the user to the plugdev group." fi + + if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then + elog "You will need to add bluetooth service to default runlevel" + elog "for getting your devices detected from startup without needing" + elog "to reconnect them. For that please run:" + elog "'rc-update add bluetooth default'" + fi } diff --git a/net-wireless/bluez/files/bluetooth-init.d-r1 b/net-wireless/bluez/files/bluetooth-init.d-r1 new file mode 100644 index 000000000000..9280f93bac89 --- /dev/null +++ b/net-wireless/bluez/files/bluetooth-init.d-r1 @@ -0,0 +1,19 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r1,v 1.1 2012/01/09 23:01:55 pacho Exp $ + +depend() { + after coldplug + need dbus localmount hostname +} + +start() { + ebegin "Udev coldplug of bluetooth devices" + udevadm trigger --subsystem-match=bluetooth --action=add + eend $? +} + +stop() { + return 0 +}