diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-0.0.1-r120 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-0.0.1-r120 deleted file mode 100644 index e3709c1cf8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-0.0.1-r120 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Atheros AR300x firmware -EAPI=2 -HOMEPAGE=http://www.atheros.com/ -IUSE=cros_workon_tree_a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc -KEYWORDS=amd64 arm x86 -LICENSE=Atheros -RESTRICT=binchecks strip test -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=a3a37e110138b1fcd95df0e84c7f0057 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-9999 deleted file mode 100644 index 89fce70283..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath3k-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Atheros AR300x firmware -EAPI=2 -HOMEPAGE=http://www.atheros.com/ -IUSE=cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=Atheros -RESTRICT=binchecks strip test -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=5b5af88ceed54dc45fbfc34b10b1af18 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-34-r21 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-34-r21 deleted file mode 100644 index e187d1bc58..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-34-r21 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Atheros AR600x firmware -EAPI=2 -HOMEPAGE=http://www.atheros.com/ -IUSE=cros_workon_tree_a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc -KEYWORDS=amd64 arm x86 -LICENSE=Atheros -RESTRICT=binchecks strip test -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=d345e8d2a69d715eac64c2b9abddec61 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-9999 deleted file mode 100644 index 77e3b63504..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/ath6k-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Atheros AR600x firmware -EAPI=2 -HOMEPAGE=http://www.atheros.com/ -IUSE=cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=Atheros -RESTRICT=binchecks strip test -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=5ab3772defa767362c8df9cd80f5f1bf diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62 deleted file mode 100644 index a2a54aa025..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DEPEND=sys-devel/flex >=dev-util/pkgconfig-0.20 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Bluetooth Tools and System Daemons for Linux -EAPI=2 -HOMEPAGE=http://bluez.sourceforge.net/ -IUSE=alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb -KEYWORDS=amd64 arm x86 -LICENSE=GPL-2 LGPL-2.1 -RDEPEND=alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( sys-auth/pambase[consolekit] ) test-programs? ( dev-python/dbus-python dev-python/pygobject ) -SLOT=0 -SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.62.tar.gz -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=fbe76b1f95a29c416cd2ba8b36211e87 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62-r103 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62-r103 deleted file mode 100644 index a2a54aa025..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.62-r103 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DEPEND=sys-devel/flex >=dev-util/pkgconfig-0.20 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Bluetooth Tools and System Daemons for Linux -EAPI=2 -HOMEPAGE=http://bluez.sourceforge.net/ -IUSE=alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb -KEYWORDS=amd64 arm x86 -LICENSE=GPL-2 LGPL-2.1 -RDEPEND=alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) usb? ( dev-libs/libusb ) cups? ( net-print/cups ) sys-fs/udev dev-libs/glib sys-apps/dbus media-libs/libsndfile >=dev-libs/libnl-1.1 !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( sys-auth/pambase[consolekit] ) test-programs? ( dev-python/dbus-python dev-python/pygobject ) -SLOT=0 -SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.62.tar.gz -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=fbe76b1f95a29c416cd2ba8b36211e87 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.97-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.97-r11 deleted file mode 100644 index d31b66e4fb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.97-r11 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare setup -DEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( dev-libs/libusb:1 ) >=dev-util/pkgconfig-0.20 >=dev-libs/check-0.9.8 sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) -DESCRIPTION=Bluetooth Tools and System Daemons for Linux -EAPI=4 -HOMEPAGE=http://www.bluez.org/ -IUSE=alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb -KEYWORDS=amd64 arm ~hppa ~ppc ~ppc64 x86 -LICENSE=GPL-2 LGPL-2.1 -RDEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( dev-libs/libusb:1 ) !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-37 ) ) test-programs? ( dev-python/dbus-python dev-python/pygobject:2 ) >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) -SLOT=0 -SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.97.tar.xz http://dev.gentoo.org/~pacho/bluez/oui-20111231.txt.xz -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=76d206097cc342c22ff9c9cf742c01d9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.99-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.99-r6 deleted file mode 100644 index 20917a7616..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-4.99-r6 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare setup -DEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) >=dev-util/pkgconfig-0.20 sys-devel/flex test-programs? ( >=dev-libs/check-0.9.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) -DESCRIPTION=Bluetooth Tools and System Daemons for Linux -EAPI=4 -HOMEPAGE=http://www.bluez.org/ -IUSE=alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline -KEYWORDS=amd64 arm hppa ~ppc ~ppc64 x86 -LICENSE=GPL-2 LGPL-2.1 -RDEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-37 ) ) test-programs? ( dev-python/dbus-python dev-python/pygobject:2 ) >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) -SLOT=0 -SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.99.tar.xz http://dev.gentoo.org/~pacho/bluez/oui-20120308.txt.xz -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=c562317850a05d586686e6d2921ca2a6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-test-4.99 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-test-4.99 deleted file mode 100644 index d0a1e8237a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/bluez-test-4.99 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install prepare setup -DEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) >=dev-util/pkgconfig-0.20 sys-devel/flex test-programs? ( >=dev-libs/check-0.9.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) -DESCRIPTION=Bluetooth Tools and System Daemons for Linux -EAPI=4 -HOMEPAGE=http://www.bluez.org/ -IUSE=alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline -KEYWORDS=amd64 arm hppa ~ppc ~ppc64 x86 -LICENSE=GPL-2 LGPL-2.1 -RDEPEND=>=dev-libs/glib-2.14:2 sys-apps/dbus >=sys-fs/udev-169 alsa? ( media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile ) caps? ( >=sys-libs/libcap-ng-0.6.2 ) cups? ( net-print/cups ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) usb? ( virtual/libusb:0 ) readline? ( sys-libs/readline ) !net-wireless/bluez-libs !net-wireless/bluez-utils consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-37 ) ) test-programs? ( dev-python/dbus-python dev-python/pygobject:2 ) >=app-admin/eselect-python-20091230 test-programs? ( =dev-lang/python-2* ) -SLOT=0 -SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.99.tar.xz http://dev.gentoo.org/~pacho/bluez/oui-20120308.txt.xz -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=91598d2fbb104318e06beffe96196ce6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/crda-1.1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/crda-1.1.1 deleted file mode 100644 index b0155ca5eb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/crda-1.1.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install prepare -DEPEND=dev-libs/libgcrypt dev-libs/libnl:0 net-wireless/wireless-regdb dev-python/m2crypto -DESCRIPTION=Central Regulatory Domain Agent for wireless networks. -EAPI=2 -HOMEPAGE=http://wireless.kernel.org/en/developers/Regulatory -KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -RDEPEND=dev-libs/libgcrypt dev-libs/libnl:0 net-wireless/wireless-regdb -SLOT=0 -SRC_URI=http://wireless.kernel.org/download/crda/crda-1.1.1.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 -_md5_=921c24d7b09fc5013de407a426097604 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-0.0.1-r25 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-0.0.1-r25 deleted file mode 100644 index fe2f698b98..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-0.0.1-r25 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile info install prepare setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=GCT GDM7205 WiMAX SDK -EAPI=4 -HOMEPAGE=http://www.gctsemi.com/ -IUSE=cros_workon_tree_3dc85a711e8560caa66ff457623c985d8256abe2 -KEYWORDS=amd64 arm x86 -LICENSE=BSD -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=66eeda10c80441104df126346ff2cec7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-9999 deleted file mode 100644 index 571925ac4e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/gdmwimax-9999 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile info install prepare setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=GCT GDM7205 WiMAX SDK -EAPI=4 -HOMEPAGE=http://www.gctsemi.com/ -IUSE=cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=BSD -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=fd30ce250542cfe65f62e37a5086b503 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-0.7.2-r51 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-0.7.2-r51 deleted file mode 100644 index 05e1487259..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-0.7.2-r51 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst prepare setup unpack -DEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-vcs/git -DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon -EAPI=2 -HOMEPAGE=http://hostap.epitest.fi -IUSE=ipv6 logwatch madwifi +ssl +wps cros_workon_tree_6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5 -KEYWORDS=amd64 arm x86 -LICENSE=|| ( GPL-2 BSD ) -RDEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=59dfe3483da54fa0518a9440223d2bb9 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-9999 deleted file mode 100644 index 41979cf081..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/hostapd-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst prepare setup unpack -DEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-vcs/git -DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon -EAPI=2 -HOMEPAGE=http://hostap.epitest.fi -IUSE=ipv6 logwatch madwifi +ssl +wps cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=|| ( GPL-2 BSD ) -RDEPEND=ssl? ( dev-libs/openssl ) dev-libs/libnl:0 madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=86b8f0be48951a5d4adf7ca08d18aa56 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-0.9.22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-0.9.22 deleted file mode 100644 index bfc6b08454..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-0.9.22 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install -DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig -DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack -HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw -KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -RDEPEND=>=dev-libs/libnl-1.1 -SLOT=0 -SRC_URI=http://wireless.kernel.org/download/iw/iw-0.9.22.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 -_md5_=fcd477bbda16843500d4d84b2bbc0a6b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.0 deleted file mode 100644 index 5e935e2821..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.0 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install -DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig -DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack -HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw -KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -RDEPEND=>=dev-libs/libnl-1.1 -SLOT=0 -SRC_URI=http://wireless.kernel.org/download/iw/iw-3.0.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 -_md5_=fcd477bbda16843500d4d84b2bbc0a6b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1 deleted file mode 100644 index a85563cc4a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig -DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack -EAPI=2 -HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw -KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -RDEPEND=>=dev-libs/libnl-1.1 -SLOT=0 -SRC_URI=http://linuxwireless.org/download/iw/iw-3.1.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=d053798fd4fa8bc5001c0256b5d3209b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1-r1 deleted file mode 100644 index a85563cc4a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.1-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig -DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack -EAPI=2 -HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw -KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -RDEPEND=>=dev-libs/libnl-1.1 -SLOT=0 -SRC_URI=http://linuxwireless.org/download/iw/iw-3.1.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=d053798fd4fa8bc5001c0256b5d3209b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6 deleted file mode 100644 index d5a5990bd0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig -DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack -EAPI=2 -HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw -KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -RDEPEND=>=dev-libs/libnl-1.1 -SLOT=0 -SRC_URI=http://linuxwireless.org/download/iw/iw-3.6.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=79426318c8c8a335c358b84cb0d65481 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6-r1 deleted file mode 100644 index d5a5990bd0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iw-3.6-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=dev-libs/libnl-1.1 dev-util/pkgconfig -DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack -EAPI=2 -HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw -KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -RDEPEND=>=dev-libs/libnl-1.1 -SLOT=0 -SRC_URI=http://linuxwireless.org/download/iw/iw-3.6.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=79426318c8c8a335c358b84cb0d65481 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl2000-ucode-18.168.6.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl2000-ucode-18.168.6.1 deleted file mode 100644 index b8f62afa3e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl2000-ucode-18.168.6.1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) -DESCRIPTION=Intel (R) Centrino Wireless-N 2200 ucode -HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi -KEYWORDS=amd64 x86 -LICENSE=ipw3945 -SLOT=0 -SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-2000-ucode-18.168.6.1.tgz -_md5_=c2571b8bea43fa79175916fdc4a35ba4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl3945-ucode-15.32.2.9-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl3945-ucode-15.32.2.9-r1 deleted file mode 100644 index fe5349a672..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl3945-ucode-15.32.2.9-r1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) -DESCRIPTION=Intel (R) PRO/Wireless 3945ABG/BG Network Connection -HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi -KEYWORDS=amd64 x86 -LICENSE=ipw3945 -SLOT=0 -SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-3945-ucode-15.32.2.9.tgz -_md5_=fe623ff8b21dc78c96c5823960bbe6d4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl4965-ucode-228.61.2.24-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl4965-ucode-228.61.2.24-r1 deleted file mode 100644 index 22081b25f5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl4965-ucode-228.61.2.24-r1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) -DESCRIPTION=Intel (R) Wireless WiFi 4965AGN ucode -HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi -KEYWORDS=amd64 x86 -LICENSE=ipw3945 -SLOT=0 -SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-228.61.2.24.tgz -_md5_=3f69a332a1d5b1d6ae170cb235e8931d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6000-ucode-9.221.4.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6000-ucode-9.221.4.1-r1 deleted file mode 100644 index 4e7aea1c1c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6000-ucode-9.221.4.1-r1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) -DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode -HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi -KEYWORDS=amd64 x86 -LICENSE=ipw3945 -SLOT=0 -SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000-ucode-9.221.4.1.tgz -_md5_=a8f6bbecc5cd2eecf6c8e2d487533b26 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6005-ucode-17.168.5.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6005-ucode-17.168.5.2-r1 deleted file mode 100644 index a3b75c90ab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6005-ucode-17.168.5.2-r1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) -DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode -HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi -KEYWORDS=amd64 x86 -LICENSE=ipw3945 -SLOT=0 -SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-17.168.5.2.tgz -_md5_=3bd9e9f81c495ccb9544cd064fe1f61b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6030-ucode-18.168.6.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6030-ucode-18.168.6.1-r1 deleted file mode 100644 index 45bb48bbdd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6030-ucode-18.168.6.1-r1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) -DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode -HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi -KEYWORDS=amd64 x86 -LICENSE=ipw3945 -SLOT=0 -SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-18.168.6.1.tgz -_md5_=6600761dac378f14fc8007a8217b84f1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6050-ucode-41.28.5.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6050-ucode-41.28.5.1-r1 deleted file mode 100644 index 25dd5a98be..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/iwl6050-ucode-41.28.5.1-r1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) -DESCRIPTION=Intel (R) Wireless WiFi Advanced N 6000 ucode -HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi -KEYWORDS=amd64 x86 -LICENSE=ipw3945 -SLOT=0 -SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6050-ucode-41.28.5.1.tgz -_md5_=fcc3c261c789028a951a984d2a0be433 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-14.64.2.47-r15 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-14.64.2.47-r15 deleted file mode 100644 index 8869dfea78..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-14.64.2.47-r15 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Marvell SD8787 firmware image -EAPI=2 -HOMEPAGE=http://www.marvell.com/ -IUSE=cros_workon_tree_e678d0d27c25cba5abe0581e078ede22b87ba6ab -KEYWORDS=amd64 arm x86 -LICENSE=Marvell International Ltd. -RESTRICT=binchecks strip test -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=e70e379a7b45a9cbb807c3aa00bc4beb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-9999 deleted file mode 100644 index db7ec553a6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/marvell_sd8787-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Marvell SD8787 firmware image -EAPI=2 -HOMEPAGE=http://www.marvell.com/ -IUSE=cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=Marvell International Ltd. -RESTRICT=binchecks strip test -SLOT=0 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=0db79cbcf6f71483db023375b3484466 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/realtek-rt2800-firmware-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/realtek-rt2800-firmware-0.0.1 deleted file mode 100644 index daf4fb91fb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/realtek-rt2800-firmware-0.0.1 +++ /dev/null @@ -1,8 +0,0 @@ -DEFINED_PHASES=install -DESCRIPTION=Ebuild that installs Realtek 2800 USB firmware. -EAPI=4 -HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git -KEYWORDS=x86 arm amd64 -LICENSE=ralink-firmware -SLOT=0 -_md5_=c58aae91758bbf956e8fcb7307c0fa54 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wireless-regdb-20101124 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wireless-regdb-20101124 deleted file mode 100644 index 1d41b7e953..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wireless-regdb-20101124 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install -DESCRIPTION=Binary regulatory database for CRDA -HOMEPAGE=http://wireless.kernel.org/en/developers/Regulatory -KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux -LICENSE=as-is -SLOT=0 -SRC_URI=http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-2010.11.24.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 -_md5_=67ed208f197385a2f392006d4e39cfb8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.2-r116 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.2-r116 deleted file mode 100644 index 1e0c673c6d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.2-r116 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst prepare setup unpack -DEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) dev-vcs/git -DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers -EAPI=2 -HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/ -IUSE=dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD cros_workon_tree_6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5 -KEYWORDS=amd64 arm x86 -LICENSE=|| ( GPL-2 BSD ) -RDEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) -SLOT=0 -_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c qt3 823f11abd98cfc43cf92b8622e420f1f qt4 83eabd1192f3f2c5a649ba2422a14d00 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed -_md5_=a57426a6ed0a168b7009db585a6a5548 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-9999 deleted file mode 100644 index 60e8ab8f33..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-wireless/wpa_supplicant-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst prepare setup unpack -DEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) dev-vcs/git -DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers -EAPI=2 -HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/ -IUSE=dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=|| ( GPL-2 BSD ) -RDEPEND=dev-libs/libnl:0 dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) -SLOT=0 -_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c qt3 823f11abd98cfc43cf92b8622e420f1f qt4 83eabd1192f3f2c5a649ba2422a14d00 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed -_md5_=34dc590d42c1fb333c869cc69f5fe7de diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-0.0.1-r120.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-0.0.1-r120.ebuild deleted file mode 100644 index 4ec4ac883f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-0.0.1-r120.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_COMMIT="52a5bdaa8930c14ee42518354de3e5ec09911c6b" -CROS_WORKON_TREE="a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc" -CROS_WORKON_PROJECT="chromiumos/third_party/atheros" - -inherit cros-workon - -DESCRIPTION="Atheros AR300x firmware" -HOMEPAGE="http://www.atheros.com/" -LICENSE="Atheros" - -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RESTRICT="binchecks strip test" -CROS_WORKON_LOCALNAME="atheros" -DEPEND="" -RDEPEND="" - -src_install() { - src_dir="${S}"/ath3k/files/firmware - dodir /lib/firmware || die - insinto /lib/firmware - doins -r ${src_dir}/* || die \ - "failed installing from ${src_dir} to ${D}/lib/firmware" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-9999.ebuild deleted file mode 100644 index 187a8ff1f5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath3k/ath3k-9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_PROJECT="chromiumos/third_party/atheros" - -inherit cros-workon - -DESCRIPTION="Atheros AR300x firmware" -HOMEPAGE="http://www.atheros.com/" -LICENSE="Atheros" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RESTRICT="binchecks strip test" -CROS_WORKON_LOCALNAME="atheros" -DEPEND="" -RDEPEND="" - -src_install() { - src_dir="${S}"/ath3k/files/firmware - dodir /lib/firmware || die - insinto /lib/firmware - doins -r ${src_dir}/* || die \ - "failed installing from ${src_dir} to ${D}/lib/firmware" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-34-r21.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-34-r21.ebuild deleted file mode 100644 index 599cf82483..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-34-r21.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_COMMIT="52a5bdaa8930c14ee42518354de3e5ec09911c6b" -CROS_WORKON_TREE="a214d22b4c8a8f3cf46dd4a8b80451231eedb9dc" -CROS_WORKON_PROJECT="chromiumos/third_party/atheros" - -inherit cros-workon - -DESCRIPTION="Atheros AR600x firmware" -HOMEPAGE="http://www.atheros.com/" -LICENSE="Atheros" - -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RESTRICT="binchecks strip test" -CROS_WORKON_LOCALNAME="atheros" -DEPEND="" -RDEPEND="" - -src_install() { - src_dir="${S}"/ath6k/files/firmware - dodir /lib/firmware || die - insinto /lib/firmware - doins -r ${src_dir}/* || die \ - "failed installing from ${src_dir} to ${D}/lib/firmware" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-9999.ebuild deleted file mode 100644 index fb8bccbc3c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/ath6k/ath6k-9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_PROJECT="chromiumos/third_party/atheros" - -inherit cros-workon - -DESCRIPTION="Atheros AR600x firmware" -HOMEPAGE="http://www.atheros.com/" -LICENSE="Atheros" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RESTRICT="binchecks strip test" -CROS_WORKON_LOCALNAME="atheros" -DEPEND="" -RDEPEND="" - -src_install() { - src_dir="${S}"/ath6k/files/firmware - dodir /lib/firmware || die - insinto /lib/firmware - doins -r ${src_dir}/* || die \ - "failed installing from ${src_dir} to ${D}/lib/firmware" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/Manifest deleted file mode 100644 index f855e607f3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST bluez-4.99.tar.xz 859756 SHA256 41889a91a5516eec26c4e59095ceea076de158b1ac38fd0ede9034596f511d3b SHA512 79e36a65ff9ff9c3311a8ef4819692503bb02f048a3c42dd0b9512749fb8e4d810eb832f211fb7dfebc7b6b5bf82a9363edd15741d62595f36d782804bb39ac3 WHIRLPOOL 32b8e3f67c846a17e7335395021008c181a2645fdb08b4ebe36bf4ad5221eef00f86ec7ef0d1de19c64741c884376666677ca9e129868dcaa18a5d4c0737c894 -DIST oui-20120308.txt.xz 546720 SHA256 4256ba96a522333a41fd058e1880a04f77566c9ad0a62d3c0d7ac422bf8b9086 SHA512 f749b3ce9b6173760319849f1e4699f02d4f8628de78d0bc39c08b01331567b60a9bd3303a84982ad23bc6cbe7b6d9f27e2e26f699a818dac0e0e8fa6ddb44fa WHIRLPOOL 0797457e3bb54d49b295547a47894258c2c5a9954ca87c44948bdb57781e11c84d2d1be9cf6d3deb0d062e4a98b0b1fb406a1f0fbeb9d0a294da624c2e90f9ee diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/bluez-test-4.99.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/bluez-test-4.99.ebuild deleted file mode 100644 index 5d7ca8f024..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/bluez-test-4.99.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# 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.99.ebuild,v 1.7 2012/04/15 16:53:41 maekke Exp $ - -EAPI="4" -PYTHON_DEPEND="test-programs? 2" - -inherit autotools multilib eutils systemd python - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org/" - -# Because of oui.txt changing from time to time without noticement, we need to supply it -# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly. -# See bugs #345263 and #349473 for reference. -OUIDATE="20120308" -SRC_URI="mirror://kernel/linux/bluetooth/bluez-${PV}.tar.xz - http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz" -S="${WORKDIR}/bluez-${PV}" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86" -IUSE="alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline" - -CDEPEND=" - >=dev-libs/glib-2.14:2 - sys-apps/dbus - >=sys-fs/udev-169 - alsa? ( - media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] - media-libs/libsndfile - ) - caps? ( >=sys-libs/libcap-ng-0.6.2 ) - cups? ( net-print/cups ) - gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 - ) - usb? ( virtual/libusb:0 ) - readline? ( sys-libs/readline ) -" -DEPEND="${CDEPEND} - >=dev-util/pkgconfig-0.20 - sys-devel/flex - test-programs? ( >=dev-libs/check-0.9.8 ) -" -RDEPEND="${CDEPEND} - !net-wireless/bluez-libs - !net-wireless/bluez-utils - consolekit? ( - || ( sys-auth/consolekit - >=sys-apps/systemd-37 ) - ) - test-programs? ( - dev-python/dbus-python - dev-python/pygobject:2 - ) -" - -DOCS=( AUTHORS ChangeLog README ) - -pkg_setup() { - if use test-programs; then - python_pkg_setup - fi -} - -src_prepare() { - # Change the default D-Bus configuration; the daemon is run as - # bluetooth, not root; we don't use the lp user, and we use the - # chronos user instead of at_console - epatch "${FILESDIR}/${PN}-dbus.patch" - - # Change the default SDP Server socket path to a sub-directory - # under /var/run, since /var/run is not writeable by the bluetooth - # user. - epatch "${FILESDIR}/${PN}-sdp-path.patch" - - # Disable initial radio power for new adapters - epatch "${FILESDIR}/${PN}-initially-powered.patch" - - # Automatic pairing support, including keyboard pairing support. - # (accepted upstream, can be dropped for next release) - epatch "${FILESDIR}/${P}-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch" - epatch "${FILESDIR}/${P}-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch" - epatch "${FILESDIR}/${P}-autopair-0003-agent-add-DisplayPinCode-method.patch" - epatch "${FILESDIR}/${P}-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch" - epatch "${FILESDIR}/${P}-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch" - epatch "${FILESDIR}/${P}-autopair-0006-Display-PIN-generated-by-plugin.patch" - epatch "${FILESDIR}/${P}-autopair-0007-doc-document-DisplayPinCode.patch" - epatch "${FILESDIR}/${P}-autopair-0008-simple-agent-add-DisplayPinCode.patch" - epatch "${FILESDIR}/${P}-autopair-0009-Add-support-for-retrying-a-bonding.patch" - epatch "${FILESDIR}/${P}-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch" - epatch "${FILESDIR}/${P}-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch" - epatch "${FILESDIR}/${P}-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch" - epatch "${FILESDIR}/${P}-autopair-0013-autopair-Add-autopair-plugin.patch" - - # Automatic pairing of dumb devices. Not yet submitted upstream - # so kept as a separate patch on top of the above series. - epatch "${FILESDIR}/${PN}-autopair.patch" - - eautoreconf - - if use cups; then - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ - Makefile.tools Makefile.in || die - fi -} - -src_configure() { - use readline || export ac_cv_header_readline_readline_h=no - - econf \ - --enable-hid2hci \ - --enable-audio \ - --enable-bccmd \ - --enable-datafiles \ - --enable-dfutool \ - --enable-input \ - --enable-network \ - --enable-serial \ - --enable-service \ - --enable-tools \ - --disable-hal \ - --localstatedir=/var \ - --with-systemdunitdir="$(systemd_get_unitdir)" \ - --with-ouifile=/usr/share/misc/oui.txt \ - $(use_enable alsa) \ - $(use_enable caps capng) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable gstreamer) \ - $(use_enable pcmcia) \ - $(use_enable test-programs test) \ - $(use_enable usb) \ - --enable-health \ - --enable-wiimote \ - --enable-dbusoob \ - --enable-autopair -} - -src_install() { - if use test-programs ; then - cd "${S}/test" - dobin simple-agent simple-endpoint simple-service - dobin monitor-bluetooth - dobin avtest gaptest hsmicro hsplay hstest ipctest l2test - dobin lmptest rctest scotest sdptest - newbin list-devices list-bluetooth-devices - rm test-textfile.{c,o} || die # bug #356529 - for b in apitest test-* ; do - newbin "${b}" "bluez-${b}" - done - insinto /usr/share/doc/${PF}/test-services - doins service-* - - dobin "${FILESDIR}/bluetooth-unpair" - dobin "${FILESDIR}/bluetooth-unpair-all" - - python_convert_shebangs -r 2 "${ED}" - cd "${S}" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair deleted file mode 100755 index f206f87593..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -import dbus -import sys - -bus = dbus.SystemBus() - -bluez = bus.get_object('org.bluez', '/') - -adapter_path = bluez.DefaultAdapter(dbus_interface='org.bluez.Manager') -adapter = bus.get_object('org.bluez', adapter_path) - -device_path = adapter.FindDevice(sys.argv[1], - dbus_interface='org.bluez.Adapter') -device = bus.get_object('org.bluez', device_path) - -adapter.RemoveDevice(device, dbus_interface='org.bluez.Adapter') diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair-all b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair-all deleted file mode 100755 index 288b782e41..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluetooth-unpair-all +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import dbus -import sys - -bus = dbus.SystemBus() - -bluez = bus.get_object('org.bluez', '/') - -adapter_path = bluez.DefaultAdapter(dbus_interface='org.bluez.Manager') -adapter = bus.get_object('org.bluez', adapter_path) - -all_the_things = """\ - . - , = , - ,, .,, - ,,. , .. ,, .,,, - ,,,, ,. ,, ,,.:,,,. - ,,,,, ,,.,, .,,,,i,,, - ,,,,,,,YtY,,,+,,R,, - , ,,,,,,V.. tY# =,I,. - ,,. ,,,,,,,V W R,;, - .,,. ,,,,: Y R=YW +,, - I; ,,,,,,,,: Y:#### =, -i.., ,,,,,,,,iX#####, , ., ,, -....t ,,,,,,,,,: :####X V,,, ,,, -i.... ,,,,,,,,,t I###+ X,,..,,,. - I.., ,,,,,,,,V =##Y, YR,,,,, - Xt .,,,,,,+,,R , BYV,,,, - ,X:,,,,,,=,,,,R. ,RYYY,,, - ,. :X,,,,V,,,,,,RYYYYYYY,,,,,,,,. - ,,,,tX,t,,,,,,,,,YYYYYYYX,,,,,,,,,. - ,,,,BB,,,,,,,,,,YYYYYYYV,,,,,,, - ,,,,,BB,,,,,,,,,XYYYYYYY,,,. - ,,,,,XI,,,,,,,,YYYYYYYY,, - ,,,,,X:,,,,,,,YYYYYYYY,,. """ -print all_the_things - -for device_path in adapter.ListDevices(dbus_interface='org.bluez.Adapter'): - device = bus.get_object('org.bluez', device_path) - - adapter.RemoveDevice(device, dbus_interface='org.bluez.Adapter') diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch deleted file mode 100644 index bce6daa8c3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch +++ /dev/null @@ -1,83 +0,0 @@ -From be1631d70689cfde701e9a1642a5afad11252af7 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 10:40:25 -0800 -Subject: [PATCH 01/13] Rename AUTH_TYPE_NOTIFY to AUTH_TYPE_NOTIFY_PASSKEY - -This makes room for additional notification types to be added. ---- - src/device.c | 8 ++++---- - src/device.h | 2 +- - src/event.c | 4 ++-- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/device.c b/src/device.c -index dfc8e59..92c13f5 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2453,7 +2453,7 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) - { - struct authentication_req *auth = device->authr; - -- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) -+ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) - agent_cancel(auth->agent); - } - -@@ -2470,7 +2470,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) - - DBG("bonding %p status 0x%02x", bonding, status); - -- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) -+ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) - agent_cancel(auth->agent); - - if (status) { -@@ -2724,7 +2724,7 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - err = agent_request_confirmation(agent, device, passkey, - confirm_cb, auth, NULL); - break; -- case AUTH_TYPE_NOTIFY: -+ case AUTH_TYPE_NOTIFY_PASSKEY: - err = agent_display_passkey(agent, device, passkey); - break; - default: -@@ -2764,7 +2764,7 @@ static void cancel_authentication(struct authentication_req *auth) - case AUTH_TYPE_PASSKEY: - ((agent_passkey_cb) auth->cb)(agent, &err, 0, device); - break; -- case AUTH_TYPE_NOTIFY: -+ case AUTH_TYPE_NOTIFY_PASSKEY: - /* User Notify doesn't require any reply */ - break; - } -diff --git a/src/device.h b/src/device.h -index 7cb9bb2..aa7f2f1 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -30,7 +30,7 @@ typedef enum { - AUTH_TYPE_PINCODE, - AUTH_TYPE_PASSKEY, - AUTH_TYPE_CONFIRM, -- AUTH_TYPE_NOTIFY, -+ AUTH_TYPE_NOTIFY_PASSKEY, - } auth_type_t; - - struct btd_device *device_create(DBusConnection *conn, -diff --git a/src/event.c b/src/event.c -index 113a2b6..95cdbdb 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -202,8 +202,8 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) - if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) - return -ENODEV; - -- return device_request_authentication(device, AUTH_TYPE_NOTIFY, passkey, -- FALSE, NULL); -+ return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, -+ passkey, FALSE, NULL); - } - - void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch deleted file mode 100644 index 08de15d968..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 888f24266b8ff06d7007afb5e6a38ba621750451 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 10:43:48 -0800 -Subject: [PATCH 02/13] Pass passkey by pointer rather than by value - -This allows alternate data of a different type to be passed to -device_request_authentication() for other notification types such -as those that require a PIN. ---- - src/device.c | 9 +++++---- - src/device.h | 2 +- - src/event.c | 8 ++++---- - 3 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 92c13f5..8a2ae9d 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2681,7 +2681,7 @@ done: - } - - int device_request_authentication(struct btd_device *device, auth_type_t type, -- uint32_t passkey, gboolean secure, void *cb) -+ void *data, gboolean secure, void *cb) - { - struct authentication_req *auth; - struct agent *agent; -@@ -2707,7 +2707,6 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - auth->device = device; - auth->cb = cb; - auth->type = type; -- auth->passkey = passkey; - auth->secure = secure; - device->authr = auth; - -@@ -2721,11 +2720,13 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - auth, NULL); - break; - case AUTH_TYPE_CONFIRM: -- err = agent_request_confirmation(agent, device, passkey, -+ auth->passkey = *(uint32_t *)data; -+ err = agent_request_confirmation(agent, device, auth->passkey, - confirm_cb, auth, NULL); - break; - case AUTH_TYPE_NOTIFY_PASSKEY: -- err = agent_display_passkey(agent, device, passkey); -+ auth->passkey = *(uint32_t *)data; -+ err = agent_display_passkey(agent, device, auth->passkey); - break; - default: - err = -EINVAL; -diff --git a/src/device.h b/src/device.h -index aa7f2f1..998aee7 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -83,7 +83,7 @@ gboolean device_is_creating(struct btd_device *device, const char *sender); - gboolean device_is_bonding(struct btd_device *device, const char *sender); - void device_cancel_bonding(struct btd_device *device, uint8_t status); - int device_request_authentication(struct btd_device *device, auth_type_t type, -- uint32_t passkey, gboolean secure, void *cb); -+ void *data, gboolean secure, void *cb); - void device_cancel_authentication(struct btd_device *device, gboolean aborted); - gboolean device_is_authenticating(struct btd_device *device); - gboolean device_is_authorizing(struct btd_device *device); -diff --git a/src/event.c b/src/event.c -index 95cdbdb..7d66b6d 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -130,7 +130,7 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) - return 0; - } - -- return device_request_authentication(device, AUTH_TYPE_PINCODE, 0, -+ return device_request_authentication(device, AUTH_TYPE_PINCODE, NULL, - secure, pincode_cb); - } - -@@ -179,7 +179,7 @@ int btd_event_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) - return -ENODEV; - - return device_request_authentication(device, AUTH_TYPE_CONFIRM, -- passkey, FALSE, confirm_cb); -+ &passkey, FALSE, confirm_cb); - } - - int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) -@@ -190,7 +190,7 @@ int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) - if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) - return -ENODEV; - -- return device_request_authentication(device, AUTH_TYPE_PASSKEY, 0, -+ return device_request_authentication(device, AUTH_TYPE_PASSKEY, NULL, - FALSE, passkey_cb); - } - -@@ -203,7 +203,7 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) - return -ENODEV; - - return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, -- passkey, FALSE, NULL); -+ &passkey, FALSE, NULL); - } - - void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch deleted file mode 100644 index 4e14ca9962..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch +++ /dev/null @@ -1,161 +0,0 @@ -From e84af9f6ba447c540512d56ccc7326af621749bc Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 10:56:56 -0800 -Subject: [PATCH 03/13] agent: add DisplayPinCode method - -In constrast to DisplayPasskey, this sends a UTF-8 string PIN code -to the agent; also we support a callback for the case where the -Agent doesn't implement this new method so we can fallback. ---- - src/agent.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/agent.h | 4 ++ - 2 files changed, 115 insertions(+), 1 deletions(-) - -diff --git a/src/agent.c b/src/agent.c -index 9b942e8..23e3b43 100644 ---- a/src/agent.c -+++ b/src/agent.c -@@ -52,7 +52,8 @@ typedef enum { - AGENT_REQUEST_CONFIRMATION, - AGENT_REQUEST_PINCODE, - AGENT_REQUEST_AUTHORIZE, -- AGENT_REQUEST_CONFIRM_MODE -+ AGENT_REQUEST_CONFIRM_MODE, -+ AGENT_REQUEST_DISPLAY_PINCODE, - } agent_request_type_t; - - struct agent { -@@ -699,6 +700,115 @@ int agent_display_passkey(struct agent *agent, struct btd_device *device, - return 0; - } - -+static void display_pincode_reply(DBusPendingCall *call, void *user_data) -+{ -+ struct agent_request *req = user_data; -+ struct agent *agent = req->agent; -+ DBusMessage *message; -+ DBusError err; -+ agent_cb cb = req->cb; -+ -+ /* clear agent->request early; our callback will likely try -+ * another request */ -+ agent->request = NULL; -+ -+ /* steal_reply will always return non-NULL since the callback -+ * is only called after a reply has been received */ -+ message = dbus_pending_call_steal_reply(call); -+ -+ dbus_error_init(&err); -+ if (dbus_set_error_from_message(&err, message)) { -+ error("Agent replied with an error: %s, %s", -+ err.name, err.message); -+ -+ cb(agent, &err, req->user_data); -+ -+ if (dbus_error_has_name(&err, DBUS_ERROR_NO_REPLY)) { -+ agent_cancel(agent); -+ dbus_message_unref(message); -+ dbus_error_free(&err); -+ return; -+ } -+ -+ dbus_error_free(&err); -+ goto done; -+ } -+ -+ dbus_error_init(&err); -+ if (!dbus_message_get_args(message, &err, DBUS_TYPE_INVALID)) { -+ error("Wrong reply signature: %s", err.message); -+ cb(agent, &err, req->user_data); -+ dbus_error_free(&err); -+ goto done; -+ } -+ -+ cb(agent, NULL, req->user_data); -+done: -+ dbus_message_unref(message); -+ -+ agent_request_free(req, TRUE); -+} -+ -+static int display_pincode_request_new(struct agent_request *req, -+ const char *device_path, -+ const char *pincode) -+{ -+ struct agent *agent = req->agent; -+ -+ req->msg = dbus_message_new_method_call(agent->name, agent->path, -+ "org.bluez.Agent", "DisplayPinCode"); -+ if (req->msg == NULL) { -+ error("Couldn't allocate D-Bus message"); -+ return -ENOMEM; -+ } -+ -+ dbus_message_append_args(req->msg, -+ DBUS_TYPE_OBJECT_PATH, &device_path, -+ DBUS_TYPE_STRING, &pincode, -+ DBUS_TYPE_INVALID); -+ -+ if (dbus_connection_send_with_reply(connection, req->msg, -+ &req->call, REQUEST_TIMEOUT) == FALSE) { -+ error("D-Bus send failed"); -+ return -EIO; -+ } -+ -+ dbus_pending_call_set_notify(req->call, display_pincode_reply, -+ req, NULL); -+ -+ return 0; -+} -+ -+int agent_display_pincode(struct agent *agent, struct btd_device *device, -+ const char *pincode, agent_cb cb, -+ void *user_data, GDestroyNotify destroy) -+{ -+ struct agent_request *req; -+ const gchar *dev_path = device_get_path(device); -+ int err; -+ -+ if (agent->request) -+ return -EBUSY; -+ -+ DBG("Calling Agent.DisplayPinCode: name=%s, path=%s, pincode=%s", -+ agent->name, agent->path, pincode); -+ -+ req = agent_request_new(agent, AGENT_REQUEST_DISPLAY_PINCODE, cb, -+ user_data, destroy); -+ -+ err = display_pincode_request_new(req, dev_path, pincode); -+ if (err < 0) -+ goto failed; -+ -+ agent->request = req; -+ -+ return 0; -+ -+failed: -+ agent_request_free(req, FALSE); -+ return err; -+} -+ - uint8_t agent_get_io_capability(struct agent *agent) - { - return agent->capability; -diff --git a/src/agent.h b/src/agent.h -index f62bf3b..69ad42b 100644 ---- a/src/agent.h -+++ b/src/agent.h -@@ -64,6 +64,10 @@ int agent_request_confirmation(struct agent *agent, struct btd_device *device, - int agent_display_passkey(struct agent *agent, struct btd_device *device, - uint32_t passkey); - -+int agent_display_pincode(struct agent *agent, struct btd_device *device, -+ const char *pincode, agent_cb cb, -+ void *user_data, GDestroyNotify destroy); -+ - int agent_cancel(struct agent *agent); - - gboolean agent_is_busy(struct agent *agent, void *user_data); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch deleted file mode 100644 index d489da96f8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 16583671c03b871003430e433ddf197833ea0086 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 15:16:40 -0800 -Subject: [PATCH 04/13] Add AUTH_TYPE_NOTIFY_PASSKEY to - device_request_authentication - -This new authentication type accepts a pincode and calls the -DisplayPinCode agent method, a fallback is provided so that if the -method is not implemented the older RequestPinCode method is used -instead. - -Due to this fallback, the agent_pincode_cb is used and calling -functions should send the pincode passed to the callback to the -adapter, which may differ from that generated. ---- - src/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/device.h | 1 + - 2 files changed, 58 insertions(+), 2 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 8a2ae9d..f32666e 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -93,6 +93,7 @@ struct authentication_req { - struct agent *agent; - struct btd_device *device; - uint32_t passkey; -+ char *pincode; - gboolean secure; - }; - -@@ -277,6 +278,8 @@ static void device_free(gpointer user_data) - - DBG("%p", device); - -+ if (device->authr) -+ g_free(device->authr->pincode); - g_free(device->authr); - g_free(device->path); - g_free(device->alias); -@@ -2453,12 +2456,15 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) - { - struct authentication_req *auth = device->authr; - -- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) -+ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY -+ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) - agent_cancel(auth->agent); - } - - static void device_auth_req_free(struct btd_device *device) - { -+ if (device->authr) -+ g_free(device->authr->pincode); - g_free(device->authr); - device->authr = NULL; - } -@@ -2470,7 +2476,8 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) - - DBG("bonding %p status 0x%02x", bonding, status); - -- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) -+ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY -+ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) - agent_cancel(auth->agent); - - if (status) { -@@ -2680,6 +2687,46 @@ done: - device->authr->agent = NULL; - } - -+static void display_pincode_cb(struct agent *agent, DBusError *err, void *data) -+{ -+ struct authentication_req *auth = data; -+ struct btd_device *device = auth->device; -+ struct btd_adapter *adapter = device_get_adapter(device); -+ struct agent *adapter_agent = adapter_get_agent(adapter); -+ -+ if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) || -+ g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) { -+ -+ /* Request a pincode if we fail to display one */ -+ if (auth->agent == adapter_agent || adapter_agent == NULL) { -+ if (agent_request_pincode(agent, device, pincode_cb, -+ auth->secure, auth, NULL) < 0) -+ goto done; -+ return; -+ } -+ -+ if (agent_display_pincode(adapter_agent, device, auth->pincode, -+ display_pincode_cb, auth, NULL) < 0) -+ goto done; -+ -+ auth->agent = adapter_agent; -+ return; -+ } -+ -+done: -+ /* No need to reply anything if the authentication already failed */ -+ if (auth->cb == NULL) -+ return; -+ -+ ((agent_pincode_cb) auth->cb)(agent, err, auth->pincode, device); -+ -+ g_free(device->authr->pincode); -+ device->authr->pincode = NULL; -+ device->authr->cb = NULL; -+ device->authr->agent = NULL; -+} -+ -+ - int device_request_authentication(struct btd_device *device, auth_type_t type, - void *data, gboolean secure, void *cb) - { -@@ -2728,6 +2775,11 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - auth->passkey = *(uint32_t *)data; - err = agent_display_passkey(agent, device, auth->passkey); - break; -+ case AUTH_TYPE_NOTIFY_PINCODE: -+ auth->pincode = g_strdup((const char *)data); -+ err = agent_display_pincode(agent, device, auth->pincode, -+ display_pincode_cb, auth, NULL); -+ break; - default: - err = -EINVAL; - } -@@ -2768,6 +2820,9 @@ static void cancel_authentication(struct authentication_req *auth) - case AUTH_TYPE_NOTIFY_PASSKEY: - /* User Notify doesn't require any reply */ - break; -+ case AUTH_TYPE_NOTIFY_PINCODE: -+ ((agent_pincode_cb) auth->cb)(agent, &err, NULL, device); -+ break; - } - - dbus_error_free(&err); -diff --git a/src/device.h b/src/device.h -index 998aee7..561865c 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -31,6 +31,7 @@ typedef enum { - AUTH_TYPE_PASSKEY, - AUTH_TYPE_CONFIRM, - AUTH_TYPE_NOTIFY_PASSKEY, -+ AUTH_TYPE_NOTIFY_PINCODE, - } auth_type_t; - - struct btd_device *device_create(DBusConnection *conn, --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch deleted file mode 100644 index d0fbd29e2b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 1630cbe326460a89d5c342847b658a499484ced0 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Thu, 29 Mar 2012 14:04:14 -0700 -Subject: [PATCH 05/13] Add display parameter to plugin pincode callback - -Pass a display parameter to the plugin pincode callback, a plugin -may set this to TRUE to indicate the PIN it generates should be -displayed on the screen for entry into the remote device. ---- - plugins/wiimote.c | 2 +- - src/adapter.c | 4 ++-- - src/adapter.h | 4 ++-- - src/event.c | 3 ++- - 4 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/plugins/wiimote.c b/plugins/wiimote.c -index 1ae638b..43b6de3 100644 ---- a/plugins/wiimote.c -+++ b/plugins/wiimote.c -@@ -56,7 +56,7 @@ - */ - - static ssize_t wii_pincb(struct btd_adapter *adapter, struct btd_device *device, -- char *pinbuf) -+ char *pinbuf, gboolean *display) - { - uint16_t vendor, product; - bdaddr_t sba, dba; -diff --git a/src/adapter.c b/src/adapter.c -index acb845e..ccf7991 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -3330,7 +3330,7 @@ void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, - } - - ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, -- char *pin_buf) -+ char *pin_buf, gboolean *display) - { - GSList *l; - btd_adapter_pin_cb_t cb; -@@ -3339,7 +3339,7 @@ ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, - - for (l = adapter->pin_callbacks; l != NULL; l = g_slist_next(l)) { - cb = l->data; -- ret = cb(adapter, dev, pin_buf); -+ ret = cb(adapter, dev, pin_buf, display); - if (ret > 0) - return ret; - } -diff --git a/src/adapter.h b/src/adapter.h -index ceebb97..aa66070 100644 ---- a/src/adapter.h -+++ b/src/adapter.h -@@ -172,13 +172,13 @@ int btd_adapter_switch_offline(struct btd_adapter *adapter); - void btd_adapter_enable_auto_connect(struct btd_adapter *adapter); - - typedef ssize_t (*btd_adapter_pin_cb_t) (struct btd_adapter *adapter, -- struct btd_device *dev, char *out); -+ struct btd_device *dev, char *out, gboolean *display); - void btd_adapter_register_pin_cb(struct btd_adapter *adapter, - btd_adapter_pin_cb_t cb); - void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, - btd_adapter_pin_cb_t cb); - ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, -- char *pin_buf); -+ char *pin_buf, gboolean *display); - - typedef void (*bt_hci_result_t) (uint8_t status, gpointer user_data); - -diff --git a/src/event.c b/src/event.c -index 7d66b6d..d87b6a4 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -119,12 +119,13 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) - struct btd_device *device; - char pin[17]; - ssize_t pinlen; -+ gboolean display = FALSE; - - if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) - return -ENODEV; - - memset(pin, 0, sizeof(pin)); -- pinlen = btd_adapter_get_pin(adapter, device, pin); -+ pinlen = btd_adapter_get_pin(adapter, device, pin, &display); - if (pinlen > 0 && (!secure || pinlen == 16)) { - btd_adapter_pincode_reply(adapter, dba, pin, pinlen); - return 0; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch deleted file mode 100644 index ce3736021e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2a902f071ec21572094ce9cdf54099ad275e7904 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Thu, 29 Mar 2012 14:07:13 -0700 -Subject: [PATCH 06/13] Display PIN generated by plugin - -If a plugin pincode callback sets the display parameter to TRUE, send -the generated PIN to the agent for display using the new DisplayPinCode -agent method, including its fallback to RequestPinCode. ---- - src/event.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/src/event.c b/src/event.c -index d87b6a4..5b60fb3 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -127,6 +127,11 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) - memset(pin, 0, sizeof(pin)); - pinlen = btd_adapter_get_pin(adapter, device, pin, &display); - if (pinlen > 0 && (!secure || pinlen == 16)) { -+ if (display && device_is_bonding(device, NULL)) -+ return device_request_authentication(device, -+ AUTH_TYPE_NOTIFY_PINCODE, pin, -+ secure, pincode_cb); -+ - btd_adapter_pincode_reply(adapter, dba, pin, pinlen); - return 0; - } --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0007-doc-document-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0007-doc-document-DisplayPinCode.patch deleted file mode 100644 index 685f1c205f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0007-doc-document-DisplayPinCode.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8a9347822f86059d015ae3893387aa971fa41ab7 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 15:25:39 -0800 -Subject: [PATCH 07/13] doc: document DisplayPinCode - ---- - doc/agent-api.txt | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -diff --git a/doc/agent-api.txt b/doc/agent-api.txt -index 9ab2063..5c8d4d2 100644 ---- a/doc/agent-api.txt -+++ b/doc/agent-api.txt -@@ -61,6 +61,30 @@ Methods void Release() - so the display should be zero-padded at the start if - the value contains less than 6 digits. - -+ void DisplayPinCode(object device, string pincode) -+ -+ This method gets called when the service daemon -+ needs to display a pincode for an authentication. -+ -+ An empty reply should be returned. When the pincode -+ needs no longer to be displayed, the Cancel method -+ of the agent will be called. -+ -+ If this method is not implemented the RequestPinCode -+ method will be used instead. -+ -+ This is used during the pairing process of keyboards -+ that don't support Bluetooth 2.1 Secure Simple Pairing, -+ in contrast to DisplayPasskey which is used for those -+ that do. -+ -+ This method will only ever be called once since -+ older keyboards do not support typing notification. -+ -+ Note that the PIN will always be a 6-digit number, -+ zero-padded to 6 digits. This is for harmony with -+ the later specification. -+ - void RequestConfirmation(object device, uint32 passkey) - - This method gets called when the service daemon --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch deleted file mode 100644 index e7cd7f8b97..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4f2f55231bad4d5da2505cb674375e9bf8ac029d Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 15:25:56 -0800 -Subject: [PATCH 08/13] simple-agent: add DisplayPinCode - ---- - test/simple-agent | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/test/simple-agent b/test/simple-agent -index af84815..38d0235 100755 ---- a/test/simple-agent -+++ b/test/simple-agent -@@ -52,6 +52,11 @@ class Agent(dbus.service.Object): - print "DisplayPasskey (%s, %06d)" % (device, passkey) - - @dbus.service.method("org.bluez.Agent", -+ in_signature="os", out_signature="") -+ def DisplayPinCode(self, device, pincode): -+ print "DisplayPinCode (%s, %s)" % (device, pincode) -+ -+ @dbus.service.method("org.bluez.Agent", - in_signature="ou", out_signature="") - def RequestConfirmation(self, device, passkey): - print "RequestConfirmation (%s, %06d)" % (device, passkey) --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch deleted file mode 100644 index 26b2aa7143..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 0cd8c8427019cfd7e1c69fb6a5b4261863716d56 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:34:01 -0800 -Subject: [PATCH 09/13] Add support for retrying a bonding - -In order to retry a bonding we need a timer that will perform the -retry, we need to stash the status and capability of the bonding -request so it can use them again, and in the case of a retrying -bonding attempt we need to not tear down the temporary D-Bus device -object on the adapter. ---- - src/adapter.c | 2 +- - src/device.c | 14 ++++++++++++++ - src/device.h | 1 + - 3 files changed, 16 insertions(+), 1 deletions(-) - -diff --git a/src/adapter.c b/src/adapter.c -index ccf7991..f065a5d 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -2989,7 +2989,7 @@ void adapter_remove_connection(struct btd_adapter *adapter, - if (device_is_authenticating(device)) - device_cancel_authentication(device, TRUE); - -- if (device_is_temporary(device)) { -+ if (device_is_temporary(device) && !device_is_retrying(device)) { - const char *path = device_get_path(device); - - DBG("Removing temporary device %s", path); -diff --git a/src/device.c b/src/device.c -index f32666e..9d4517f 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -85,6 +85,9 @@ struct bonding_req { - DBusMessage *msg; - guint listener_id; - struct btd_device *device; -+ uint8_t capability; -+ uint8_t status; -+ guint retry_timer; - }; - - struct authentication_req { -@@ -2295,6 +2298,9 @@ static void bonding_request_free(struct bonding_req *bonding) - if (bonding->conn) - dbus_connection_unref(bonding->conn); - -+ if (bonding->retry_timer) -+ g_source_remove(bonding->retry_timer); -+ - device = bonding->device; - g_free(bonding); - -@@ -2367,6 +2373,7 @@ proceed: - - bonding->conn = dbus_connection_ref(conn); - bonding->msg = dbus_message_ref(msg); -+ bonding->capability = capability; - - return bonding; - } -@@ -2469,6 +2476,13 @@ static void device_auth_req_free(struct btd_device *device) - device->authr = NULL; - } - -+gboolean device_is_retrying(struct btd_device *device) -+{ -+ struct bonding_req *bonding = device->bonding; -+ -+ return bonding && bonding->retry_timer != 0; -+} -+ - void device_bonding_complete(struct btd_device *device, uint8_t status) - { - struct bonding_req *bonding = device->bonding; -diff --git a/src/device.h b/src/device.h -index 561865c..b957ad6 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -75,6 +75,7 @@ void device_set_temporary(struct btd_device *device, gboolean temporary); - void device_set_bonded(struct btd_device *device, gboolean bonded); - void device_set_auto_connect(struct btd_device *device, gboolean enable); - gboolean device_is_connected(struct btd_device *device); -+gboolean device_is_retrying(struct btd_device *device); - DBusMessage *device_create_bonding(struct btd_device *device, - DBusConnection *conn, DBusMessage *msg, - const char *agent_path, uint8_t capability); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch deleted file mode 100644 index 6b76a4b84f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 83c36231418f9deff7ba16ceb0ead5d63e177a04 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:30:53 -0800 -Subject: [PATCH 10/13] plugin: Add bonding callback support for plugins - -Allow plugins to register a bonding callback on a device, this will be -called on completion or cancellation of a bonding attempt on that -device and allow retrying of the bonding attempt. - -These callbacks will only be called once, in the case of retrying the -callback must be registered again separately from another callback -(e.g. the pincode callback). ---- - src/device.c | 17 +++++++++++++++++ - src/device.h | 8 ++++++++ - 2 files changed, 25 insertions(+), 0 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 9d4517f..9a62eef 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -144,6 +144,7 @@ struct btd_device { - GSList *primaries; /* List of primary services */ - GSList *drivers; /* List of device drivers */ - GSList *watches; /* List of disconnect_data */ -+ GSList *bonding_callbacks; /* List of bonding callbacks */ - gboolean temporary; - struct agent *agent; - guint disconn_timer; -@@ -264,6 +265,8 @@ static void device_free(gpointer user_data) - g_slist_free_full(device->attios, g_free); - g_slist_free_full(device->attios_offline, g_free); - -+ g_slist_free(device->bonding_callbacks); -+ - att_cleanup(device); - - if (device->tmp_records) -@@ -2476,6 +2479,20 @@ static void device_auth_req_free(struct btd_device *device) - device->authr = NULL; - } - -+void btd_device_register_bonding_cb(struct btd_device *device, -+ btd_device_bonding_cb_t cb) -+{ -+ device->bonding_callbacks = g_slist_prepend( -+ device->bonding_callbacks, cb); -+} -+ -+void btd_device_unregister_bonding_cb(struct btd_device *device, -+ btd_device_bonding_cb_t cb) -+{ -+ device->bonding_callbacks = g_slist_remove( -+ device->bonding_callbacks, cb); -+} -+ - gboolean device_is_retrying(struct btd_device *device) - { - struct bonding_req *bonding = device->bonding; -diff --git a/src/device.h b/src/device.h -index b957ad6..ce8675b 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -103,6 +103,14 @@ guint device_add_disconnect_watch(struct btd_device *device, - void device_remove_disconnect_watch(struct btd_device *device, guint id); - void device_set_class(struct btd_device *device, uint32_t value); - -+typedef gboolean (*btd_device_bonding_cb_t) (struct btd_device *device, -+ gboolean complete, uint8_t status); -+ -+void btd_device_register_bonding_cb(struct btd_device *dev, -+ btd_device_bonding_cb_t cb); -+void btd_device_unregister_bonding_cb(struct btd_device *dev, -+ btd_device_bonding_cb_t cb); -+ - #define BTD_UUIDS(args...) ((const char *[]) { args, NULL } ) - - struct btd_device_driver { --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch deleted file mode 100644 index 913365ef0d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f3d2851b74fe790896f819efbc694e288d54d819 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:35:30 -0800 -Subject: [PATCH 11/13] bonding: retry if callback returns TRUE - -When a bonding completes, pass the status to any plugin bonding -callbacks; if any return TRUE than set a timer to retry the bonding -after an appropriate backoff period. ---- - src/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 46 insertions(+), 0 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 9a62eef..4ad5aa0 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2493,6 +2493,44 @@ void btd_device_unregister_bonding_cb(struct btd_device *device, - device->bonding_callbacks, cb); - } - -+static gboolean device_bonding_retry(gpointer data) -+{ -+ struct btd_device *device = data; -+ struct btd_adapter *adapter = device_get_adapter(device); -+ struct bonding_req *bonding = device->bonding; -+ int err; -+ -+ if (!bonding) -+ return FALSE; -+ -+ DBG("retrying bonding"); -+ err = adapter_create_bonding(adapter, &device->bdaddr, -+ device->type, bonding->capability); -+ if (err < 0) -+ device_bonding_complete(device, bonding->status); -+ -+ bonding->retry_timer = 0; -+ return FALSE; -+} -+ -+static gboolean device_bonding_get_retry(struct btd_device *device, -+ uint8_t status) -+{ -+ GSList *l; -+ btd_device_bonding_cb_t cb; -+ gboolean retry = FALSE; -+ -+ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { -+ cb = l->data; -+ retry |= cb(device, TRUE, status); -+ } -+ -+ g_slist_free(device->bonding_callbacks); -+ device->bonding_callbacks = NULL; -+ -+ return retry; -+} -+ - gboolean device_is_retrying(struct btd_device *device) - { - struct bonding_req *bonding = device->bonding; -@@ -2507,6 +2545,14 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) - - DBG("bonding %p status 0x%02x", bonding, status); - -+ if (device_bonding_get_retry(device, status) && status) { -+ DBG("backing off and retrying"); -+ bonding->status = status; -+ bonding->retry_timer = g_timeout_add(3000, -+ device_bonding_retry, device); -+ return; -+ } -+ - if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY - || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) - agent_cancel(auth->agent); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch deleted file mode 100644 index a766a09795..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 82ef8f4b96d62e18b5a191f6aaa9d79140ca64a4 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:36:44 -0800 -Subject: [PATCH 12/13] bonding: call plugin callback on cancellation - -Call the plugin callbacks when a bonding request is cancelled. ---- - src/device.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 4ad5aa0..ea0d1fb 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2648,6 +2648,8 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) - struct bonding_req *bonding = device->bonding; - DBusMessage *reply; - char addr[18]; -+ GSList *l; -+ btd_device_bonding_cb_t cb; - - if (!bonding) - return; -@@ -2655,6 +2657,14 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) - ba2str(&device->bdaddr, addr); - DBG("Canceling bonding request for %s", addr); - -+ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { -+ cb = l->data; -+ cb(device, FALSE, 0); -+ } -+ -+ g_slist_free(device->bonding_callbacks); -+ device->bonding_callbacks = NULL; -+ - if (device->authr) - device_cancel_authentication(device, FALSE); - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0013-autopair-Add-autopair-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0013-autopair-Add-autopair-plugin.patch deleted file mode 100644 index 81a5f3f8cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-4.99-autopair-0013-autopair-Add-autopair-plugin.patch +++ /dev/null @@ -1,274 +0,0 @@ -From 2236069d7d5bf54ae53470c13929cba90e020710 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Thu, 5 Apr 2012 15:42:12 -0700 -Subject: [PATCH 13/13] autopair: Add autopair plugin. - ---- - Makefile.am | 5 + - acinclude.m4 | 6 ++ - plugins/autopair.c | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 218 insertions(+), 0 deletions(-) - create mode 100644 plugins/autopair.c - -diff --git a/Makefile.am b/Makefile.am -index bd587eb..0e9129c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -278,6 +278,11 @@ builtin_modules += dbusoob - builtin_sources += plugins/dbusoob.c - endif - -+if AUTOPAIRPLUGIN -+builtin_modules += autopair -+builtin_sources += plugins/autopair.c -+endif -+ - if MAINTAINER_MODE - plugin_LTLIBRARIES += plugins/external-dummy.la - plugins_external_dummy_la_SOURCES = plugins/external-dummy.c -diff --git a/acinclude.m4 b/acinclude.m4 -index b0f790c..4c1849a 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -220,6 +220,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - dbusoob_enable=no - wiimote_enable=no - thermometer_enable=no -+ autopair_enable=no - - AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [ - optimization_enable=${enableval} -@@ -364,6 +365,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - wiimote_enable=${enableval} - ]) - -+ AC_ARG_ENABLE(autopair, AC_HELP_STRING([--enable-autopair], [compile with autopairing plugin]), [ -+ autopair_enable=${enableval} -+ ]) -+ - AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [Use HAL to determine adapter class]), [ - hal_enable=${enableval} - ]) -@@ -429,4 +434,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes") - AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes") - AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes") -+ AM_CONDITIONAL(AUTOPAIRPLUGIN, test "${autopair_enable}" = "yes") - ]) -diff --git a/plugins/autopair.c b/plugins/autopair.c -new file mode 100644 -index 0000000..58047b1 ---- /dev/null -+++ b/plugins/autopair.c -@@ -0,0 +1,208 @@ -+/* -+ * -+ * BlueZ - Bluetooth protocol stack for Linux -+ * -+ * Copyright (C) 2012 Google Inc. -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include -+ -+#include "glib-compat.h" -+#include "plugin.h" -+#include "adapter.h" -+#include "device.h" -+#include "storage.h" -+#include "textfile.h" -+#include "log.h" -+ -+/* -+ * Plugin to handle automatic pairing of devices with reduced user -+ * interaction, including implementing the recommendation of the HID spec -+ * for keyboard devices. -+ * -+ * The plugin works by intercepting the PIN request for devices; if the -+ * device is a keyboard a random six-digit numeric PIN is generated and -+ * returned, flagged for displaying using DisplayPinCode. -+ * -+ * Bonding callbacks are also added for the device, so should the pairing -+ * attempt fail with the PIN from this plugin, a blacklist entry is added -+ * and pairing retried. On the second pass this plugin will ignore the -+ * device due to the blacklist and the user will be prompted for a PIN -+ * instead. -+ */ -+ -+static GSList *blacklist = NULL; -+ -+static void autopair_blacklist_device(struct btd_device *device) -+{ -+ bdaddr_t *ba; -+ -+ ba = g_new0(bdaddr_t, 1); -+ device_get_address(device, ba, NULL); -+ blacklist = g_slist_prepend(blacklist, ba); -+} -+ -+ -+static GSList *attempting = NULL; -+ -+static gboolean autopair_bondingcb(struct btd_device *device, -+ gboolean complete, uint8_t status) -+{ -+ GSList *match; -+ -+ match = g_slist_find(attempting, device); -+ if (!match) -+ return FALSE; -+ -+ attempting = g_slist_remove_link(attempting, match); -+ btd_device_unref(device); -+ -+ if (complete && status != 0) { -+ /* failed: blacklist and retry with the user's agent */ -+ autopair_blacklist_device(device); -+ return TRUE; -+ } else { -+ /* successful or cancelled pair */ -+ return FALSE; -+ } -+} -+ -+static gboolean autopair_attempt(struct btd_device *device) -+{ -+ if (g_slist_find(attempting, device)) -+ return FALSE; -+ -+ btd_device_register_bonding_cb(device, autopair_bondingcb); -+ attempting = g_slist_prepend(attempting, btd_device_ref(device)); -+ -+ return TRUE; -+} -+ -+static void autopair_cancel_all(void) -+{ -+ GSList *l; -+ struct btd_device *device; -+ -+ for (l = attempting; l != NULL; l = g_slist_next(l)) { -+ device = l->data; -+ btd_device_unregister_bonding_cb(device, autopair_bondingcb); -+ btd_device_unref(device); -+ } -+ -+ g_slist_free(attempting); -+ attempting = NULL; -+} -+ -+static ssize_t autopair_pincb(struct btd_adapter *adapter, -+ struct btd_device *device, -+ char *pinbuf, gboolean *display) -+{ -+ char addr[18]; -+ bdaddr_t local, peer; -+ uint32_t class; -+ -+ if (!device_is_bonding(device, NULL)) -+ return 0; -+ -+ adapter_get_address(adapter, &local); -+ -+ device_get_address(device, &peer, NULL); -+ ba2str(&peer, addr); -+ -+ read_remote_class(&local, &peer, &class); -+ -+ DBG("device %s 0x%x", addr, class); -+ -+ if (g_slist_find_custom(blacklist, &peer, (GCompareFunc) bacmp)) { -+ DBG("prior autopair failed"); -+ return 0; -+ } -+ -+ switch ((class & 0x1f00) >> 8) { -+ case 0x05: -+ switch ((class & 0xc0) >> 6) { -+ case 0x01: -+ case 0x03: -+ if (autopair_attempt(device)) { -+ char pinstr[7]; -+ srand(time(NULL)); -+ snprintf(pinstr, sizeof pinstr, "%06d", -+ rand() % 1000000); -+ *display = TRUE; -+ memcpy(pinbuf, pinstr, 6); -+ return 6; -+ } -+ break; -+ } -+ break; -+ } -+ -+ return 0; -+} -+ -+ -+static int autopair_probe(struct btd_adapter *adapter) -+{ -+ btd_adapter_register_pin_cb(adapter, autopair_pincb); -+ -+ return 0; -+} -+ -+static void autopair_remove(struct btd_adapter *adapter) -+{ -+ btd_adapter_unregister_pin_cb(adapter, autopair_pincb); -+} -+ -+static struct btd_adapter_driver autopair_driver = { -+ .name = "autopair", -+ .probe = autopair_probe, -+ .remove = autopair_remove, -+}; -+ -+static int autopair_init(void) -+{ -+ return btd_register_adapter_driver(&autopair_driver); -+} -+ -+static void autopair_exit(void) -+{ -+ btd_unregister_adapter_driver(&autopair_driver); -+ -+ autopair_cancel_all(); -+ -+ g_slist_free_full(blacklist, g_free); -+} -+ -+BLUETOOTH_PLUGIN_DEFINE(autopair, VERSION, -+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, autopair_init, autopair_exit) --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-autopair.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-autopair.patch deleted file mode 100644 index e9126a34e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-autopair.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 36358d4a7b3471f5a124a95fec9ed0e4871299e0 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Wed, 18 Apr 2012 15:53:55 -0700 -Subject: [PATCH 14/14] autopair: use 0000 as PIN for dumb devices - -Android tries 0000 for a set of audio devices, so follow suit and -do the same even though most audio devices support SSP these days. - -BUG=chromium-os:25211 -TEST=verified with audio devices after 'hciconfig hci0 sspmode 0' ---- - plugins/autopair.c | 26 +++++++++++++++++++++++--- - 1 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/plugins/autopair.c b/plugins/autopair.c -index 05de3ff..5b773c5 100644 ---- a/plugins/autopair.c -+++ b/plugins/autopair.c -@@ -150,10 +150,24 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - } - - switch ((class & 0x1f00) >> 8) { -- case 0x05: -+ case 0x04: // Audio/Video -+ switch ((class & 0xfc) >> 2) { -+ case 0x01: // Wearable Headset Device -+ case 0x02: // Hands-free Device -+ case 0x06: // Headphones -+ case 0x07: // Portable Audio -+ case 0x0a: // HiFi Audio Device -+ if (autopair_attempt(device)) { -+ memcpy(pinbuf, "0000", 4); -+ return 4; -+ } -+ break; -+ } -+ break; -+ case 0x05: // Peripheral - switch ((class & 0xc0) >> 6) { -- case 0x01: -- case 0x03: -+ case 0x01: // Keyboard -+ case 0x03: // Combo keyboard/pointing device - if (autopair_attempt(device)) { - char pinstr[7]; - srand(time(NULL)); -@@ -164,6 +178,12 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - return 6; - } - break; -+ case 0x02: // Pointing device -+ if (autopair_attempt(device)) { -+ memcpy(pinbuf, "0000", 4); -+ return 4; -+ } -+ break; - } - break; - } --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-dbus.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-dbus.patch deleted file mode 100644 index 5ae911de9c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-dbus.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/bluetooth.conf b/src/bluetooth.conf -index 664dbd9..3263112 100644 ---- a/src/bluetooth.conf -+++ b/src/bluetooth.conf -@@ -7,7 +7,7 @@ - - - -- -+ - - - -@@ -18,13 +18,7 @@ - - - -- -- -- -- -- -- -+ - - - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-initially-powered.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-initially-powered.patch deleted file mode 100644 index 8526997b55..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-initially-powered.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/main.conf b/src/main.conf -index 321f622..f6784fb 100644 ---- a/src/main.conf -+++ b/src/main.conf -@@ -38,7 +38,7 @@ AutoConnectTimeout = 60 - - # What value should be assumed for the adapter Powered property when - # SetProperty(Powered, ...) hasn't been called yet. Defaults to true --InitiallyPowered = true -+InitiallyPowered = false - - # Remember the previously stored Powered state when initializing adapters - RememberPowered = true diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-sdp-path.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-sdp-path.patch deleted file mode 100644 index 6dac6bf83c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez-test/files/bluez-test-sdp-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/sdp.h b/lib/sdp.h -index 2fe74d5..e559a5c 100644 ---- a/lib/sdp.h -+++ b/lib/sdp.h -@@ -34,7 +34,7 @@ extern "C" { - #include - #include - --#define SDP_UNIX_PATH "/var/run/sdp" -+#define SDP_UNIX_PATH "/var/run/bluetooth/sdp" - #define SDP_RESPONSE_TIMEOUT 20 - #define SDP_REQ_BUFFER_SIZE 2048 - #define SDP_RSP_BUFFER_SIZE 65535 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/Manifest deleted file mode 100644 index 49c3640c73..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST bluez-4.62.tar.gz 974796 SHA256 f63203cbbd5be7d9986d5df42c7a96c3edb7442d99539fbe9c7964243b286792 -DIST bluez-4.97.tar.xz 838040 SHA256 7599118d1551ea4a61534d3f3bcbb75b8bccbaf97d7d1e037cfc90cf62aa29c2 SHA512 7a5537ed2006cb5a83955b5d8feaedee075ddb9f93f026c9f02d0b852b0370b77311fd5f81fd908a2a6915130f04c00d6219d8812a312a40dbc67475f6b5f3ee WHIRLPOOL 2a367d87a0acbb105f9ec8cf71be5527dcb95619bf12985eb3404ce1922e89aa44624ffa6a6eba6b190093a230a449f11ab01b951f96398047dca1e9bd88a6d1 -DIST bluez-4.99.tar.xz 859756 SHA256 41889a91a5516eec26c4e59095ceea076de158b1ac38fd0ede9034596f511d3b SHA512 79e36a65ff9ff9c3311a8ef4819692503bb02f048a3c42dd0b9512749fb8e4d810eb832f211fb7dfebc7b6b5bf82a9363edd15741d62595f36d782804bb39ac3 WHIRLPOOL 32b8e3f67c846a17e7335395021008c181a2645fdb08b4ebe36bf4ad5221eef00f86ec7ef0d1de19c64741c884376666677ca9e129868dcaa18a5d4c0737c894 -DIST oui-20111231.txt.xz 540056 SHA256 0a141f649cf999e101efc2e36bd876f264d75bb8ebf4d2997153067132f85d17 SHA512 191eff688dcec6e5c0fae4ee3da1b2e3bd4cd239ba9b6f0db8c5ef515a9b3150af27d72f3921aa530c3c38b95d4e82d24167728ffccb53ce0c4fc2e257b4854e WHIRLPOOL 818ead21c81026619264e3557db727c10ca3bf8302c05493c19eee2e75ccdb802df487bb19807737ad9abfff77efaf7f94e6439d7245dd38ab4187d0bc2e4800 -DIST oui-20120308.txt.xz 546720 SHA256 4256ba96a522333a41fd058e1880a04f77566c9ad0a62d3c0d7ac422bf8b9086 SHA512 f749b3ce9b6173760319849f1e4699f02d4f8628de78d0bc39c08b01331567b60a9bd3303a84982ad23bc6cbe7b6d9f27e2e26f699a818dac0e0e8fa6ddb44fa WHIRLPOOL 0797457e3bb54d49b295547a47894258c2c5a9954ca87c44948bdb57781e11c84d2d1be9cf6d3deb0d062e4a98b0b1fb406a1f0fbeb9d0a294da624c2e90f9ee diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62-r103.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62-r103.ebuild deleted file mode 120000 index 7dce9f866c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62-r103.ebuild +++ /dev/null @@ -1 +0,0 @@ -bluez-4.62.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62.ebuild deleted file mode 100644 index 406d62480e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.62.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.62.ebuild,v 1.1 2010/03/08 14:35:09 pacho Exp $ - -EAPI="2" - -inherit autotools multilib eutils - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://bluez.sourceforge.net/" -SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz" -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm x86" - -IUSE="alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb" - -CDEPEND="alsa? ( - media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] - ) - caps? ( >=sys-libs/libcap-ng-0.6.2 ) - gstreamer? ( - >=media-libs/gstreamer-0.10 - >=media-libs/gst-plugins-base-0.10 ) - usb? ( dev-libs/libusb ) - cups? ( net-print/cups ) - sys-fs/udev - dev-libs/glib - sys-apps/dbus - media-libs/libsndfile - >=dev-libs/libnl-1.1 - !net-wireless/bluez-libs - !net-wireless/bluez-utils" -DEPEND="sys-devel/flex - >=dev-util/pkgconfig-0.20 - ${CDEPEND}" -RDEPEND="${CDEPEND} - consolekit? ( sys-auth/pambase[consolekit] ) - test-programs? ( - dev-python/dbus-python - dev-python/pygobject )" - -src_prepare() { - if use cups; then - epatch "${FILESDIR}/4.60/cups-location.patch" - fi - - # Fix alsa files location - epatch "${FILESDIR}/${PN}-alsa_location.patch" - - # Incorporate ATH3k support - epatch "${FILESDIR}/${PN}-ath3k.patch" - - # Allow user chronos to send requests - epatch "${FILESDIR}/${PN}-chronos.patch" - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable caps capng) \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-service \ - $(use_enable gstreamer) \ - $(use_enable alsa) \ - $(use_enable usb) \ - --enable-netlink \ - --enable-tools \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-dfutool \ - $(use_enable old-daemons hidd) \ - $(use_enable old-daemons pand) \ - $(use_enable old-daemons dund) \ - $(use_enable cups) \ - $(use_enable test-programs test) \ - --enable-udevrules \ - --enable-configfiles \ - $(use_enable pcmcia) \ - $(use_enable debug) \ - --localstatedir=/var -} - -src_compile() { - # TODO: Re-enable parallel-make when dependency issue with generated headers - # is fixed. See http://crosbug.com/15028 - emake -j1 || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog README || die - - if use test-programs ; then - cd "${S}/test" - dobin simple-agent simple-service monitor-bluetooth - newbin list-devices list-bluetooth-devices - for b in apitest hsmicro hsplay test-* ; do - newbin "${b}" "bluez-${b}" - done - insinto /usr/share/doc/${PF}/test-services - doins service-* - - cd "${S}" - fi - - if use old-daemons; then - newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die - newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die - fi - - insinto /etc/bluetooth - doins \ - input/input.conf \ - audio/audio.conf \ - network/network.conf \ - serial/serial.conf \ - || die - - insinto /etc/udev/rules.d/ - newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die - exeinto /$(get_libdir)/udev/ - newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die - - newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || die - newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die -} - -pkg_postinst() { - udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth - - elog - elog "To use dial up networking you must install net-dialup/ppp." - elog - elog "For a password agent, there is for example net-wireless/bluez-gnome" - elog "for gnome and net-wireless/kdebluetooth for kde. You can also give a" - elog "try to net-wireless/blueman" - elog - elog "Use the old-daemons use flag to get the old daemons like hidd" - elog "installed. Please note that the init script doesn't stop the old" - elog "daemons after you update it so it's recommended to run:" - elog " /etc/init.d/bluetooth stop" - elog "before updating your configuration files or you can manually kill" - elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth." - - if use consolekit; then - elog "" - elog "If you want to use rfcomm as a normal user, you need to add the user" - elog "to the uucp group." - else - elog "" - elog "Since you have the consolekit use flag disabled, you will only be able to run" - elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as " - elog "a regular user, you need to enable the consolekit use flag for this package." - fi - - if use old-daemons; then - elog "" - elog "The hidd init script was installed because you have the old-daemons" - elog "use flag on. It is not started by default via udev so please add it" - elog "to the required runlevels using rc-update add hidd. If" - elog "you need init scripts for the other daemons, please file requests" - elog "to https://bugs.gentoo.org." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.97-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.97-r11.ebuild deleted file mode 100644 index 0e457d4cdd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.97-r11.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2011 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.1 2011/12/31 21:09:18 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="test-programs? 2" - -inherit autotools multilib eutils systemd python - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org/" - -# Because of oui.txt changing from time to time without noticement, we need to supply it -# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly. -# See bugs #345263 and #349473 for reference. -OUIDATE="20111231" -SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz - http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86" -IUSE="alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb" - -CDEPEND=" - >=dev-libs/glib-2.14:2 - sys-apps/dbus - >=sys-fs/udev-169 - alsa? ( - media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] - media-libs/libsndfile - ) - caps? ( >=sys-libs/libcap-ng-0.6.2 ) - cups? ( net-print/cups ) - gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 - ) - usb? ( dev-libs/libusb:1 ) -" -DEPEND="${CDEPEND} - >=dev-util/pkgconfig-0.20 - >=dev-libs/check-0.9.8 - sys-devel/flex -" -RDEPEND="${CDEPEND} - !net-wireless/bluez-libs - !net-wireless/bluez-utils - consolekit? ( - || ( sys-auth/consolekit - >=sys-apps/systemd-37 ) - ) - test-programs? ( - dev-python/dbus-python - dev-python/pygobject:2 - ) -" - -DOCS=( AUTHORS ChangeLog README ) - -pkg_setup() { - if use test-programs; then - python_pkg_setup - fi -} - -src_prepare() { - # Change the default D-Bus configuration; the daemon is run as - # bluetooth, not root; we don't use the lp user, and we use the - # chronos user instead of at_console - epatch "${FILESDIR}/${PN}-4.97-dbus.patch" - - # Change the default SDP Server socket path to a sub-directory - # under /var/run, since /var/run is not writeable by the bluetooth - # user. - epatch "${FILESDIR}/${PN}-4.97-sdp-path.patch" - - # Disable initial radio power for new adapters - epatch "${FILESDIR}/${PN}-4.97-initially-powered.patch" - - # Automatic pairing support, including keyboard pairing support - # (in upstream review) - epatch "${FILESDIR}/${PN}-4.97-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0003-agent-add-DisplayPinCode-method.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0006-Display-PIN-generated-by-plugin.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0007-doc-document-DisplayPinCode.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0008-simple-agent-add-DisplayPinCode.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0009-Add-support-for-retrying-a-bonding.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch" - epatch "${FILESDIR}/${PN}-4.97-autopair-0013-autopair-Add-autopair-plugin.patch" - - if use cups; then - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ - Makefile.tools Makefile.in || die - fi -} - -src_configure() { - econf \ - --enable-hid2hci \ - --enable-audio \ - --enable-bccmd \ - --enable-datafiles \ - --enable-dfutool \ - --enable-input \ - --enable-network \ - --enable-serial \ - --enable-service \ - --enable-tools \ - --disable-hal \ - --localstatedir=/var \ - --with-systemdunitdir="$(systemd_get_unitdir)" \ - --with-ouifile=/usr/share/misc/oui.txt \ - $(use_enable alsa) \ - $(use_enable caps capng) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable gstreamer) \ - $(use_enable pcmcia) \ - $(use_enable test-programs test) \ - $(use_enable usb) \ - --enable-health \ - --enable-maemo6 \ - --enable-pnat \ - --enable-wiimote \ - --enable-dbusoob \ - --enable-autopair -} - -src_install() { - default - - if use test-programs ; then - cd "${S}/test" - dobin simple-agent simple-service monitor-bluetooth - newbin list-devices list-bluetooth-devices - rm test-textfile.{c,o} || die # bug #356529 - for b in apitest hsmicro hsplay test-* ; do - newbin "${b}" "bluez-${b}" - done - insinto /usr/share/doc/${PF}/test-services - doins service-* - - python_convert_shebangs -r 2 "${ED}" - cd "${S}" - fi - - insinto /etc/bluetooth - doins \ - input/input.conf \ - audio/audio.conf \ - network/network.conf \ - serial/serial.conf - - newinitd "${FILESDIR}/rfcomm-init.d" rfcomm - newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm - - insinto /etc/init - newins "${FILESDIR}/${PN}-upstart.conf" bluetoothd.conf - - # Install oui.txt as requested in bug #283791 and approved by upstream - insinto /usr/share/misc - newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt - - fowners bluetooth:bluetooth /var/lib/bluetooth - - rm "${D}/lib/udev/rules.d/97-bluetooth.rules" - - find "${D}" -name "*.la" -delete -} - -pkg_postinst() { - if ! has_version "net-dialup/ppp"; then - elog "To use dial up networking you must install net-dialup/ppp." - fi - - if use consolekit; then - elog "If you want to use rfcomm as a normal user, you need to add the user" - elog "to the uucp group." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.99-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.99-r6.ebuild deleted file mode 100644 index c0e2b0788d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/bluez-4.99-r6.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# 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.99.ebuild,v 1.7 2012/04/15 16:53:41 maekke Exp $ - -EAPI="4" -PYTHON_DEPEND="test-programs? 2" - -inherit autotools multilib eutils systemd python - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org/" - -# Because of oui.txt changing from time to time without noticement, we need to supply it -# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly. -# See bugs #345263 and #349473 for reference. -OUIDATE="20120308" -SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz - http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86" -IUSE="alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb readline" - -CDEPEND=" - >=dev-libs/glib-2.14:2 - sys-apps/dbus - >=sys-fs/udev-169 - alsa? ( - media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] - media-libs/libsndfile - ) - caps? ( >=sys-libs/libcap-ng-0.6.2 ) - cups? ( net-print/cups ) - gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 - ) - usb? ( virtual/libusb:0 ) - readline? ( sys-libs/readline ) -" -DEPEND="${CDEPEND} - >=dev-util/pkgconfig-0.20 - sys-devel/flex - test-programs? ( >=dev-libs/check-0.9.8 ) -" -RDEPEND="${CDEPEND} - !net-wireless/bluez-libs - !net-wireless/bluez-utils - consolekit? ( - || ( sys-auth/consolekit - >=sys-apps/systemd-37 ) - ) - test-programs? ( - dev-python/dbus-python - dev-python/pygobject:2 - ) -" - -DOCS=( AUTHORS ChangeLog README ) - -pkg_setup() { - if use test-programs; then - python_pkg_setup - fi -} - -src_prepare() { - # Change the default D-Bus configuration; the daemon is run as - # bluetooth, not root; we don't use the lp user, and we use the - # chronos user instead of at_console - epatch "${FILESDIR}/${PN}-dbus.patch" - - # Change the default SDP Server socket path to a sub-directory - # under /var/run, since /var/run is not writeable by the bluetooth - # user. - epatch "${FILESDIR}/${PN}-sdp-path.patch" - - # Disable initial radio power for new adapters - epatch "${FILESDIR}/${PN}-initially-powered.patch" - - # Automatic pairing support, including keyboard pairing support. - # (accepted upstream, can be dropped for next release) - epatch "${FILESDIR}/${P}-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch" - epatch "${FILESDIR}/${P}-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch" - epatch "${FILESDIR}/${P}-autopair-0003-agent-add-DisplayPinCode-method.patch" - epatch "${FILESDIR}/${P}-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch" - epatch "${FILESDIR}/${P}-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch" - epatch "${FILESDIR}/${P}-autopair-0006-Display-PIN-generated-by-plugin.patch" - epatch "${FILESDIR}/${P}-autopair-0007-doc-document-DisplayPinCode.patch" - epatch "${FILESDIR}/${P}-autopair-0008-simple-agent-add-DisplayPinCode.patch" - epatch "${FILESDIR}/${P}-autopair-0009-Add-support-for-retrying-a-bonding.patch" - epatch "${FILESDIR}/${P}-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch" - epatch "${FILESDIR}/${P}-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch" - epatch "${FILESDIR}/${P}-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch" - epatch "${FILESDIR}/${P}-autopair-0013-autopair-Add-autopair-plugin.patch" - - # Automatic pairing of dumb devices. Not yet submitted upstream - # so kept as a separate patch on top of the above series. - epatch "${FILESDIR}/${PN}-autopair.patch" - - # Playstation3 Controller pairing plugin, retrieved from - # linux-bluetooth mailing list (posted 2012-04-18). - epatch "${FILESDIR}/${P}-ps3-0001.patch" - epatch "${FILESDIR}/${P}-ps3-0002.patch" - epatch "${FILESDIR}/${P}-ps3-0003.patch" - - # Fix EIR parsing causing class of devices to be lost, retrieved - # from GIT head. - epatch "${FILESDIR}/${P}-eir-Fix-incorrect-eir_has_data_type-parsing.patch" - epatch "${FILESDIR}/${P}-eir-Fix-incorrect-eir_length-parsing.patch" - - eautoreconf - - if use cups; then - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ - Makefile.tools Makefile.in || die - fi -} - -src_configure() { - use readline || export ac_cv_header_readline_readline_h=no - - econf \ - --enable-audio \ - --enable-bccmd \ - --enable-datafiles \ - --enable-dfutool \ - --enable-input \ - --enable-network \ - --enable-serial \ - --enable-service \ - --enable-tools \ - --disable-hal \ - --localstatedir=/var \ - --with-systemdunitdir="$(systemd_get_unitdir)" \ - --with-ouifile=/usr/share/misc/oui.txt \ - $(use_enable alsa) \ - $(use_enable caps capng) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable gstreamer) \ - $(use_enable pcmcia) \ - $(use_enable test-programs test) \ - $(use_enable usb) \ - --enable-health \ - --enable-wiimote \ - --enable-dbusoob \ - --enable-autopair \ - --enable-playstation_peripheral -} - -src_install() { - default - - if use test-programs ; then - cd "${S}/test" - dobin simple-agent simple-service monitor-bluetooth - newbin list-devices list-bluetooth-devices - rm test-textfile.{c,o} || die # bug #356529 - for b in apitest hsmicro hsplay test-* ; do - newbin "${b}" "bluez-${b}" - done - insinto /usr/share/doc/${PF}/test-services - doins service-* - - python_convert_shebangs -r 2 "${ED}" - cd "${S}" - fi - - insinto /etc/bluetooth - doins \ - input/input.conf \ - audio/audio.conf \ - network/network.conf \ - serial/serial.conf - - newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth - newinitd "${FILESDIR}/rfcomm-init.d" rfcomm - newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm - - insinto /etc/init - newins "${FILESDIR}/${PN}-upstart.conf" bluetoothd.conf - - insinto /lib/udev/rules.d - newins "${FILESDIR}/${PN}-ps3-gamepad.rules" "99-ps3-gamepad.rules" - - # Install oui.txt as requested in bug #283791 and approved by upstream - insinto /usr/share/misc - newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt - - fowners bluetooth:bluetooth /var/lib/bluetooth - - rm "${D}/lib/udev/rules.d/97-bluetooth.rules" - - find "${D}" -name "*.la" -delete -} - -pkg_postinst() { - udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth - - if ! has_version "net-dialup/ppp"; then - elog "To use dial up networking you must install net-dialup/ppp." - fi - - if use consolekit; then - elog "If you want to use rfcomm as a normal user, you need to add the user" - elog "to the uucp group." - else - elog "Since you have the consolekit use flag disabled, you will only be able to run" - elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as " - 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/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/conf.d-hidd b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/conf.d-hidd deleted file mode 100644 index 1677ef0f35..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/conf.d-hidd +++ /dev/null @@ -1,5 +0,0 @@ -# Bluetooth hidd daemon configuraton file - -# Arguments to hidd -HIDD_OPTIONS="--encrypt" - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/cups-location.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/cups-location.patch deleted file mode 100644 index e0ddc02006..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/cups-location.patch +++ /dev/null @@ -1,18 +0,0 @@ -? cups/.deps -? cups/Makefile -? cups/Makefile.in -Index: cups/Makefile.am -=================================================================== -RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v -retrieving revision 1.9 -diff -u -r1.9 Makefile.am ---- cups/Makefile.am 20 Aug 2006 02:21:03 -0000 1.9 -+++ cups/Makefile.am 1 Jun 2007 15:47:14 -0000 -@@ -1,6 +1,6 @@ - - if CUPS --cupsdir = $(libdir)/cups/backend -+cupsdir = `cups-config --serverbin`/backend - - cups_PROGRAMS = bluetooth - else diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/init.d-hidd b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/init.d-hidd deleted file mode 100644 index 9e61281a48..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.18/init.d-hidd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.18/init.d-hidd,v 1.1 2008/11/28 21:21:35 dev-zero Exp $ - -depend() { - need bluetooth -} - -start() { - ebegin "Starting hidd" - start-stop-daemon --start --quiet \ - --exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server - local result="$?" - local service="/etc/bluetooth/input.service" - if [ "${result}" != "0" ] && grep -q "Autostart=true" ${service}; then - eerror "You have Autostart=true in ${service}." - eerror "Change this to false if you want to use hidd." - fi - eend ${result} -} - -stop() { - ebegin "Stopping hidd" - hidd --killall - start-stop-daemon --stop --quiet --exec /usr/bin/hidd - eend $? -} - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.31-as_needed.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.31-as_needed.patch deleted file mode 100644 index 99b8ce4c23..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.31-as_needed.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur bluez-4.31.orig/common/Makefile.am bluez-4.31/common/Makefile.am ---- bluez-4.31.orig/common/Makefile.am 2009-02-27 22:57:29.515330134 +0100 -+++ bluez-4.31/common/Makefile.am 2009-02-27 22:58:11.249328307 +0100 -@@ -4,6 +4,8 @@ - libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c logging.h logging.c \ - glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c btio.h btio.c - -+libhelper_a_LIBADD = @BLUEZ_LIBS@ -+ - noinst_PROGRAMS = test_textfile - - test_textfile_LDADD = libhelper.a -diff -Naur bluez-4.31.orig/test/Makefile.am bluez-4.31/test/Makefile.am ---- bluez-4.31.orig/test/Makefile.am 2009-02-27 22:57:29.518659538 +0100 -+++ bluez-4.31/test/Makefile.am 2009-02-27 23:07:09.294597176 +0100 -@@ -23,13 +23,13 @@ - - bdaddr_SOURCES = bdaddr.c - --bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a -+bdaddr_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@ - - lmptest_LDADD = @BLUEZ_LIBS@ - - agent_LDADD = @DBUS_LIBS@ - --btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a -+btiotest_LDADD = @GLIB_LIBS@ $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@ - - noinst_MANS = bdaddr.8 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.34-conditional_libsbc.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.34-conditional_libsbc.patch deleted file mode 100644 index e4924c79be..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.34-conditional_libsbc.patch +++ /dev/null @@ -1,39 +0,0 @@ -The configure stuff is a inconsequent: -- even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la - which doesn't get build without alsa or gstreamer. Making this conditional helps. -- ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty, - making the build conditional helps again. ---- acinclude.m4.orig 2009-04-06 16:26:14.570780241 +0200 -+++ acinclude.m4 2009-04-06 16:26:59.540779148 +0200 -@@ -330,8 +330,10 @@ - AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus']) - AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la']) - -- AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) -- AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) -+ if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then -+ AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) -+ AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) -+ fi - - AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") - AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes") ---- audio/Makefile.am.orig 2009-04-06 16:47:21.240681272 +0200 -+++ audio/Makefile.am 2009-04-06 17:42:27.240597715 +0200 -@@ -60,10 +60,16 @@ - - libipc_la_SOURCES = ipc.h ipc.c - -+if AUDIOPLUGIN -+if SBC -+ - noinst_PROGRAMS = ipctest - - ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@ - -+endif -+endif -+ - AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \ - @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-conf.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-conf.d deleted file mode 100644 index b0cc744415..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-conf.d +++ /dev/null @@ -1,7 +0,0 @@ -# Bluetooth configuraton file - -# Bind rfcomm devices (allowed values are "true" and "false") -RFCOMM_ENABLE=true - -# Config file for rfcomm -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-init.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-init.d deleted file mode 100644 index 111902aaeb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/4.60/bluetooth-init.d +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.60/bluetooth-init.d,v 1.1 2010/02/01 19:47:46 pacho Exp $ - -depend() { - after coldplug - need dbus localmount -} - -start() { - ebegin "Starting Bluetooth" - - udevadm trigger --subsystem-match=bluetooth - eend $? - - if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then - if [ -f "${RFCOMM_CONFIG}" ]; then - ebegin " Starting rfcomm" - /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all - eend $? - else - ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists" - fi - fi -} - -stop() { - ebegin "Shutting down Bluetooth" - eend 0 -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluetooth-init.d-r1 b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluetooth-init.d-r1 deleted file mode 100644 index 9280f93bac..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluetooth-init.d-r1 +++ /dev/null @@ -1,19 +0,0 @@ -#!/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 -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.rules b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.rules deleted file mode 100644 index b3ccd5bbba..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.rules +++ /dev/null @@ -1,5 +0,0 @@ -# Start/Stop bluetooth service on device insertion. Gentoo specific. -SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="bluetooth.sh" - -# So that normal users can dial out. -SUBSYSTEM=="tty", SUBSYSTEMS=="bluetooth", GROUP="uucp" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.script b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.script deleted file mode 100644 index a532e2652c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.18-udev.script +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# bluetooth.sh: udev external RUN script -# -# Copyright: -# 2005-2006 Henrik Brix Andersen -# 2007 Petteri Räty -# 2008 Tiziano Müller -# Distributed under the terms of the GNU General Public License v2 - -script=/etc/init.d/bluetooth - -# Find out where sysfs is mounted. Exit if not available -sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'` -if [ "$sysfs" = "" ]; then - echo "sysfs is required" - exit 1 -fi - -if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then - if $script --quiet status; then - IN_HOTPLUG=1 $script --quiet stop - fi -else - if ! $script --quiet status; then - IN_HOTPLUG=1 $script --quiet start - fi -fi diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.67-udev.script b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.67-udev.script deleted file mode 100644 index b176611d9d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.67-udev.script +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# bluetooth.sh: udev external RUN script -# -# Copyright: -# 2005-2006 Henrik Brix Andersen -# 2007 Petteri Räty -# 2008 Tiziano Müller -# 2011 Pacho Ramos -# Distributed under the terms of the GNU General Public License v2 - -# Find out where sysfs is mounted. Exit if not available -sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'` -if [ "$sysfs" = "" ]; then - echo "sysfs is required" - exit 1 -fi - -if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then - udevadm trigger --subsystem-match=bluetooth --action=add -fi diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch deleted file mode 100644 index bce6daa8c3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0001-Rename-AUTH_TYPE_NOTIFY-to-AUTH_TYPE_NOTIFY_PASSKEY.patch +++ /dev/null @@ -1,83 +0,0 @@ -From be1631d70689cfde701e9a1642a5afad11252af7 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 10:40:25 -0800 -Subject: [PATCH 01/13] Rename AUTH_TYPE_NOTIFY to AUTH_TYPE_NOTIFY_PASSKEY - -This makes room for additional notification types to be added. ---- - src/device.c | 8 ++++---- - src/device.h | 2 +- - src/event.c | 4 ++-- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/device.c b/src/device.c -index dfc8e59..92c13f5 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2453,7 +2453,7 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) - { - struct authentication_req *auth = device->authr; - -- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) -+ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) - agent_cancel(auth->agent); - } - -@@ -2470,7 +2470,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) - - DBG("bonding %p status 0x%02x", bonding, status); - -- if (auth && auth->type == AUTH_TYPE_NOTIFY && auth->agent) -+ if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) - agent_cancel(auth->agent); - - if (status) { -@@ -2724,7 +2724,7 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - err = agent_request_confirmation(agent, device, passkey, - confirm_cb, auth, NULL); - break; -- case AUTH_TYPE_NOTIFY: -+ case AUTH_TYPE_NOTIFY_PASSKEY: - err = agent_display_passkey(agent, device, passkey); - break; - default: -@@ -2764,7 +2764,7 @@ static void cancel_authentication(struct authentication_req *auth) - case AUTH_TYPE_PASSKEY: - ((agent_passkey_cb) auth->cb)(agent, &err, 0, device); - break; -- case AUTH_TYPE_NOTIFY: -+ case AUTH_TYPE_NOTIFY_PASSKEY: - /* User Notify doesn't require any reply */ - break; - } -diff --git a/src/device.h b/src/device.h -index 7cb9bb2..aa7f2f1 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -30,7 +30,7 @@ typedef enum { - AUTH_TYPE_PINCODE, - AUTH_TYPE_PASSKEY, - AUTH_TYPE_CONFIRM, -- AUTH_TYPE_NOTIFY, -+ AUTH_TYPE_NOTIFY_PASSKEY, - } auth_type_t; - - struct btd_device *device_create(DBusConnection *conn, -diff --git a/src/event.c b/src/event.c -index 113a2b6..95cdbdb 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -202,8 +202,8 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) - if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) - return -ENODEV; - -- return device_request_authentication(device, AUTH_TYPE_NOTIFY, passkey, -- FALSE, NULL); -+ return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, -+ passkey, FALSE, NULL); - } - - void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch deleted file mode 100644 index 08de15d968..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0002-Pass-passkey-by-pointer-rather-than-by-value.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 888f24266b8ff06d7007afb5e6a38ba621750451 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 10:43:48 -0800 -Subject: [PATCH 02/13] Pass passkey by pointer rather than by value - -This allows alternate data of a different type to be passed to -device_request_authentication() for other notification types such -as those that require a PIN. ---- - src/device.c | 9 +++++---- - src/device.h | 2 +- - src/event.c | 8 ++++---- - 3 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 92c13f5..8a2ae9d 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2681,7 +2681,7 @@ done: - } - - int device_request_authentication(struct btd_device *device, auth_type_t type, -- uint32_t passkey, gboolean secure, void *cb) -+ void *data, gboolean secure, void *cb) - { - struct authentication_req *auth; - struct agent *agent; -@@ -2707,7 +2707,6 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - auth->device = device; - auth->cb = cb; - auth->type = type; -- auth->passkey = passkey; - auth->secure = secure; - device->authr = auth; - -@@ -2721,11 +2720,13 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - auth, NULL); - break; - case AUTH_TYPE_CONFIRM: -- err = agent_request_confirmation(agent, device, passkey, -+ auth->passkey = *(uint32_t *)data; -+ err = agent_request_confirmation(agent, device, auth->passkey, - confirm_cb, auth, NULL); - break; - case AUTH_TYPE_NOTIFY_PASSKEY: -- err = agent_display_passkey(agent, device, passkey); -+ auth->passkey = *(uint32_t *)data; -+ err = agent_display_passkey(agent, device, auth->passkey); - break; - default: - err = -EINVAL; -diff --git a/src/device.h b/src/device.h -index aa7f2f1..998aee7 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -83,7 +83,7 @@ gboolean device_is_creating(struct btd_device *device, const char *sender); - gboolean device_is_bonding(struct btd_device *device, const char *sender); - void device_cancel_bonding(struct btd_device *device, uint8_t status); - int device_request_authentication(struct btd_device *device, auth_type_t type, -- uint32_t passkey, gboolean secure, void *cb); -+ void *data, gboolean secure, void *cb); - void device_cancel_authentication(struct btd_device *device, gboolean aborted); - gboolean device_is_authenticating(struct btd_device *device); - gboolean device_is_authorizing(struct btd_device *device); -diff --git a/src/event.c b/src/event.c -index 95cdbdb..7d66b6d 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -130,7 +130,7 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) - return 0; - } - -- return device_request_authentication(device, AUTH_TYPE_PINCODE, 0, -+ return device_request_authentication(device, AUTH_TYPE_PINCODE, NULL, - secure, pincode_cb); - } - -@@ -179,7 +179,7 @@ int btd_event_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) - return -ENODEV; - - return device_request_authentication(device, AUTH_TYPE_CONFIRM, -- passkey, FALSE, confirm_cb); -+ &passkey, FALSE, confirm_cb); - } - - int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) -@@ -190,7 +190,7 @@ int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba) - if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) - return -ENODEV; - -- return device_request_authentication(device, AUTH_TYPE_PASSKEY, 0, -+ return device_request_authentication(device, AUTH_TYPE_PASSKEY, NULL, - FALSE, passkey_cb); - } - -@@ -203,7 +203,7 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) - return -ENODEV; - - return device_request_authentication(device, AUTH_TYPE_NOTIFY_PASSKEY, -- passkey, FALSE, NULL); -+ &passkey, FALSE, NULL); - } - - void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch deleted file mode 100644 index 4e14ca9962..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0003-agent-add-DisplayPinCode-method.patch +++ /dev/null @@ -1,161 +0,0 @@ -From e84af9f6ba447c540512d56ccc7326af621749bc Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 10:56:56 -0800 -Subject: [PATCH 03/13] agent: add DisplayPinCode method - -In constrast to DisplayPasskey, this sends a UTF-8 string PIN code -to the agent; also we support a callback for the case where the -Agent doesn't implement this new method so we can fallback. ---- - src/agent.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/agent.h | 4 ++ - 2 files changed, 115 insertions(+), 1 deletions(-) - -diff --git a/src/agent.c b/src/agent.c -index 9b942e8..23e3b43 100644 ---- a/src/agent.c -+++ b/src/agent.c -@@ -52,7 +52,8 @@ typedef enum { - AGENT_REQUEST_CONFIRMATION, - AGENT_REQUEST_PINCODE, - AGENT_REQUEST_AUTHORIZE, -- AGENT_REQUEST_CONFIRM_MODE -+ AGENT_REQUEST_CONFIRM_MODE, -+ AGENT_REQUEST_DISPLAY_PINCODE, - } agent_request_type_t; - - struct agent { -@@ -699,6 +700,115 @@ int agent_display_passkey(struct agent *agent, struct btd_device *device, - return 0; - } - -+static void display_pincode_reply(DBusPendingCall *call, void *user_data) -+{ -+ struct agent_request *req = user_data; -+ struct agent *agent = req->agent; -+ DBusMessage *message; -+ DBusError err; -+ agent_cb cb = req->cb; -+ -+ /* clear agent->request early; our callback will likely try -+ * another request */ -+ agent->request = NULL; -+ -+ /* steal_reply will always return non-NULL since the callback -+ * is only called after a reply has been received */ -+ message = dbus_pending_call_steal_reply(call); -+ -+ dbus_error_init(&err); -+ if (dbus_set_error_from_message(&err, message)) { -+ error("Agent replied with an error: %s, %s", -+ err.name, err.message); -+ -+ cb(agent, &err, req->user_data); -+ -+ if (dbus_error_has_name(&err, DBUS_ERROR_NO_REPLY)) { -+ agent_cancel(agent); -+ dbus_message_unref(message); -+ dbus_error_free(&err); -+ return; -+ } -+ -+ dbus_error_free(&err); -+ goto done; -+ } -+ -+ dbus_error_init(&err); -+ if (!dbus_message_get_args(message, &err, DBUS_TYPE_INVALID)) { -+ error("Wrong reply signature: %s", err.message); -+ cb(agent, &err, req->user_data); -+ dbus_error_free(&err); -+ goto done; -+ } -+ -+ cb(agent, NULL, req->user_data); -+done: -+ dbus_message_unref(message); -+ -+ agent_request_free(req, TRUE); -+} -+ -+static int display_pincode_request_new(struct agent_request *req, -+ const char *device_path, -+ const char *pincode) -+{ -+ struct agent *agent = req->agent; -+ -+ req->msg = dbus_message_new_method_call(agent->name, agent->path, -+ "org.bluez.Agent", "DisplayPinCode"); -+ if (req->msg == NULL) { -+ error("Couldn't allocate D-Bus message"); -+ return -ENOMEM; -+ } -+ -+ dbus_message_append_args(req->msg, -+ DBUS_TYPE_OBJECT_PATH, &device_path, -+ DBUS_TYPE_STRING, &pincode, -+ DBUS_TYPE_INVALID); -+ -+ if (dbus_connection_send_with_reply(connection, req->msg, -+ &req->call, REQUEST_TIMEOUT) == FALSE) { -+ error("D-Bus send failed"); -+ return -EIO; -+ } -+ -+ dbus_pending_call_set_notify(req->call, display_pincode_reply, -+ req, NULL); -+ -+ return 0; -+} -+ -+int agent_display_pincode(struct agent *agent, struct btd_device *device, -+ const char *pincode, agent_cb cb, -+ void *user_data, GDestroyNotify destroy) -+{ -+ struct agent_request *req; -+ const gchar *dev_path = device_get_path(device); -+ int err; -+ -+ if (agent->request) -+ return -EBUSY; -+ -+ DBG("Calling Agent.DisplayPinCode: name=%s, path=%s, pincode=%s", -+ agent->name, agent->path, pincode); -+ -+ req = agent_request_new(agent, AGENT_REQUEST_DISPLAY_PINCODE, cb, -+ user_data, destroy); -+ -+ err = display_pincode_request_new(req, dev_path, pincode); -+ if (err < 0) -+ goto failed; -+ -+ agent->request = req; -+ -+ return 0; -+ -+failed: -+ agent_request_free(req, FALSE); -+ return err; -+} -+ - uint8_t agent_get_io_capability(struct agent *agent) - { - return agent->capability; -diff --git a/src/agent.h b/src/agent.h -index f62bf3b..69ad42b 100644 ---- a/src/agent.h -+++ b/src/agent.h -@@ -64,6 +64,10 @@ int agent_request_confirmation(struct agent *agent, struct btd_device *device, - int agent_display_passkey(struct agent *agent, struct btd_device *device, - uint32_t passkey); - -+int agent_display_pincode(struct agent *agent, struct btd_device *device, -+ const char *pincode, agent_cb cb, -+ void *user_data, GDestroyNotify destroy); -+ - int agent_cancel(struct agent *agent); - - gboolean agent_is_busy(struct agent *agent, void *user_data); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch deleted file mode 100644 index d489da96f8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0004-Add-AUTH_TYPE_NOTIFY_PASSKEY-to-device_request_authe.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 16583671c03b871003430e433ddf197833ea0086 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 15:16:40 -0800 -Subject: [PATCH 04/13] Add AUTH_TYPE_NOTIFY_PASSKEY to - device_request_authentication - -This new authentication type accepts a pincode and calls the -DisplayPinCode agent method, a fallback is provided so that if the -method is not implemented the older RequestPinCode method is used -instead. - -Due to this fallback, the agent_pincode_cb is used and calling -functions should send the pincode passed to the callback to the -adapter, which may differ from that generated. ---- - src/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/device.h | 1 + - 2 files changed, 58 insertions(+), 2 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 8a2ae9d..f32666e 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -93,6 +93,7 @@ struct authentication_req { - struct agent *agent; - struct btd_device *device; - uint32_t passkey; -+ char *pincode; - gboolean secure; - }; - -@@ -277,6 +278,8 @@ static void device_free(gpointer user_data) - - DBG("%p", device); - -+ if (device->authr) -+ g_free(device->authr->pincode); - g_free(device->authr); - g_free(device->path); - g_free(device->alias); -@@ -2453,12 +2456,15 @@ void device_simple_pairing_complete(struct btd_device *device, uint8_t status) - { - struct authentication_req *auth = device->authr; - -- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) -+ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY -+ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) - agent_cancel(auth->agent); - } - - static void device_auth_req_free(struct btd_device *device) - { -+ if (device->authr) -+ g_free(device->authr->pincode); - g_free(device->authr); - device->authr = NULL; - } -@@ -2470,7 +2476,8 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) - - DBG("bonding %p status 0x%02x", bonding, status); - -- if (auth && auth->type == AUTH_TYPE_NOTIFY_PASSKEY && auth->agent) -+ if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY -+ || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) - agent_cancel(auth->agent); - - if (status) { -@@ -2680,6 +2687,46 @@ done: - device->authr->agent = NULL; - } - -+static void display_pincode_cb(struct agent *agent, DBusError *err, void *data) -+{ -+ struct authentication_req *auth = data; -+ struct btd_device *device = auth->device; -+ struct btd_adapter *adapter = device_get_adapter(device); -+ struct agent *adapter_agent = adapter_get_agent(adapter); -+ -+ if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) || -+ g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) { -+ -+ /* Request a pincode if we fail to display one */ -+ if (auth->agent == adapter_agent || adapter_agent == NULL) { -+ if (agent_request_pincode(agent, device, pincode_cb, -+ auth->secure, auth, NULL) < 0) -+ goto done; -+ return; -+ } -+ -+ if (agent_display_pincode(adapter_agent, device, auth->pincode, -+ display_pincode_cb, auth, NULL) < 0) -+ goto done; -+ -+ auth->agent = adapter_agent; -+ return; -+ } -+ -+done: -+ /* No need to reply anything if the authentication already failed */ -+ if (auth->cb == NULL) -+ return; -+ -+ ((agent_pincode_cb) auth->cb)(agent, err, auth->pincode, device); -+ -+ g_free(device->authr->pincode); -+ device->authr->pincode = NULL; -+ device->authr->cb = NULL; -+ device->authr->agent = NULL; -+} -+ -+ - int device_request_authentication(struct btd_device *device, auth_type_t type, - void *data, gboolean secure, void *cb) - { -@@ -2728,6 +2775,11 @@ int device_request_authentication(struct btd_device *device, auth_type_t type, - auth->passkey = *(uint32_t *)data; - err = agent_display_passkey(agent, device, auth->passkey); - break; -+ case AUTH_TYPE_NOTIFY_PINCODE: -+ auth->pincode = g_strdup((const char *)data); -+ err = agent_display_pincode(agent, device, auth->pincode, -+ display_pincode_cb, auth, NULL); -+ break; - default: - err = -EINVAL; - } -@@ -2768,6 +2820,9 @@ static void cancel_authentication(struct authentication_req *auth) - case AUTH_TYPE_NOTIFY_PASSKEY: - /* User Notify doesn't require any reply */ - break; -+ case AUTH_TYPE_NOTIFY_PINCODE: -+ ((agent_pincode_cb) auth->cb)(agent, &err, NULL, device); -+ break; - } - - dbus_error_free(&err); -diff --git a/src/device.h b/src/device.h -index 998aee7..561865c 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -31,6 +31,7 @@ typedef enum { - AUTH_TYPE_PASSKEY, - AUTH_TYPE_CONFIRM, - AUTH_TYPE_NOTIFY_PASSKEY, -+ AUTH_TYPE_NOTIFY_PINCODE, - } auth_type_t; - - struct btd_device *device_create(DBusConnection *conn, --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch deleted file mode 100644 index d0fbd29e2b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0005-Add-display-parameter-to-plugin-pincode-callback.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 1630cbe326460a89d5c342847b658a499484ced0 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Thu, 29 Mar 2012 14:04:14 -0700 -Subject: [PATCH 05/13] Add display parameter to plugin pincode callback - -Pass a display parameter to the plugin pincode callback, a plugin -may set this to TRUE to indicate the PIN it generates should be -displayed on the screen for entry into the remote device. ---- - plugins/wiimote.c | 2 +- - src/adapter.c | 4 ++-- - src/adapter.h | 4 ++-- - src/event.c | 3 ++- - 4 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/plugins/wiimote.c b/plugins/wiimote.c -index 1ae638b..43b6de3 100644 ---- a/plugins/wiimote.c -+++ b/plugins/wiimote.c -@@ -56,7 +56,7 @@ - */ - - static ssize_t wii_pincb(struct btd_adapter *adapter, struct btd_device *device, -- char *pinbuf) -+ char *pinbuf, gboolean *display) - { - uint16_t vendor, product; - bdaddr_t sba, dba; -diff --git a/src/adapter.c b/src/adapter.c -index acb845e..ccf7991 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -3330,7 +3330,7 @@ void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, - } - - ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, -- char *pin_buf) -+ char *pin_buf, gboolean *display) - { - GSList *l; - btd_adapter_pin_cb_t cb; -@@ -3339,7 +3339,7 @@ ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, - - for (l = adapter->pin_callbacks; l != NULL; l = g_slist_next(l)) { - cb = l->data; -- ret = cb(adapter, dev, pin_buf); -+ ret = cb(adapter, dev, pin_buf, display); - if (ret > 0) - return ret; - } -diff --git a/src/adapter.h b/src/adapter.h -index ceebb97..aa66070 100644 ---- a/src/adapter.h -+++ b/src/adapter.h -@@ -172,13 +172,13 @@ int btd_adapter_switch_offline(struct btd_adapter *adapter); - void btd_adapter_enable_auto_connect(struct btd_adapter *adapter); - - typedef ssize_t (*btd_adapter_pin_cb_t) (struct btd_adapter *adapter, -- struct btd_device *dev, char *out); -+ struct btd_device *dev, char *out, gboolean *display); - void btd_adapter_register_pin_cb(struct btd_adapter *adapter, - btd_adapter_pin_cb_t cb); - void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, - btd_adapter_pin_cb_t cb); - ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, -- char *pin_buf); -+ char *pin_buf, gboolean *display); - - typedef void (*bt_hci_result_t) (uint8_t status, gpointer user_data); - -diff --git a/src/event.c b/src/event.c -index 7d66b6d..d87b6a4 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -119,12 +119,13 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) - struct btd_device *device; - char pin[17]; - ssize_t pinlen; -+ gboolean display = FALSE; - - if (!get_adapter_and_device(sba, dba, &adapter, &device, TRUE)) - return -ENODEV; - - memset(pin, 0, sizeof(pin)); -- pinlen = btd_adapter_get_pin(adapter, device, pin); -+ pinlen = btd_adapter_get_pin(adapter, device, pin, &display); - if (pinlen > 0 && (!secure || pinlen == 16)) { - btd_adapter_pincode_reply(adapter, dba, pin, pinlen); - return 0; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch deleted file mode 100644 index ce3736021e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0006-Display-PIN-generated-by-plugin.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2a902f071ec21572094ce9cdf54099ad275e7904 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Thu, 29 Mar 2012 14:07:13 -0700 -Subject: [PATCH 06/13] Display PIN generated by plugin - -If a plugin pincode callback sets the display parameter to TRUE, send -the generated PIN to the agent for display using the new DisplayPinCode -agent method, including its fallback to RequestPinCode. ---- - src/event.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/src/event.c b/src/event.c -index d87b6a4..5b60fb3 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -127,6 +127,11 @@ int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure) - memset(pin, 0, sizeof(pin)); - pinlen = btd_adapter_get_pin(adapter, device, pin, &display); - if (pinlen > 0 && (!secure || pinlen == 16)) { -+ if (display && device_is_bonding(device, NULL)) -+ return device_request_authentication(device, -+ AUTH_TYPE_NOTIFY_PINCODE, pin, -+ secure, pincode_cb); -+ - btd_adapter_pincode_reply(adapter, dba, pin, pinlen); - return 0; - } --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0007-doc-document-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0007-doc-document-DisplayPinCode.patch deleted file mode 100644 index 685f1c205f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0007-doc-document-DisplayPinCode.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8a9347822f86059d015ae3893387aa971fa41ab7 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 15:25:39 -0800 -Subject: [PATCH 07/13] doc: document DisplayPinCode - ---- - doc/agent-api.txt | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -diff --git a/doc/agent-api.txt b/doc/agent-api.txt -index 9ab2063..5c8d4d2 100644 ---- a/doc/agent-api.txt -+++ b/doc/agent-api.txt -@@ -61,6 +61,30 @@ Methods void Release() - so the display should be zero-padded at the start if - the value contains less than 6 digits. - -+ void DisplayPinCode(object device, string pincode) -+ -+ This method gets called when the service daemon -+ needs to display a pincode for an authentication. -+ -+ An empty reply should be returned. When the pincode -+ needs no longer to be displayed, the Cancel method -+ of the agent will be called. -+ -+ If this method is not implemented the RequestPinCode -+ method will be used instead. -+ -+ This is used during the pairing process of keyboards -+ that don't support Bluetooth 2.1 Secure Simple Pairing, -+ in contrast to DisplayPasskey which is used for those -+ that do. -+ -+ This method will only ever be called once since -+ older keyboards do not support typing notification. -+ -+ Note that the PIN will always be a 6-digit number, -+ zero-padded to 6 digits. This is for harmony with -+ the later specification. -+ - void RequestConfirmation(object device, uint32 passkey) - - This method gets called when the service daemon --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch deleted file mode 100644 index e7cd7f8b97..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0008-simple-agent-add-DisplayPinCode.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4f2f55231bad4d5da2505cb674375e9bf8ac029d Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Mon, 23 Jan 2012 15:25:56 -0800 -Subject: [PATCH 08/13] simple-agent: add DisplayPinCode - ---- - test/simple-agent | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/test/simple-agent b/test/simple-agent -index af84815..38d0235 100755 ---- a/test/simple-agent -+++ b/test/simple-agent -@@ -52,6 +52,11 @@ class Agent(dbus.service.Object): - print "DisplayPasskey (%s, %06d)" % (device, passkey) - - @dbus.service.method("org.bluez.Agent", -+ in_signature="os", out_signature="") -+ def DisplayPinCode(self, device, pincode): -+ print "DisplayPinCode (%s, %s)" % (device, pincode) -+ -+ @dbus.service.method("org.bluez.Agent", - in_signature="ou", out_signature="") - def RequestConfirmation(self, device, passkey): - print "RequestConfirmation (%s, %06d)" % (device, passkey) --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch deleted file mode 100644 index 26b2aa7143..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0009-Add-support-for-retrying-a-bonding.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 0cd8c8427019cfd7e1c69fb6a5b4261863716d56 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:34:01 -0800 -Subject: [PATCH 09/13] Add support for retrying a bonding - -In order to retry a bonding we need a timer that will perform the -retry, we need to stash the status and capability of the bonding -request so it can use them again, and in the case of a retrying -bonding attempt we need to not tear down the temporary D-Bus device -object on the adapter. ---- - src/adapter.c | 2 +- - src/device.c | 14 ++++++++++++++ - src/device.h | 1 + - 3 files changed, 16 insertions(+), 1 deletions(-) - -diff --git a/src/adapter.c b/src/adapter.c -index ccf7991..f065a5d 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -2989,7 +2989,7 @@ void adapter_remove_connection(struct btd_adapter *adapter, - if (device_is_authenticating(device)) - device_cancel_authentication(device, TRUE); - -- if (device_is_temporary(device)) { -+ if (device_is_temporary(device) && !device_is_retrying(device)) { - const char *path = device_get_path(device); - - DBG("Removing temporary device %s", path); -diff --git a/src/device.c b/src/device.c -index f32666e..9d4517f 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -85,6 +85,9 @@ struct bonding_req { - DBusMessage *msg; - guint listener_id; - struct btd_device *device; -+ uint8_t capability; -+ uint8_t status; -+ guint retry_timer; - }; - - struct authentication_req { -@@ -2295,6 +2298,9 @@ static void bonding_request_free(struct bonding_req *bonding) - if (bonding->conn) - dbus_connection_unref(bonding->conn); - -+ if (bonding->retry_timer) -+ g_source_remove(bonding->retry_timer); -+ - device = bonding->device; - g_free(bonding); - -@@ -2367,6 +2373,7 @@ proceed: - - bonding->conn = dbus_connection_ref(conn); - bonding->msg = dbus_message_ref(msg); -+ bonding->capability = capability; - - return bonding; - } -@@ -2469,6 +2476,13 @@ static void device_auth_req_free(struct btd_device *device) - device->authr = NULL; - } - -+gboolean device_is_retrying(struct btd_device *device) -+{ -+ struct bonding_req *bonding = device->bonding; -+ -+ return bonding && bonding->retry_timer != 0; -+} -+ - void device_bonding_complete(struct btd_device *device, uint8_t status) - { - struct bonding_req *bonding = device->bonding; -diff --git a/src/device.h b/src/device.h -index 561865c..b957ad6 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -75,6 +75,7 @@ void device_set_temporary(struct btd_device *device, gboolean temporary); - void device_set_bonded(struct btd_device *device, gboolean bonded); - void device_set_auto_connect(struct btd_device *device, gboolean enable); - gboolean device_is_connected(struct btd_device *device); -+gboolean device_is_retrying(struct btd_device *device); - DBusMessage *device_create_bonding(struct btd_device *device, - DBusConnection *conn, DBusMessage *msg, - const char *agent_path, uint8_t capability); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch deleted file mode 100644 index 6b76a4b84f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0010-plugin-Add-bonding-callback-support-for-plugins.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 83c36231418f9deff7ba16ceb0ead5d63e177a04 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:30:53 -0800 -Subject: [PATCH 10/13] plugin: Add bonding callback support for plugins - -Allow plugins to register a bonding callback on a device, this will be -called on completion or cancellation of a bonding attempt on that -device and allow retrying of the bonding attempt. - -These callbacks will only be called once, in the case of retrying the -callback must be registered again separately from another callback -(e.g. the pincode callback). ---- - src/device.c | 17 +++++++++++++++++ - src/device.h | 8 ++++++++ - 2 files changed, 25 insertions(+), 0 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 9d4517f..9a62eef 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -144,6 +144,7 @@ struct btd_device { - GSList *primaries; /* List of primary services */ - GSList *drivers; /* List of device drivers */ - GSList *watches; /* List of disconnect_data */ -+ GSList *bonding_callbacks; /* List of bonding callbacks */ - gboolean temporary; - struct agent *agent; - guint disconn_timer; -@@ -264,6 +265,8 @@ static void device_free(gpointer user_data) - g_slist_free_full(device->attios, g_free); - g_slist_free_full(device->attios_offline, g_free); - -+ g_slist_free(device->bonding_callbacks); -+ - att_cleanup(device); - - if (device->tmp_records) -@@ -2476,6 +2479,20 @@ static void device_auth_req_free(struct btd_device *device) - device->authr = NULL; - } - -+void btd_device_register_bonding_cb(struct btd_device *device, -+ btd_device_bonding_cb_t cb) -+{ -+ device->bonding_callbacks = g_slist_prepend( -+ device->bonding_callbacks, cb); -+} -+ -+void btd_device_unregister_bonding_cb(struct btd_device *device, -+ btd_device_bonding_cb_t cb) -+{ -+ device->bonding_callbacks = g_slist_remove( -+ device->bonding_callbacks, cb); -+} -+ - gboolean device_is_retrying(struct btd_device *device) - { - struct bonding_req *bonding = device->bonding; -diff --git a/src/device.h b/src/device.h -index b957ad6..ce8675b 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -103,6 +103,14 @@ guint device_add_disconnect_watch(struct btd_device *device, - void device_remove_disconnect_watch(struct btd_device *device, guint id); - void device_set_class(struct btd_device *device, uint32_t value); - -+typedef gboolean (*btd_device_bonding_cb_t) (struct btd_device *device, -+ gboolean complete, uint8_t status); -+ -+void btd_device_register_bonding_cb(struct btd_device *dev, -+ btd_device_bonding_cb_t cb); -+void btd_device_unregister_bonding_cb(struct btd_device *dev, -+ btd_device_bonding_cb_t cb); -+ - #define BTD_UUIDS(args...) ((const char *[]) { args, NULL } ) - - struct btd_device_driver { --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch deleted file mode 100644 index 913365ef0d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0011-bonding-retry-if-callback-returns-TRUE.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f3d2851b74fe790896f819efbc694e288d54d819 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:35:30 -0800 -Subject: [PATCH 11/13] bonding: retry if callback returns TRUE - -When a bonding completes, pass the status to any plugin bonding -callbacks; if any return TRUE than set a timer to retry the bonding -after an appropriate backoff period. ---- - src/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 46 insertions(+), 0 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 9a62eef..4ad5aa0 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2493,6 +2493,44 @@ void btd_device_unregister_bonding_cb(struct btd_device *device, - device->bonding_callbacks, cb); - } - -+static gboolean device_bonding_retry(gpointer data) -+{ -+ struct btd_device *device = data; -+ struct btd_adapter *adapter = device_get_adapter(device); -+ struct bonding_req *bonding = device->bonding; -+ int err; -+ -+ if (!bonding) -+ return FALSE; -+ -+ DBG("retrying bonding"); -+ err = adapter_create_bonding(adapter, &device->bdaddr, -+ device->type, bonding->capability); -+ if (err < 0) -+ device_bonding_complete(device, bonding->status); -+ -+ bonding->retry_timer = 0; -+ return FALSE; -+} -+ -+static gboolean device_bonding_get_retry(struct btd_device *device, -+ uint8_t status) -+{ -+ GSList *l; -+ btd_device_bonding_cb_t cb; -+ gboolean retry = FALSE; -+ -+ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { -+ cb = l->data; -+ retry |= cb(device, TRUE, status); -+ } -+ -+ g_slist_free(device->bonding_callbacks); -+ device->bonding_callbacks = NULL; -+ -+ return retry; -+} -+ - gboolean device_is_retrying(struct btd_device *device) - { - struct bonding_req *bonding = device->bonding; -@@ -2507,6 +2545,14 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) - - DBG("bonding %p status 0x%02x", bonding, status); - -+ if (device_bonding_get_retry(device, status) && status) { -+ DBG("backing off and retrying"); -+ bonding->status = status; -+ bonding->retry_timer = g_timeout_add(3000, -+ device_bonding_retry, device); -+ return; -+ } -+ - if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY - || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent) - agent_cancel(auth->agent); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch deleted file mode 100644 index a766a09795..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0012-bonding-call-plugin-callback-on-cancellation.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 82ef8f4b96d62e18b5a191f6aaa9d79140ca64a4 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Tue, 24 Jan 2012 10:36:44 -0800 -Subject: [PATCH 12/13] bonding: call plugin callback on cancellation - -Call the plugin callbacks when a bonding request is cancelled. ---- - src/device.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/src/device.c b/src/device.c -index 4ad5aa0..ea0d1fb 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2648,6 +2648,8 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) - struct bonding_req *bonding = device->bonding; - DBusMessage *reply; - char addr[18]; -+ GSList *l; -+ btd_device_bonding_cb_t cb; - - if (!bonding) - return; -@@ -2655,6 +2657,14 @@ void device_cancel_bonding(struct btd_device *device, uint8_t status) - ba2str(&device->bdaddr, addr); - DBG("Canceling bonding request for %s", addr); - -+ for (l = device->bonding_callbacks; l != NULL; l = g_slist_next(l)) { -+ cb = l->data; -+ cb(device, FALSE, 0); -+ } -+ -+ g_slist_free(device->bonding_callbacks); -+ device->bonding_callbacks = NULL; -+ - if (device->authr) - device_cancel_authentication(device, FALSE); - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0013-autopair-Add-autopair-plugin.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0013-autopair-Add-autopair-plugin.patch deleted file mode 100644 index 81a5f3f8cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-autopair-0013-autopair-Add-autopair-plugin.patch +++ /dev/null @@ -1,274 +0,0 @@ -From 2236069d7d5bf54ae53470c13929cba90e020710 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Thu, 5 Apr 2012 15:42:12 -0700 -Subject: [PATCH 13/13] autopair: Add autopair plugin. - ---- - Makefile.am | 5 + - acinclude.m4 | 6 ++ - plugins/autopair.c | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 218 insertions(+), 0 deletions(-) - create mode 100644 plugins/autopair.c - -diff --git a/Makefile.am b/Makefile.am -index bd587eb..0e9129c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -278,6 +278,11 @@ builtin_modules += dbusoob - builtin_sources += plugins/dbusoob.c - endif - -+if AUTOPAIRPLUGIN -+builtin_modules += autopair -+builtin_sources += plugins/autopair.c -+endif -+ - if MAINTAINER_MODE - plugin_LTLIBRARIES += plugins/external-dummy.la - plugins_external_dummy_la_SOURCES = plugins/external-dummy.c -diff --git a/acinclude.m4 b/acinclude.m4 -index b0f790c..4c1849a 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -220,6 +220,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - dbusoob_enable=no - wiimote_enable=no - thermometer_enable=no -+ autopair_enable=no - - AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [ - optimization_enable=${enableval} -@@ -364,6 +365,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - wiimote_enable=${enableval} - ]) - -+ AC_ARG_ENABLE(autopair, AC_HELP_STRING([--enable-autopair], [compile with autopairing plugin]), [ -+ autopair_enable=${enableval} -+ ]) -+ - AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [Use HAL to determine adapter class]), [ - hal_enable=${enableval} - ]) -@@ -429,4 +434,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes") - AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes") - AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes") -+ AM_CONDITIONAL(AUTOPAIRPLUGIN, test "${autopair_enable}" = "yes") - ]) -diff --git a/plugins/autopair.c b/plugins/autopair.c -new file mode 100644 -index 0000000..58047b1 ---- /dev/null -+++ b/plugins/autopair.c -@@ -0,0 +1,208 @@ -+/* -+ * -+ * BlueZ - Bluetooth protocol stack for Linux -+ * -+ * Copyright (C) 2012 Google Inc. -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include -+ -+#include "glib-compat.h" -+#include "plugin.h" -+#include "adapter.h" -+#include "device.h" -+#include "storage.h" -+#include "textfile.h" -+#include "log.h" -+ -+/* -+ * Plugin to handle automatic pairing of devices with reduced user -+ * interaction, including implementing the recommendation of the HID spec -+ * for keyboard devices. -+ * -+ * The plugin works by intercepting the PIN request for devices; if the -+ * device is a keyboard a random six-digit numeric PIN is generated and -+ * returned, flagged for displaying using DisplayPinCode. -+ * -+ * Bonding callbacks are also added for the device, so should the pairing -+ * attempt fail with the PIN from this plugin, a blacklist entry is added -+ * and pairing retried. On the second pass this plugin will ignore the -+ * device due to the blacklist and the user will be prompted for a PIN -+ * instead. -+ */ -+ -+static GSList *blacklist = NULL; -+ -+static void autopair_blacklist_device(struct btd_device *device) -+{ -+ bdaddr_t *ba; -+ -+ ba = g_new0(bdaddr_t, 1); -+ device_get_address(device, ba, NULL); -+ blacklist = g_slist_prepend(blacklist, ba); -+} -+ -+ -+static GSList *attempting = NULL; -+ -+static gboolean autopair_bondingcb(struct btd_device *device, -+ gboolean complete, uint8_t status) -+{ -+ GSList *match; -+ -+ match = g_slist_find(attempting, device); -+ if (!match) -+ return FALSE; -+ -+ attempting = g_slist_remove_link(attempting, match); -+ btd_device_unref(device); -+ -+ if (complete && status != 0) { -+ /* failed: blacklist and retry with the user's agent */ -+ autopair_blacklist_device(device); -+ return TRUE; -+ } else { -+ /* successful or cancelled pair */ -+ return FALSE; -+ } -+} -+ -+static gboolean autopair_attempt(struct btd_device *device) -+{ -+ if (g_slist_find(attempting, device)) -+ return FALSE; -+ -+ btd_device_register_bonding_cb(device, autopair_bondingcb); -+ attempting = g_slist_prepend(attempting, btd_device_ref(device)); -+ -+ return TRUE; -+} -+ -+static void autopair_cancel_all(void) -+{ -+ GSList *l; -+ struct btd_device *device; -+ -+ for (l = attempting; l != NULL; l = g_slist_next(l)) { -+ device = l->data; -+ btd_device_unregister_bonding_cb(device, autopair_bondingcb); -+ btd_device_unref(device); -+ } -+ -+ g_slist_free(attempting); -+ attempting = NULL; -+} -+ -+static ssize_t autopair_pincb(struct btd_adapter *adapter, -+ struct btd_device *device, -+ char *pinbuf, gboolean *display) -+{ -+ char addr[18]; -+ bdaddr_t local, peer; -+ uint32_t class; -+ -+ if (!device_is_bonding(device, NULL)) -+ return 0; -+ -+ adapter_get_address(adapter, &local); -+ -+ device_get_address(device, &peer, NULL); -+ ba2str(&peer, addr); -+ -+ read_remote_class(&local, &peer, &class); -+ -+ DBG("device %s 0x%x", addr, class); -+ -+ if (g_slist_find_custom(blacklist, &peer, (GCompareFunc) bacmp)) { -+ DBG("prior autopair failed"); -+ return 0; -+ } -+ -+ switch ((class & 0x1f00) >> 8) { -+ case 0x05: -+ switch ((class & 0xc0) >> 6) { -+ case 0x01: -+ case 0x03: -+ if (autopair_attempt(device)) { -+ char pinstr[7]; -+ srand(time(NULL)); -+ snprintf(pinstr, sizeof pinstr, "%06d", -+ rand() % 1000000); -+ *display = TRUE; -+ memcpy(pinbuf, pinstr, 6); -+ return 6; -+ } -+ break; -+ } -+ break; -+ } -+ -+ return 0; -+} -+ -+ -+static int autopair_probe(struct btd_adapter *adapter) -+{ -+ btd_adapter_register_pin_cb(adapter, autopair_pincb); -+ -+ return 0; -+} -+ -+static void autopair_remove(struct btd_adapter *adapter) -+{ -+ btd_adapter_unregister_pin_cb(adapter, autopair_pincb); -+} -+ -+static struct btd_adapter_driver autopair_driver = { -+ .name = "autopair", -+ .probe = autopair_probe, -+ .remove = autopair_remove, -+}; -+ -+static int autopair_init(void) -+{ -+ return btd_register_adapter_driver(&autopair_driver); -+} -+ -+static void autopair_exit(void) -+{ -+ btd_unregister_adapter_driver(&autopair_driver); -+ -+ autopair_cancel_all(); -+ -+ g_slist_free_full(blacklist, g_free); -+} -+ -+BLUETOOTH_PLUGIN_DEFINE(autopair, VERSION, -+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, autopair_init, autopair_exit) --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_has_data_type-parsing.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_has_data_type-parsing.patch deleted file mode 100644 index 55eafa89da..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_has_data_type-parsing.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c86e19ef02a7faf845b399a50f4aa0b23b003fcf Mon Sep 17 00:00:00 2001 -From: Syam Sidhardhan -Date: Mon, 16 Apr 2012 18:31:38 +0530 -Subject: [PATCH 1/2] eir: Fix incorrect eir_has_data_type() parsing - -Updating the "parsed" variable twice inside the for loop, leads to -incorrect parsing. ---- - src/eir.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/eir.c b/src/eir.c -index 419f444..4dfadea 100644 ---- a/src/eir.c -+++ b/src/eir.c -@@ -337,9 +337,9 @@ void eir_create(const char *name, int8_t tx_power, uint16_t did_vendor, - gboolean eir_has_data_type(uint8_t *data, size_t len, uint8_t type) - { - uint8_t field_len; -- size_t parsed; -+ size_t parsed = 0; - -- for (parsed = 0; parsed < len - 1; parsed += field_len) { -+ while (parsed < len - 1) { - field_len = data[0]; - - if (field_len == 0) --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_length-parsing.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_length-parsing.patch deleted file mode 100644 index a6b6aa041d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-eir-Fix-incorrect-eir_length-parsing.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8dbaea685b5a0e155c1433d054ead4ce332c3570 Mon Sep 17 00:00:00 2001 -From: Syam Sidhardhan -Date: Mon, 16 Apr 2012 18:31:37 +0530 -Subject: [PATCH 2/2] eir: Fix incorrect eir_length() parsing - -Issue: -The COD value displayed via dbus during inquiry is wrong. -This is because of the incorrect return length of the eir_length(), -which leads to appending the COD at wrong location. - -Analysis: -After appending the COD at the end of the eir data, we can see -there are some '00' present in the eir field length in the eir file. -XX:XX:XX:XX:XX:XX 07095359414D5043020A040B0312111F110C110E110311 -0000000000000000000000040D000142 - -Fix: -Corrected the length calculation in eir_length(), which is determining, -which position the COD should append ---- - src/eir.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/eir.c b/src/eir.c -index 4dfadea..923d7be 100644 ---- a/src/eir.c -+++ b/src/eir.c -@@ -373,9 +373,9 @@ size_t eir_append_data(uint8_t *eir, size_t eir_len, uint8_t type, - size_t eir_length(uint8_t *eir, size_t maxlen) - { - uint8_t field_len; -- size_t parsed, length; -+ size_t parsed = 0, length = 0; - -- for (parsed = 0, length = 0; parsed < maxlen - 1; parsed += field_len) { -+ while (parsed < maxlen - 1) { - field_len = eir[0]; - - if (field_len == 0) --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0001.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0001.patch deleted file mode 100644 index 6dabe63d07..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0001.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Antonio Ospite -Subject: [PATCH BlueZ v2 1/3] manager: add a btd_manager_get_default_adapter_address_str() call -Date: Wed, 18 Apr 2012 11:38:09 +0200 - -Add a new btd_* call to get the default adapter address as a string, -meant to be used by _external_ plugins, this is to avoid to make public -these symbols: - - manager_get_default_adapter - adapter_get_address - bt_malloc - ba2str ---- - -Alternatively a version without the _str prefix can be used which -returns a bdaddr_t, but I have to make ba2str a global symbol so I can -make the conversion to string in the plugin itself. - -Let me know how do you like that. - - - src/manager.c | 21 +++++++++++++++++++++ - src/manager.h | 1 + - 2 files changed, 22 insertions(+) - -diff --git a/src/manager.c b/src/manager.c -index 6244516..fbd5ef8 100644 ---- a/src/manager.c -+++ b/src/manager.c -@@ -270,6 +270,27 @@ struct btd_adapter *manager_get_default_adapter(void) - return manager_find_adapter_by_id(default_adapter_id); - } - -+char *btd_manager_get_default_adapter_address_str(void) -+{ -+ struct btd_adapter *adapter; -+ bdaddr_t adapter_bdaddr; -+ char *str; -+ -+ adapter = manager_get_default_adapter(); -+ if (adapter == NULL) { -+ return NULL; -+ } -+ -+ adapter_get_address(adapter, &adapter_bdaddr); -+ -+ str = bt_malloc(18); -+ if (str == NULL) -+ return NULL; -+ -+ ba2str(&adapter_bdaddr, str); -+ return str; -+} -+ - static void manager_remove_adapter(struct btd_adapter *adapter) - { - uint16_t dev_id = adapter_get_dev_id(adapter); -diff --git a/src/manager.h b/src/manager.h -index 264cd25..7df882e 100644 ---- a/src/manager.h -+++ b/src/manager.h -@@ -36,6 +36,7 @@ const char *manager_get_base_path(void); - struct btd_adapter *manager_find_adapter(const bdaddr_t *sba); - struct btd_adapter *manager_find_adapter_by_id(int id); - struct btd_adapter *manager_get_default_adapter(void); -+char *btd_manager_get_default_adapter_address_str(void); - void manager_foreach_adapter(adapter_cb func, gpointer user_data); - GSList *manager_get_adapters(void); - struct btd_adapter *btd_manager_register_adapter(int id, gboolean up); --- -1.7.10 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0002.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0002.patch deleted file mode 100644 index 5132f2490c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0002.patch +++ /dev/null @@ -1,144 +0,0 @@ -From: Antonio Ospite -Subject: [PATCH BlueZ v2 2/3] device: add a btd_device_set_trusted() call -Date: Wed, 18 Apr 2012 11:38:10 +0200 - -Add a new btd_* call to set a device as trusted, meant to be used by -_external_ plugins, this avoid making public these symbols: - - record_from_string - store_record - sdp_record_free - str2ba - str2ba - store_device_id - write_trust - dbus_bus_get - manager_find_adapter - adapter_get_device - dbus_connection_unref ---- - -If BlueZ can pull the required parameters itself from trusted devices this can -be simplified, if not then the name should be fixed to make clearer what the -function does. - - src/device.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/device.h | 9 +++++++ - 2 files changed, 83 insertions(+) - -diff --git a/src/device.c b/src/device.c -index ea6fec2..6e434c1 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -49,6 +49,7 @@ - #include "att.h" - #include "hcid.h" - #include "adapter.h" -+#include "manager.h" - #include "gattrib.h" - #include "attio.h" - #include "device.h" -@@ -2948,6 +2949,80 @@ GSList *btd_device_get_primaries(struct btd_device *device) - return device->primaries; - } - -+int btd_device_set_trusted(const char *adapter_address, -+ const char *device_address, -+ char *name, -+ uint16_t vendor_id_source, -+ uint16_t vendor_id, -+ uint16_t product_id, -+ uint16_t version_id, -+ const char *uuid, -+ const char *sdp_record) -+{ -+ struct btd_adapter *adapter; -+ struct btd_device *device; -+ DBusConnection *conn; -+ bdaddr_t src; -+ bdaddr_t dst; -+ sdp_record_t *record; -+ int ret = 0; -+ -+ record = record_from_string(sdp_record); -+ if (record == NULL) { -+ ret = -ENODEV; -+ goto out; -+ } -+ ret = store_record(adapter_address, device_address, record); -+ sdp_record_free(record); -+ if (ret < 0) -+ goto out; -+ -+ str2ba(adapter_address, &src); -+ str2ba(device_address, &dst); -+ -+ /* Set the device id */ -+ store_device_id(adapter_address, device_address, vendor_id_source, vendor_id, -+ product_id, version_id); -+ /* Don't write a profile here, -+ * it will be updated when the device connects */ -+ -+ write_trust(adapter_address, device_address, "[all]", TRUE); -+ -+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); -+ if (conn == NULL) { -+ DBG("Failed to get on the bus"); -+ ret = -EPERM; -+ goto out; -+ } -+ -+ adapter = manager_find_adapter(&src); -+ if (adapter == NULL) { -+ DBG("Failed to get the adapter"); -+ ret = -EPERM; -+ goto out_dbus_unref; -+ } -+ -+ /* This is needed: adapter_find_device() wouldn't need a Dbus -+ * connection but it would not be enough as it only searches for -+ * already existing devices, while adapter_get_device() will create a -+ * new device if necessary. -+ */ -+ device = adapter_get_device(conn, adapter, device_address); -+ if (device == NULL) { -+ DBG("Failed to get the device"); -+ ret = -ENODEV; -+ goto out_dbus_unref; -+ } -+ -+ device_set_temporary(device, FALSE); -+ btd_device_add_uuid(device, uuid); -+ -+out_dbus_unref: -+ dbus_connection_unref(conn); -+out: -+ return ret; -+} -+ - void btd_device_add_uuid(struct btd_device *device, const char *uuid) - { - GSList *uuid_list; -diff --git a/src/device.h b/src/device.h -index 690c64d..1011e3e 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -57,6 +57,15 @@ void device_register_services(DBusConnection *conn, struct btd_device *device, - GSList *prim_list, int psm); - GSList *device_services_from_record(struct btd_device *device, - GSList *profiles); -+int btd_device_set_trusted(const char *adapter_address, -+ const char *device_address, -+ char *name, -+ uint16_t vendor_id_source, -+ uint16_t vendor_id, -+ uint16_t product_id, -+ uint16_t version_id, -+ const char *uuid, -+ const char *sdp_record); - void btd_device_add_uuid(struct btd_device *device, const char *uuid); - struct btd_adapter *device_get_adapter(struct btd_device *device); - void device_get_address(struct btd_device *device, bdaddr_t *bdaddr, --- -1.7.10 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0003.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0003.patch deleted file mode 100644 index 45d95c9653..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-4.99-ps3-0003.patch +++ /dev/null @@ -1,760 +0,0 @@ -From: Antonio Ospite -Subject: [PATCH BlueZ v2 3/3] Add playstation-peripheral plugin: USB pairing and LEDs settings -Date: Wed, 18 Apr 2012 11:38:11 +0200 - -Add a plugin which handles the connection of a Playstation peripheral, -when a new hidraw device is connected the plugin: - - - Filters udev events, and select the Playstation peripheral - - Sets the Master bluetooth address in the peripheral (USB pairing) - - Sets LEDs to match the joystick system number if needed - (for USB and BT) - - Adds the device to the database of the current default - adapter (BT association) - -Signed-off-by: Bastien Nocera -Signed-off-by: Antonio Ospite ---- - -For the first review round plugins/playstation-peripheral.c is the most -interesting file, in particular the handle_device_plug() and -peripheral_pair() functions. - - Makefile.am | 7 + - acinclude.m4 | 10 + - plugins/playstation-peripheral-hid.c | 263 ++++++++++++++++++++++++ - plugins/playstation-peripheral-hid.h | 10 + - plugins/playstation-peripheral.c | 376 ++++++++++++++++++++++++++++++++++ - 5 files changed, 666 insertions(+) - create mode 100644 plugins/playstation-peripheral-hid.c - create mode 100644 plugins/playstation-peripheral-hid.h - create mode 100644 plugins/playstation-peripheral.c - -diff --git a/Makefile.am b/Makefile.am -index 62705f6..61c7a07 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -267,6 +267,13 @@ builtin_modules += dbusoob - builtin_sources += plugins/autopair.c - endif - -+if PLAYSTATION_PERIPHERAL_PLUGIN -+plugin_LTLIBRARIES += plugins/playstation-peripheral.la -+plugins_playstation_peripheral_la_SOURCES = plugins/playstation-peripheral.c plugins/playstation-peripheral-hid.c -+plugins_playstation_peripheral_la_LDFLAGS = -module -avoid-version -no-undefined @UDEV_LIBS@ -+plugins_playstation_peripheral_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ @GLIB_CFLAGS@ @UDEV_CFLAGS@ -+endif -+ - if MAINTAINER_MODE - plugin_LTLIBRARIES += plugins/external-dummy.la - plugins_external_dummy_la_SOURCES = plugins/external-dummy.c -diff --git a/acinclude.m4 b/acinclude.m4 -index dcf9a48..06efe2a 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -176,6 +176,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - sndfile_enable=${sndfile_found} - hal_enable=no - usb_enable=${usb_found} -+ playstation_peripheral_enable=${udev_found} - alsa_enable=${alsa_found} - gstreamer_enable=${gstreamer_found} - audio_enable=yes -@@ -265,6 +266,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - usb_enable=${enableval} - ]) - -+ AC_ARG_ENABLE(playstation_peripheral, AC_HELP_STRING([--enable-playstation-peripheral], [enable playstation-peripheral plugin]), [ -+ playstation_peripheral_enable=${enableval} -+ ]) -+ - AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [ - tools_enable=${enableval} - ]) -@@ -360,6 +365,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.]) - fi - -+ if (test "${playstation_peripheral_enable}" = "yes" && test "${udev_found}" = "yes"); then -+ AC_DEFINE(HAVE_PLAYSTATION_PERIPHERAL_PLUGIN, 1, [Define to 1 if you have playstation-peripheral plugin.]) -+ fi -+ - AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") - AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes") - AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" || -@@ -392,4 +401,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes") - AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes") - AM_CONDITIONAL(AUTOPAIRPLUGIN, test "${autopair_enable}" = "yes") -+ AM_CONDITIONAL(PLAYSTATION_PERIPHERAL_PLUGIN, test "${playstation_peripheral_enable}" = "yes" && test "${udev_found}" = "yes") - ]) -diff --git a/plugins/playstation-peripheral-hid.c b/plugins/playstation-peripheral-hid.c -new file mode 100644 -index 0000000..9c5e530 ---- /dev/null -+++ b/plugins/playstation-peripheral-hid.c -@@ -0,0 +1,263 @@ -+/* -+ * playstation peripheral plugin: lowlevel hid functions -+ * -+ * Copyright (C) 2011 Antonio Ospite -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include "log.h" -+#include "playstation-peripheral-hid.h" -+ -+/* Fallback definitions to compile with older headers */ -+#ifndef HIDIOCGFEATURE -+#define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len) -+#endif -+ -+#ifndef HIDIOCSFEATURE -+#define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len) -+#endif -+ -+#define BDADDR_STR_SIZE 18 /* strlen("00:00:00:00:00:00") + 1 */ -+ -+#define LED_1 (0x01 << 1) -+#define LED_2 (0x01 << 2) -+#define LED_3 (0x01 << 3) -+#define LED_4 (0x01 << 4) -+ -+#define LED_STATUS_OFF 0 -+#define LED_STATUS_ON 1 -+ -+/* Usb cable pairing section */ -+static unsigned char *get_feature_report(int fd, uint8_t report_number, -+ unsigned int len) -+{ -+ unsigned char *buf; -+ int ret; -+ -+ buf = calloc(len, sizeof(*buf)); -+ if (buf == NULL) { -+ error("%s:%s() calloc failed", __FILE__, __func__); -+ return NULL; -+ } -+ -+ buf[0] = report_number; -+ -+ ret = ioctl(fd, HIDIOCGFEATURE(len), buf); -+ if (ret < 0) { -+ error("%s:%s() HIDIOCGFEATURE ret = %d", -+ __FILE__, __func__, ret); -+ free(buf); -+ return NULL; -+ } -+ -+ return buf; -+} -+ -+static int set_feature_report(int fd, uint8_t *report, int len) -+{ -+ int ret; -+ -+ ret = ioctl(fd, HIDIOCSFEATURE(len), report); -+ if (ret < 0) -+ error("%s:%s() HIDIOCSFEATURE failed, ret = %d", -+ __FILE__, __func__, ret); -+ -+ return ret; -+} -+ -+char *sixaxis_get_device_bdaddr(int fd) -+{ -+ unsigned char *buf; -+ char *address; -+ -+ buf = get_feature_report(fd, 0xf2, 18); -+ if (buf == NULL) { -+ error("%s:%s() cannot get feature report", __FILE__, __func__); -+ return NULL; -+ } -+ -+ address = calloc(BDADDR_STR_SIZE, sizeof(*address)); -+ if (address == NULL) { -+ error("%s:%s() calloc failed", __FILE__, __func__); -+ free(buf); -+ return NULL; -+ } -+ -+ snprintf(address, BDADDR_STR_SIZE, -+ "%02X:%02X:%02X:%02X:%02X:%02X", -+ buf[4], buf[5], buf[6], buf[7], buf[8], buf[9]); -+ -+ free(buf); -+ return address; -+} -+ -+char *sixaxis_get_master_bdaddr(int fd) -+{ -+ unsigned char *buf; -+ char *address; -+ -+ buf = get_feature_report(fd, 0xf5, 8); -+ if (buf == NULL) { -+ error("%s:%s() cannot get feature report", __FILE__, __func__); -+ return NULL; -+ } -+ -+ address = calloc(BDADDR_STR_SIZE, sizeof(*address)); -+ if (address == NULL) { -+ error("%s:%s() calloc failed", __FILE__, __func__); -+ free(buf); -+ return NULL; -+ } -+ -+ snprintf(address, BDADDR_STR_SIZE, -+ "%02X:%02X:%02X:%02X:%02X:%02X", -+ buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); -+ -+ free(buf); -+ return address; -+} -+ -+int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr) -+{ -+ uint8_t *report; -+ uint8_t addr[6]; -+ int ret; -+ -+ ret = sscanf(adapter_bdaddr, -+ "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", -+ &addr[0], &addr[1], &addr[2], -+ &addr[3], &addr[4], &addr[5]); -+ if (ret != 6) { -+ error("%s:%s() Parsing the bt address failed", -+ __FILE__, __func__); -+ return -EINVAL; -+ } -+ -+ report = malloc(8); -+ if (report == NULL) { -+ error("%s:%s() malloc failed", __FILE__, __func__); -+ return -ENOMEM; -+ } -+ -+ report[0] = 0xf5; -+ report[1] = 0x01; -+ -+ report[2] = addr[0]; -+ report[3] = addr[1]; -+ report[4] = addr[2]; -+ report[5] = addr[3]; -+ report[6] = addr[4]; -+ report[7] = addr[5]; -+ -+ ret = set_feature_report(fd, report, 8); -+ if (ret < 0) { -+ error("%s:%s() cannot set feature report", -+ __FILE__, __func__); -+ goto out; -+ } -+ -+ DBG("New Master Bluetooth address: %s", adapter_bdaddr); -+ -+out: -+ free(report); -+ return ret; -+} -+ -+ -+/* Led setting section */ -+static int set_leds(int fd, unsigned char leds_status[4]) -+{ -+ int ret; -+ -+ /* -+ * the total time the led is active (0xff means forever) -+ * | duty_length: how long a cycle is in deciseconds: -+ * | | (0 means "blink very fast") -+ * | | ??? (Maybe a phase shift or duty_length multiplier?) -+ * | | | % of duty_length led is off (0xff means 100%) -+ * | | | | % of duty_length led is on (0xff is 100%) -+ * | | | | | -+ * 0xff, 0x27, 0x10, 0x00, 0x32, -+ */ -+ unsigned char leds_report[] = { -+ 0x01, -+ 0x00, 0x00, 0x00, 0x00, 0x00, /* rumble values TBD */ -+ 0x00, 0x00, 0x00, 0x00, 0x1e, /* LED_1=0x02, LED_2=0x04 ... */ -+ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_4 */ -+ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_3 */ -+ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_2 */ -+ 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_1 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, -+ }; -+ -+ int leds = 0; -+ if (leds_status[0]) -+ leds |= LED_1; -+ if (leds_status[1]) -+ leds |= LED_2; -+ if (leds_status[2]) -+ leds |= LED_3; -+ if (leds_status[3]) -+ leds |= LED_4; -+ -+ leds_report[10] = leds; -+ -+ ret = write(fd, leds_report, sizeof(leds_report)); -+ if (ret < (ssize_t) sizeof(leds_report)) -+ error("%s:%s() Unable to write to hidraw device", -+ __FILE__, __func__); -+ -+ return ret; -+} -+ -+int set_controller_number(int fd, unsigned int n) -+{ -+ unsigned char leds_status[4] = {0, 0, 0, 0}; -+ -+ switch (n) { -+ case 0: -+ break; -+ case 1: -+ case 2: -+ case 3: -+ case 4: -+ leds_status[n - 1] = LED_STATUS_ON; -+ break; -+ case 5: -+ case 6: -+ case 7: -+ leds_status[4 - 1] = LED_STATUS_ON; -+ leds_status[n - 4 - 1] = LED_STATUS_ON; -+ break; -+ default: -+ error("%s:%s() Only 7 controllers supported for now", -+ __FILE__, __func__); -+ return -1; -+ } -+ -+ return set_leds(fd, leds_status); -+} -diff --git a/plugins/playstation-peripheral-hid.h b/plugins/playstation-peripheral-hid.h -new file mode 100644 -index 0000000..ade8fa0 ---- /dev/null -+++ b/plugins/playstation-peripheral-hid.h -@@ -0,0 +1,10 @@ -+#ifndef __PLAYSTATION_PERIPHERAL_HID_H -+#define __PLAYSTATION_PERIPHERAL_HID_H -+ -+char *sixaxis_get_device_bdaddr(int fd); -+char *sixaxis_get_master_bdaddr(int fd); -+int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr); -+ -+int set_controller_number(int fd, unsigned int n); -+ -+#endif /* __PLAYSTATION_PERIPHERAL_HID_H */ -diff --git a/plugins/playstation-peripheral.c b/plugins/playstation-peripheral.c -new file mode 100644 -index 0000000..90d69ee ---- /dev/null -+++ b/plugins/playstation-peripheral.c -@@ -0,0 +1,376 @@ -+/* -+ * playstation peripheral plugin: support for Playstation peripherals -+ * -+ * Copyright (C) 2009 Bastien Nocera -+ * Copyright (C) 2011 Antonio Ospite -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+/* -+ * In the following this terminology is used: -+ * -+ * - peripheral: a Playstation peripheral (Sixaxis, DS3, headset, etc.) -+ * - controller: an input peripheral -+ * - adapter: the bluetooth dongle on the host system. -+ * - adapter_bdaddr: the bdaddr of the bluetooth adapter. -+ * - device_bdaddr: the bdaddr of the Playstation peripheral. -+ * - master_bdaddr: the bdaddr of the adapter to be configured into the -+ * Playstation peripheral -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE 1 -+#include -+ -+#include "plugin.h" -+#include "log.h" -+#include "adapter.h" -+#include "device.h" -+#include "manager.h" -+#include "storage.h" -+#include "sdp_lib.h" -+ -+#include "playstation-peripheral-hid.h" -+ -+struct playstation_peripheral { -+ uint16_t vendor_id; -+ uint16_t product_id; -+ char *name; -+ char *sdp_record; -+ char *uuid; -+ -+ /* device specific callbacks to get master/device bdaddr and set -+ * master bdaddr -+ */ -+ char * (*get_device_bdaddr)(int); -+ char * (*get_master_bdaddr)(int); -+ int (*set_master_bdaddr) (int, char *); -+}; -+ -+static struct playstation_peripheral peripherals[] = { -+ { -+ .vendor_id = 0x054c, -+ .product_id = 0x0268, -+ .name = "PLAYSTATION(R)3 Controller", -+ .sdp_record = "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800", -+ .uuid = "00001124-0000-1000-8000-00805f9b34fb", -+ .get_device_bdaddr = sixaxis_get_device_bdaddr, -+ .get_master_bdaddr = sixaxis_get_master_bdaddr, -+ .set_master_bdaddr = sixaxis_set_master_bdaddr, -+ }, -+}; -+ -+static struct udev *ctx; -+static struct udev_monitor *monitor; -+static guint watch_id; -+ -+static int create_peripheral_association(const char *adapter_address, -+ const char *device_address, -+ struct playstation_peripheral *peripheral) -+{ -+ int ret = 0; -+ -+ ret = btd_device_set_trusted(adapter_address, device_address, -+ peripheral->name, -+ 0x0002, /* VersionIDSource = USB Implementer's Forum */ -+ peripheral->vendor_id, -+ peripheral->product_id, -+ 0, /* version is hardcoded to 0 for now */ -+ peripheral->uuid, -+ peripheral->sdp_record); -+ if (ret < 0) -+ return ret; -+ -+ return 0; -+} -+ -+static int peripheral_pair(int fd, char *adapter_bdaddr, -+ struct playstation_peripheral *peripheral) -+{ -+ char *device_bdaddr; -+ char *master_bdaddr; -+ int ret = 0; -+ -+ master_bdaddr = peripheral->get_master_bdaddr(fd); -+ if (master_bdaddr == NULL) { -+ DBG("Failed to get the Old master Bluetooth address from the device"); -+ return -EPERM; -+ } -+ -+ /* Only set the master bdaddr when needed, this is how the PS3 does -+ * it, perhaps to avoid unnecessary writes to some eeprom. -+ */ -+ if (g_strcmp0(master_bdaddr, adapter_bdaddr) != 0) { -+ DBG("Old master Bluetooth address was: %s", master_bdaddr); -+ ret = peripheral->set_master_bdaddr(fd, adapter_bdaddr); -+ if (ret < 0) { -+ DBG("Failed to set the master Bluetooth address"); -+ free(master_bdaddr); -+ return ret; -+ } -+ } -+ -+ device_bdaddr = peripheral->get_device_bdaddr(fd); -+ if (device_bdaddr == NULL) { -+ DBG("Failed to get the Bluetooth address from the device"); -+ free(master_bdaddr); -+ return -EPERM; -+ } -+ -+ DBG("Device bdaddr %s", device_bdaddr); -+ -+ ret = create_peripheral_association(adapter_bdaddr, device_bdaddr, peripheral); -+ -+ free(device_bdaddr); -+ free(master_bdaddr); -+ return ret; -+} -+ -+static inline struct playstation_peripheral *find_playstation_peripheral(const char *hid_id) -+{ -+ unsigned int array_size = sizeof(peripherals)/sizeof(peripherals[0]); -+ unsigned int i; -+ int ret; -+ uint16_t protocol; -+ uint16_t vendor_id; -+ uint16_t product_id; -+ -+ ret = sscanf(hid_id, "%hx:%hx:%hx", &protocol, &vendor_id, &product_id); -+ if (ret != 3) { -+ error("%s:%s() Parsing HID_ID failed", -+ __FILE__, __func__); -+ return NULL; -+ } -+ -+ for (i = 0; i < array_size; i++) { -+ if (peripherals[i].vendor_id == vendor_id && -+ peripherals[i].product_id == product_id) -+ return &peripherals[i]; -+ } -+ -+ return NULL; -+} -+ -+static inline int is_usb_peripheral(const char *hid_id) -+{ -+ int ret; -+ uint16_t protocol; -+ uint16_t vendor_id; -+ uint16_t product_id; -+ -+ ret = sscanf(hid_id, "%hx:%hx:%hx", &protocol, &vendor_id, &product_id); -+ if (ret != 3) { -+ error("%s:%s() Parsing HID_ID failed", -+ __FILE__, __func__); -+ return 0; -+ } -+ -+ DBG("%hx:%hx:%hx", protocol, vendor_id, product_id); -+ return (protocol == 3); -+} -+ -+static void handle_device_plug(struct udev_device *udevice) -+{ -+ struct udev_device *hid_parent; -+ struct udev_enumerate *enumerate; -+ struct udev_list_entry *devices, *dev_list_entry; -+ const char *hid_id; -+ const char *hid_phys; -+ const char *hidraw_node; -+ unsigned char is_usb = FALSE; -+ int js_num = 0; -+ int fd; -+ struct playstation_peripheral *peripheral; -+ -+ hid_parent = udev_device_get_parent_with_subsystem_devtype(udevice, -+ "hid", NULL); -+ if (!hid_parent) { -+ error("%s:%s() cannot get parent hid device", -+ __FILE__, __func__); -+ return; -+ } -+ -+ hid_id = udev_device_get_property_value(hid_parent, "HID_ID"); -+ DBG("HID_ID: %s", hid_id); -+ -+ peripheral = find_playstation_peripheral(hid_id); -+ if (!peripheral) { -+ error("No supported peripheral found"); -+ return; -+ } -+ -+ DBG("Found a Playstation peripheral: %s", peripheral->name); -+ -+ hidraw_node = udev_device_get_devnode(udevice); -+ -+ /* looking for joysticks */ -+ hid_phys = udev_device_get_property_value(hid_parent, "HID_PHYS"); -+ -+ enumerate = udev_enumerate_new(udev_device_get_udev(udevice)); -+ udev_enumerate_add_match_sysname(enumerate, "js*"); -+ udev_enumerate_scan_devices(enumerate); -+ -+ devices = udev_enumerate_get_list_entry(enumerate); -+ udev_list_entry_foreach(dev_list_entry, devices) { -+ const char *devname; -+ struct udev_device *js_dev; -+ struct udev_device *input_parent; -+ const char *input_phys; -+ -+ devname = udev_list_entry_get_name(dev_list_entry); -+ js_dev = udev_device_new_from_syspath(udev_device_get_udev(udevice), -+ devname); -+ -+ input_parent = udev_device_get_parent_with_subsystem_devtype(js_dev, -+ "input", NULL); -+ if (!input_parent) { -+ error("%s:%s() cannot get parent input device.", -+ __FILE__, __func__); -+ continue; -+ } -+ -+ /* check this is the joystick relative to -+ * the hidraw device above */ -+ input_phys = udev_device_get_sysattr_value(input_parent, -+ "phys"); -+ if (g_strcmp0(input_phys, hid_phys) == 0) { -+ js_num = atoi(udev_device_get_sysnum(js_dev)) + 1; -+ DBG("joypad device_num: %d", js_num); -+ DBG("hidraw_node: %s", hidraw_node); -+ } -+ -+ udev_device_unref(js_dev); -+ } -+ -+ udev_enumerate_unref(enumerate); -+ -+ fd = open(hidraw_node, O_RDWR); -+ if (fd < 0) { -+ error("%s:%s() hidraw open", __FILE__, __func__); -+ return; -+ } -+ -+ is_usb = is_usb_peripheral(hid_id); -+ if (is_usb) { -+ char *adapter_bdaddr; -+ -+ adapter_bdaddr = btd_manager_get_default_adapter_address_str(); -+ if (adapter_bdaddr == NULL) { -+ error("No adapters, exiting"); -+ return; -+ } -+ -+ DBG("Adapter bdaddr %s", adapter_bdaddr); -+ -+ peripheral_pair(fd, adapter_bdaddr, peripheral); -+ free(adapter_bdaddr); -+ } -+ -+ if (js_num > 0) -+ set_controller_number(fd, js_num); -+ -+ close(fd); -+} -+ -+static gboolean device_event_idle(struct udev_device *udevice) -+{ -+ handle_device_plug(udevice); -+ udev_device_unref(udevice); -+ return FALSE; -+} -+ -+static gboolean monitor_event(GIOChannel *source, GIOCondition condition, -+ gpointer data) -+{ -+ struct udev_device *udevice; -+ -+ udevice = udev_monitor_receive_device(monitor); -+ if (udevice == NULL) -+ goto out; -+ if (g_strcmp0(udev_device_get_action(udevice), "add") != 0) { -+ udev_device_unref(udevice); -+ goto out; -+ } -+ -+ /* Give UDEV some time to load kernel modules */ -+ g_timeout_add_seconds(1, (GSourceFunc) device_event_idle, udevice); -+ -+out: -+ return TRUE; -+} -+ -+static int playstation_peripheral_init(void) -+{ -+ GIOChannel *channel; -+ -+ DBG("Setup Playstation peripheral plugin"); -+ -+ ctx = udev_new(); -+ monitor = udev_monitor_new_from_netlink(ctx, "udev"); -+ if (monitor == NULL) { -+ error("%s:%s() Could not get udev monitor", -+ __FILE__, __func__); -+ return -1; -+ } -+ -+ /* Listen for newly connected hidraw interfaces */ -+ udev_monitor_filter_add_match_subsystem_devtype(monitor, -+ "hidraw", NULL); -+ udev_monitor_enable_receiving(monitor); -+ -+ channel = g_io_channel_unix_new(udev_monitor_get_fd(monitor)); -+ watch_id = g_io_add_watch(channel, G_IO_IN, monitor_event, NULL); -+ g_io_channel_unref(channel); -+ -+ return 0; -+} -+ -+static void playstation_peripheral_exit(void) -+{ -+ DBG("Cleanup Playstation peripheral plugin"); -+ -+ if (watch_id != 0) { -+ g_source_remove(watch_id); -+ watch_id = 0; -+ } -+ if (monitor != NULL) { -+ udev_monitor_unref(monitor); -+ monitor = NULL; -+ } -+ if (ctx != NULL) { -+ udev_unref(ctx); -+ ctx = NULL; -+ } -+} -+ -+BLUETOOTH_PLUGIN_DEFINE(playstation_peripheral, VERSION, -+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, -+ playstation_peripheral_init, -+ playstation_peripheral_exit) --- -1.7.10 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-alsa_location.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-alsa_location.patch deleted file mode 100644 index 4d0712c671..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-alsa_location.patch +++ /dev/null @@ -1,16 +0,0 @@ -bluez installs stuff into /etc/alsa, which is wrong since the -correct location (also stated in alsa-lib configure.in) is -/usr/share/alsa instead -Upstream report: -http://permalink.gmane.org/gmane.linux.bluez.kernel/4739 ---- Makefile.am~ 2010-02-12 20:26:48.000000000 +0100 -+++ Makefile.am 2010-03-05 10:17:15.000000000 +0100 -@@ -241,7 +241,7 @@ - audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ - - if CONFIGFILES --alsaconfdir = $(sysconfdir)/alsa -+alsaconfdir = $(datadir)/alsa - - alsaconf_DATA = audio/bluetooth.conf - endif diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ath3k.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ath3k.patch deleted file mode 100644 index e33e36cc04..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ath3k.patch +++ /dev/null @@ -1,1428 +0,0 @@ -From 6c059a8f484120082506f0842226e0bf8c411984 Mon Sep 17 00:00:00 2001 -From: Chandrika -Date: Tue, 11 May 2010 13:26:08 +0530 -Subject: [PATCH v2] hciattach support for Atheros AR300x Bluetooth Chip - Signed-off-by: Suraj - ---- - Makefile.tools | 1 + - tools/hciattach.8 | 6 + - tools/hciattach.c | 166 +++++++- - tools/hciattach.h | 2 + - tools/hciattach_ar3k.c | 1174 ++++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 1347 insertions(+), 2 deletions(-) - create mode 100755 tools/hciattach_ar3k.c - -diff --git a/Makefile.tools b/Makefile.tools -index 2735d68..48cf097 100644 ---- a/Makefile.tools -+++ b/Makefile.tools -@@ -23,6 +23,7 @@ tools_l2ping_LDADD = lib/libbluetooth.la - tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \ - tools/hciattach_st.c \ - tools/hciattach_ti.c \ -+ tools/hciattach_ar3k.c \ - tools/hciattach_tialt.c - tools_hciattach_LDADD = lib/libbluetooth.la - -diff --git a/tools/hciattach.8 b/tools/hciattach.8 -index f750222..ef943ea 100644 ---- a/tools/hciattach.8 -+++ b/tools/hciattach.8 -@@ -49,6 +49,12 @@ specific identifier. Currently supported types are - .B any - Unspecified HCI_UART interface, no vendor specific options - .TP -+.B ar3kalt -+Atheros AR300x based serial bluetooth device with power management disabled -+.TP -+.B ar3k -+Atheros AR300x based serial bluetooth device -+.TP - .B ericsson - Ericsson based modules - .TP -diff --git a/tools/hciattach.c b/tools/hciattach.c -index 364c5ff..c2be73e 100644 ---- a/tools/hciattach.c -+++ b/tools/hciattach.c -@@ -652,8 +652,162 @@ static int csr(int fd, struct uart_t *u, struct termios *ti) - return 0; - } - --/* -- * Silicon Wave specific initialization -+/* -+ * Atheros AR3xxx specific initialization code with power management disabled. -+ * Suraj Sumangala -+ */ -+static int ar3kpost(int fd, struct uart_t *u, struct termios *ti) -+{ -+ int dev_id, dd; -+ struct timespec tm = {0, 50000}; -+ int status = 0; -+ -+ -+ dev_id = ioctl(fd, HCIUARTGETDEVICE, 0); -+ if (dev_id < 0) { -+ perror("cannot get device id"); -+ return -1; -+ } -+ -+ -+ dd = hci_open_dev(dev_id); -+ if (dd < 0) { -+ perror("HCI device open failed"); -+ return -1; -+ } -+ -+ sleep(2); -+ -+ /* send vendor specific command with Sleep feature disabled */ -+ hci_send_cmd(dd, OGF_VENDOR_CMD, 0x04, 1, &status); -+ -+ nanosleep(&tm, NULL); -+ hci_close_dev(dd); -+ -+ return 0; -+ -+} -+/* -+ * Atheros AR3xxx specific initialization post callback -+ * with power management enabled -+ * Suraj Sumangala -+ */ -+static int ar3kpmpost(int fd, struct uart_t *u, struct termios *ti) -+{ -+ int dev_id, dd; -+ struct timespec tm = {0, 50000}; -+ int status = 1; -+ -+ -+ dev_id = ioctl(fd, HCIUARTGETDEVICE, 0); -+ if (dev_id < 0) { -+ perror("cannot get device id"); -+ return -1; -+ } -+ -+ -+ dd = hci_open_dev(dev_id); -+ if (dd < 0) { -+ perror("HCI device open failed"); -+ return -1; -+ } -+ -+ sleep(2); -+ -+ /* send vendor specific command with Sleep feature Enabled */ -+ if (hci_send_cmd(dd, OGF_VENDOR_CMD, 0x04, 1, &status) < 0) -+ perror("sleep enable command not sent"); -+ -+ nanosleep(&tm, NULL); -+ hci_close_dev(dd); -+ -+ return 0; -+} -+/* -+ * Atheros AR3xxx specific initialization -+ * Suraj Sumangala -+ */ -+static int ar3kinit(int fd, struct uart_t *u, struct termios *ti) -+{ -+ struct timespec tm = { 0, 500000 }; -+ unsigned char cmd[14], rsp[100]; -+ int r; -+ int baud; -+ -+ /* Download PS and patch */ -+ r = ath_ps_download(fd); -+ if (r < 0) { -+ perror("Failed to Download configuration"); -+ return -1; -+ } -+ -+ /* Write BDADDR if user has provided any */ -+ if (u->bdaddr != NULL) { -+ /* Set BD_ADDR */ -+ memset(cmd, 0, sizeof(cmd)); -+ memset(rsp, 0, sizeof(rsp)); -+ cmd[0] = HCI_COMMAND_PKT; -+ cmd[1] = 0x0B; -+ cmd[2] = 0xfc; -+ cmd[3] = 0x0A; -+ cmd[4] = 0x01; -+ cmd[5] = 0x01; -+ cmd[6] = 0x00; -+ cmd[7] = 0x06; -+ str2ba(u->bdaddr, (bdaddr_t *) (cmd + 8)); -+ -+ /* Send command */ -+ if (write(fd, cmd, 14) != 14) { -+ fprintf(stderr, "Failed to write BD_ADDR command\n"); -+ return -1; -+ } -+ -+ /* Read reply */ -+ if (read_hci_event(fd, rsp, 10) < 0) { -+ fprintf(stderr, "Failed to set BD_ADDR\n"); -+ return -1; -+ } -+ } -+ -+ /* Send HCI Reset to write the configuration */ -+ cmd[0] = HCI_COMMAND_PKT; -+ cmd[1] = 0x03; -+ cmd[2] = 0x0c; -+ cmd[3] = 0x00; -+ /* Send reset command */ -+ r = write(fd, cmd, 4); -+ -+ if (r != 4) -+ return -1; -+ -+ nanosleep(&tm, NULL); -+ if (read_hci_event(fd, rsp, sizeof(rsp)) < 0) -+ return -1; -+ -+ /* Set baud rate command, -+ * set controller baud rate to user specified value */ -+ cmd[0] = HCI_COMMAND_PKT; -+ cmd[1] = 0x0C; -+ cmd[2] = 0xfc; -+ cmd[3] = 0x02; -+ baud = u->speed/100; -+ cmd[4] = (char)baud; -+ cmd[5] = (char)(baud >> 8); -+ -+ if (write(fd, cmd, 6) != 6) { -+ perror("Failed to write init command"); -+ return -1; -+ } -+ -+ /* Wait for the command complete event for Baud rate change Command */ -+ nanosleep(&tm, NULL); -+ if (read_hci_event(fd, rsp, sizeof(rsp)) < 0) -+ return -1; -+ -+ return 0; -+} -+/* -+ * Silicon Wave specific initialization - * Thomas Moser - */ - static int swave(int fd, struct uart_t *u, struct termios *ti) -@@ -1071,6 +1225,14 @@ struct uart_t uart[] = { - /* Broadcom BCM2035 */ - { "bcm2035", 0x0A5C, 0x2035, HCI_UART_H4, 115200, 460800, FLOW_CTL, NULL, bcm2035 }, - -+ /* ATHEROS AR300x */ -+ { "ar3kalt", 0x0000, 0x0000, HCI_UART_ATH, -+ 115200, 115200, FLOW_CTL, NULL, ar3kinit, ar3kpost }, -+ -+ { "ar3k", 0x0000, 0x0000, HCI_UART_ATH, -+ 115200, 115200, FLOW_CTL, NULL, ar3kinit, ar3kpmpost }, -+ -+ - { NULL, 0 } - }; - -diff --git a/tools/hciattach.h b/tools/hciattach.h -index 867563b..5b68668 100644 ---- a/tools/hciattach.h -+++ b/tools/hciattach.h -@@ -36,6 +36,7 @@ - #define HCI_UART_3WIRE 2 - #define HCI_UART_H4DS 3 - #define HCI_UART_LL 4 -+#define HCI_UART_ATH 5 - - int read_hci_event(int fd, unsigned char* buf, int size); - int set_speed(int fd, struct termios *ti, int speed); -@@ -45,3 +46,4 @@ int texas_post(int fd, struct termios *ti); - int texasalt_init(int fd, int speed, struct termios *ti); - int stlc2500_init(int fd, bdaddr_t *bdaddr); - int bgb2xx_init(int dd, bdaddr_t *bdaddr); -+int ath_ps_download(int fd); -diff --git a/tools/hciattach_ar3k.c b/tools/hciattach_ar3k.c -new file mode 100755 -index 0000000..20562ba ---- /dev/null -+++ b/tools/hciattach_ar3k.c -@@ -0,0 +1,1174 @@ -+/* -+ * Copyright (c) 2009-2010 Atheros Communications Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include "hciattach.h" -+ -+#define FALSE 0 -+#define TRUE 1 -+ -+/* The maximum number of bytes possible in a patch entry */ -+#define MAX_PATCH_SIZE 20000 -+ -+/* Maximum HCI packets that will be formed from the Patch file */ -+#define MAX_NUM_PATCH_ENTRY ((MAX_PATCH_SIZE/MAX_BYTE_LENGTH) + 1) -+ -+#define DEV_REGISTER 0x4FFC -+ -+#define FW_PATH "/lib/firmware/ar3k/" -+ -+#define PS_ASIC_FILE "PS_ASIC.pst" -+#define PS_FPGA_FILE "PS_FPGA.pst" -+#define PATCH_FILE "RamPatch.txt" -+#define BDADDR_FILE "ar3kbdaddr.pst" -+ -+#define HCI_CMD_HEADER_LEN 7 -+ -+/* PS command types */ -+#define PS_RESET 2 -+#define PS_WRITE 1 -+#define WRITE_PATCH 8 -+#define PS_VERIFY_CRC 9 -+#define ENABLE_PATCH 11 -+ -+/* PS configuration entry time */ -+#define PS_TYPE_HEX 0 -+#define PS_TYPE_DEC 1 -+ -+#define PS_RESET_PARAM_LEN 6 -+#define PS_RESET_CMD_LEN (PS_RESET_PARAM_LEN +\ -+ HCI_CMD_HEADER_LEN) -+ -+#define NUM_WAKEUP_RETRY 10 -+ -+ -+#define RAM_PS_REGION (1<<0) -+#define RAM_PATCH_REGION (1<<1) -+ -+#define RAMPS_MAX_PS_TAGS_PER_FILE 50 -+#define PS_MAX_LEN 500 -+#define LINE_SIZE_MAX (PS_MAX_LEN * 2) -+ -+#define BYTES_OF_PS_DATA_PER_LINE 16 -+#define MAX_BYTE_LENGTH 244 -+ -+#define skip_space(str) while (*(str) == (' ')) ((str)++) -+ -+#define IS_BETWEEN(x, lower, upper) (((lower) <= (x)) && ((x) <= (upper))) -+ -+#define tohexval(c) (isdigit(c) ? ((c) - '0') : \ -+ (IS_BETWEEN((c), 'A', 'Z') ? \ -+ ((c) - 'A' + 10) : ((c) - 'a' + 10))) -+ -+#define stringtohex(str) (((uint8_t)(tohexval((str)[0]) << 4)) |\ -+ ((uint8_t)tohexval((str)[1]))) -+ -+#define set_pst_format(pst, type, array_val) ((pst)->data_type = (type),\ -+ (pst)->is_array = (array_val)) -+ -+struct ps_tag_entry { -+ uint32_t tag_id; -+ uint32_t tag_len; -+ uint8_t *tag_data; -+}; -+ -+struct ps_ram_patch { -+ int16_t Len; -+ uint8_t *Data; -+}; -+struct ps_data_format { -+ unsigned char data_type; -+ unsigned char is_array; -+}; -+ -+struct ps_cmd_packet { -+ uint8_t *Hcipacket; -+ int packetLen; -+}; -+ -+struct st_read_status { -+ unsigned section; -+ unsigned line_count; -+ unsigned char_cnt; -+ unsigned byte_count; -+}; -+ -+struct ps_tag_entry ps_tag_entry[RAMPS_MAX_PS_TAGS_PER_FILE]; -+struct ps_ram_patch ram_patch[MAX_NUM_PATCH_ENTRY]; -+ -+static void load_hci_header(uint8_t *hci_ps_cmd, -+ uint8_t opcode, -+ int length, -+ int index) -+{ -+ hci_ps_cmd[0] = 0x0B; -+ hci_ps_cmd[1] = 0xFC; -+ hci_ps_cmd[2] = length + 4; -+ hci_ps_cmd[3] = opcode; -+ hci_ps_cmd[4] = (index & 0xFF); -+ hci_ps_cmd[5] = ((index >> 8) & 0xFF); -+ hci_ps_cmd[6] = length; -+} -+ -+static int ath_create_ps_command(uint8_t opcode, -+ uint32_t param_1, -+ struct ps_cmd_packet *ps_patch_packet, -+ uint32_t *index) -+{ -+ uint8_t *hci_ps_cmd; -+ int i; -+ -+ switch (opcode) { -+ case WRITE_PATCH: -+ -+ for (i = 0; i < param_1; i++) { -+ -+ /* Allocate command buffer */ -+ hci_ps_cmd = (uint8_t *) malloc(ram_patch[i].Len + -+ HCI_CMD_HEADER_LEN); -+ -+ if (!hci_ps_cmd) -+ return -ENOMEM; -+ -+ /* Update commands to buffer */ -+ load_hci_header(hci_ps_cmd, -+ opcode, -+ ram_patch[i].Len, -+ i); -+ memcpy(&hci_ps_cmd[HCI_CMD_HEADER_LEN], -+ ram_patch[i].Data, -+ ram_patch[i].Len); -+ -+ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; -+ ps_patch_packet[*index].packetLen = ram_patch[i].Len + -+ HCI_CMD_HEADER_LEN; -+ -+ (*index)++; -+ } -+ break; -+ -+ case ENABLE_PATCH: -+ -+ hci_ps_cmd = (uint8_t *) malloc(HCI_CMD_HEADER_LEN); -+ -+ if (!hci_ps_cmd) -+ return -ENOMEM; -+ -+ load_hci_header(hci_ps_cmd, opcode, 0, 0x00); -+ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; -+ ps_patch_packet[*index].packetLen = HCI_CMD_HEADER_LEN; -+ -+ (*index)++; -+ -+ break; -+ -+ case PS_RESET: -+ -+ hci_ps_cmd = (uint8_t *) malloc(PS_RESET_CMD_LEN); -+ -+ if (!hci_ps_cmd) -+ return -ENOMEM; -+ -+ load_hci_header(hci_ps_cmd, opcode, PS_RESET_PARAM_LEN, 0x00); -+ hci_ps_cmd[7] = 0x00; -+ hci_ps_cmd[PS_RESET_CMD_LEN - 2] = (param_1 & 0xFF); -+ hci_ps_cmd[PS_RESET_CMD_LEN - 1] = ((param_1 >> 8) & 0xFF); -+ -+ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; -+ ps_patch_packet[*index].packetLen = PS_RESET_CMD_LEN; -+ -+ (*index)++; -+ -+ break; -+ -+ case PS_WRITE: -+ for (i = 0; i < param_1; i++) { -+ hci_ps_cmd = -+ (uint8_t *) malloc(ps_tag_entry[i].tag_len + -+ HCI_CMD_HEADER_LEN); -+ if (!hci_ps_cmd) -+ return -ENOMEM; -+ -+ load_hci_header(hci_ps_cmd, -+ opcode, -+ ps_tag_entry[i].tag_len, -+ ps_tag_entry[i].tag_id); -+ -+ memcpy(&hci_ps_cmd[HCI_CMD_HEADER_LEN], -+ ps_tag_entry[i].tag_data, -+ ps_tag_entry[i].tag_len); -+ -+ ps_patch_packet[*index].Hcipacket = hci_ps_cmd; -+ -+ ps_patch_packet[*index].packetLen = -+ ps_tag_entry[i].tag_len + HCI_CMD_HEADER_LEN; -+ -+ (*index)++; -+ } -+ break; -+ -+ default: -+ break; -+ } -+ -+ return 0; -+} -+ -+static int get_ps_type(char *line, -+ int eol_index, -+ unsigned char *type, -+ unsigned char *sub_type) -+{ -+ -+ switch (eol_index) { -+ case 1: -+ return 0; -+ break; -+ -+ case 2: -+ (*type) = toupper(line[1]); -+ break; -+ -+ case 3: -+ if (line[2] == ':') -+ (*type) = toupper(line[1]); -+ else if (line[1] == ':') -+ (*sub_type) = toupper(line[2]); -+ else -+ return -1; -+ -+ break; -+ -+ case 4: -+ if (line[2] != ':') -+ return -1; -+ (*type) = toupper(line[1]); -+ (*sub_type) = toupper(line[3]); -+ break; -+ -+ case -1: -+ return -1; -+ break; -+ } -+ return 0; -+} -+ -+static int get_input_data_format(char *line, struct ps_data_format *pst_format) -+{ -+ unsigned char type, sub_type; -+ int eol_index, sep_index; -+ int i; -+ -+ type = '\0'; -+ sub_type = '\0'; -+ eol_index = -1; -+ sep_index = -1; -+ -+ /* The default values */ -+ set_pst_format(pst_format, PS_TYPE_HEX, TRUE); -+ -+ if (line[0] != '[') { -+ -+ set_pst_format(pst_format, PS_TYPE_HEX, TRUE); -+ return 0; -+ } -+ -+ for (i = 1; i < 5; i++) { -+ if (line[i] == ']') { -+ eol_index = i; -+ break; -+ } -+ } -+ -+ if (get_ps_type(line, eol_index, &type, &sub_type) < 0) -+ return -1; -+ -+ /* By default Hex array type is assumed */ -+ if (type == '\0' && sub_type == '\0') -+ set_pst_format(pst_format, PS_TYPE_HEX, TRUE); -+ -+ /* Check is data type is of array */ -+ if (type == 'A' || sub_type == 'A') -+ pst_format->is_array = TRUE; -+ -+ if (type == 'S' || sub_type == 'S') -+ pst_format->is_array = FALSE; -+ -+ switch (type) { -+ case 'D': -+ case 'B': -+ pst_format->data_type = PS_TYPE_DEC; -+ break; -+ -+ default: -+ pst_format->data_type = PS_TYPE_HEX; -+ break; -+ } -+ -+ line += (eol_index + 1); -+ -+ return 0; -+ -+} -+ -+static unsigned int read_data_in_section(char *line, -+ struct ps_data_format format_info) -+{ -+ char *token_ptr = line; -+ -+ if (token_ptr[0] == '[') { -+ -+ while (token_ptr[0] != ']' && token_ptr[0] != '\0') -+ token_ptr++; -+ -+ if (token_ptr[0] == '\0') -+ return 0x0FFF; -+ -+ token_ptr++; -+ } -+ -+ if (format_info.data_type == PS_TYPE_HEX) { -+ -+ if (format_info.is_array == TRUE) -+ return 0x0FFF; -+ else -+ return strtol(token_ptr, NULL, 16); -+ } else -+ return 0x0FFF; -+ -+ return 0x0FFF; -+} -+static int ath_parse_file(FILE *stream) -+{ -+ char *buffer; -+ char *line; -+ uint8_t tag_cnt; -+ int16_t byte_count; -+ uint32_t pos; -+ int read_count; -+ int num_ps_entry; -+ struct ps_data_format stps_data_format; -+ struct st_read_status read_status = { -+ 0, 0, 0, 0 -+ }; -+ -+ pos = 0; -+ buffer = NULL; -+ tag_cnt = 0; -+ byte_count = 0; -+ -+ if (!stream) { -+ perror("Could not open config file .\n"); -+ return -1; -+ } -+ -+ buffer = malloc(LINE_SIZE_MAX + 1); -+ -+ if (!buffer) -+ return -ENOMEM; -+ -+ do { -+ line = fgets(buffer, LINE_SIZE_MAX, stream); -+ -+ if (!line) -+ break; -+ -+ skip_space(line); -+ -+ if ((line[0] == '/') && (line[1] == '/')) -+ continue; -+ -+ if ((line[0] == '#')) { -+ -+ if (read_status.section != 0) { -+ perror("error\n"); -+ -+ if (buffer != NULL) -+ free(buffer); -+ -+ return -1; -+ -+ } else { -+ read_status.section = 1; -+ continue; -+ } -+ } -+ -+ if ((line[0] == '/') && (line[1] == '*')) { -+ -+ read_status.section = 0; -+ -+ continue; -+ } -+ -+ if (read_status.section == 1) { -+ skip_space(line); -+ -+ if (get_input_data_format( -+ line, &stps_data_format) < 0) { -+ -+ if (buffer != NULL) -+ free(buffer); -+ return -1; -+ } -+ ps_tag_entry[tag_cnt].tag_id = -+ read_data_in_section(line, stps_data_format); -+ read_status.section = 2; -+ -+ } else if (read_status.section == 2) { -+ -+ if (get_input_data_format( -+ line, &stps_data_format) < 0) { -+ -+ if (buffer != NULL) -+ free(buffer); -+ return -1; -+ } -+ -+ byte_count = -+ read_data_in_section(line, stps_data_format); -+ -+ read_status.section = 2; -+ if (byte_count > LINE_SIZE_MAX / 2) { -+ if (buffer != NULL) -+ free(buffer); -+ -+ return -1; -+ } -+ -+ ps_tag_entry[tag_cnt].tag_len = byte_count; -+ ps_tag_entry[tag_cnt].tag_data = (uint8_t *) -+ malloc(byte_count); -+ -+ read_status.section = 3; -+ read_status.line_count = 0; -+ -+ } else if (read_status.section == 3) { -+ -+ if (read_status.line_count == 0) { -+ if (get_input_data_format( -+ line, &stps_data_format) < 0) { -+ if (buffer != NULL) -+ free(buffer); -+ return -1; -+ } -+ } -+ -+ skip_space(line); -+ read_status.char_cnt = 0; -+ -+ if (line[read_status.char_cnt] == '[') { -+ -+ while (line[read_status.char_cnt] != ']' && -+ line[read_status.char_cnt] != '\0') -+ read_status.char_cnt++; -+ -+ if (line[read_status.char_cnt] == ']') -+ read_status.char_cnt++; -+ else -+ read_status.char_cnt = 0; -+ -+ } -+ -+ read_count = (byte_count > BYTES_OF_PS_DATA_PER_LINE) -+ ? BYTES_OF_PS_DATA_PER_LINE : byte_count; -+ -+ if (stps_data_format.data_type == PS_TYPE_HEX && -+ stps_data_format.is_array == TRUE) { -+ -+ while (read_count > 0) { -+ -+ ps_tag_entry[tag_cnt].tag_data -+ [read_status.byte_count] = -+ stringtohex( -+ &line[read_status.char_cnt]); -+ -+ ps_tag_entry[tag_cnt].tag_data -+ [read_status.byte_count + 1] = -+ stringtohex( -+ &line[read_status.char_cnt + 3]); -+ -+ read_status.char_cnt += 6; -+ read_status.byte_count += 2; -+ read_count -= 2; -+ -+ } -+ -+ if (byte_count > BYTES_OF_PS_DATA_PER_LINE) -+ byte_count -= -+ BYTES_OF_PS_DATA_PER_LINE; -+ else -+ byte_count = 0; -+ } -+ -+ read_status.line_count++; -+ -+ if (byte_count == 0) { -+ read_status.section = 0; -+ read_status.char_cnt = 0; -+ read_status.line_count = 0; -+ read_status.byte_count = 0; -+ } else -+ read_status.char_cnt = 0; -+ -+ if ((read_status.section == 0) && -+ (++tag_cnt == RAMPS_MAX_PS_TAGS_PER_FILE)) { -+ if (buffer != NULL) -+ free(buffer); -+ return -1; -+ } -+ -+ } -+ -+ } while (line); -+ -+ num_ps_entry = tag_cnt; -+ -+ if (tag_cnt > RAMPS_MAX_PS_TAGS_PER_FILE) { -+ if (buffer != NULL) -+ free(buffer); -+ return -1; -+ } -+ -+ if (buffer != NULL) -+ free(buffer); -+ -+ return num_ps_entry; -+} -+ -+static int parse_patch_file(FILE *stream) -+{ -+ char byte[3]; -+ char line[MAX_BYTE_LENGTH + 1]; -+ int byte_cnt, byte_cnt_org; -+ int patch_index; -+ int i, k; -+ int data; -+ int patch_count = 0; -+ -+ byte[2] = '\0'; -+ -+ while (fgets(line, MAX_BYTE_LENGTH, stream)) { -+ if (strlen(line) <= 1 || !isxdigit(line[0])) -+ continue; -+ else -+ break; -+ } -+ -+ byte_cnt = strtol(line, NULL, 16); -+ byte_cnt_org = byte_cnt; -+ -+ while (byte_cnt > MAX_BYTE_LENGTH) { -+ -+ /* Handle case when the number of patch buffer is -+ * more than the 20K */ -+ if (MAX_NUM_PATCH_ENTRY == patch_count) { -+ for (i = 0; i < patch_count; i++) -+ free(ram_patch[i].Data); -+ return -ENOMEM; -+ } -+ ram_patch[patch_count].Len = MAX_BYTE_LENGTH; -+ ram_patch[patch_count].Data = -+ (uint8_t *) malloc(MAX_BYTE_LENGTH); -+ -+ if (!ram_patch[patch_count].Data) -+ return -ENOMEM; -+ -+ patch_count++; -+ byte_cnt = byte_cnt - MAX_BYTE_LENGTH; -+ } -+ -+ ram_patch[patch_count].Len = (byte_cnt & 0xFF); -+ -+ if (byte_cnt != 0) { -+ ram_patch[patch_count].Data = (uint8_t *) malloc(byte_cnt); -+ -+ if (!ram_patch[patch_count].Data) -+ return -ENOMEM; -+ patch_count++; -+ } -+ -+ while (byte_cnt_org > MAX_BYTE_LENGTH) { -+ -+ k = 0; -+ for (i = 0; i < MAX_BYTE_LENGTH * 2; i += 2) { -+ if (!fgets(byte, 3, stream)) -+ return -1; -+ data = strtoul(&byte[0], NULL, 16); -+ ram_patch[patch_index].Data[k] = (data & 0xFF); -+ -+ k++; -+ } -+ -+ patch_index++; -+ -+ byte_cnt_org = byte_cnt_org - MAX_BYTE_LENGTH; -+ } -+ -+ if (patch_index == 0) -+ patch_index++; -+ -+ for (k = 0; k < byte_cnt_org; k++) { -+ -+ if (!fgets(byte, 3, stream)) -+ return -1; -+ -+ data = strtoul(byte, NULL, 16); -+ ram_patch[patch_index].Data[k] = (data & 0xFF); -+ } -+ -+ return patch_count; -+} -+ -+static int ath_parse_ps(FILE *stream, int *total_tag_len) -+{ -+ int num_ps_tags; -+ int i; -+ unsigned char bdaddr_present = 0; -+ -+ -+ if (NULL != stream) -+ num_ps_tags = ath_parse_file(stream); -+ -+ if (num_ps_tags < 0) -+ return -1; -+ -+ if (num_ps_tags == 0) -+ *total_tag_len = 10; -+ else { -+ -+ for (i = 0; i < num_ps_tags; i++) { -+ -+ if (ps_tag_entry[i].tag_id == 1) -+ bdaddr_present = 1; -+ if (ps_tag_entry[i].tag_len % 2 == 1) -+ *total_tag_len = *total_tag_len -+ + ps_tag_entry[i].tag_len + 1; -+ else -+ *total_tag_len = -+ *total_tag_len + ps_tag_entry[i].tag_len; -+ -+ } -+ } -+ if (num_ps_tags > 0 && !bdaddr_present) -+ *total_tag_len = *total_tag_len + 10; -+ -+ *total_tag_len = *total_tag_len + 10 + (num_ps_tags * 4); -+ -+ return num_ps_tags; -+} -+ -+static int ath_create_cmd_list(struct ps_cmd_packet **hci_packet_list, -+ uint32_t *num_packets, -+ int tag_count, -+ int patch_count, -+ int total_tag_len) -+{ -+ uint8_t count; -+ uint32_t num_cmd_entry = 0; -+ -+ *num_packets = 0; -+ -+ -+ if (patch_count || tag_count) { -+ -+ /* PS Reset Packet + Patch List + PS List */ -+ num_cmd_entry += (1 + patch_count + tag_count); -+ if (patch_count > 0) -+ num_cmd_entry++; /* Patch Enable Command */ -+ -+ (*hci_packet_list) = -+ malloc(sizeof(struct ps_cmd_packet) * num_cmd_entry); -+ -+ if (!(*hci_packet_list)) -+ return -ENOMEM; -+ -+ if (patch_count > 0) { -+ -+ if (ath_create_ps_command(WRITE_PATCH, patch_count, -+ *hci_packet_list, num_packets) < 0) -+ return -1; -+ if (ath_create_ps_command(ENABLE_PATCH, 0, -+ *hci_packet_list, num_packets) < 0) -+ return -1; -+ -+ } -+ -+ if (ath_create_ps_command(PS_RESET, total_tag_len, -+ *hci_packet_list, num_packets) < 0) -+ return -1; -+ -+ if (tag_count > 0) -+ ath_create_ps_command(PS_WRITE, tag_count, -+ *hci_packet_list, num_packets); -+ } -+ -+ for (count = 0; count < patch_count; count++) -+ free(ram_patch[patch_count].Data); -+ -+ for (count = 0; count < tag_count; count++) -+ free(ps_tag_entry[count].tag_data); -+ -+ return *num_packets; -+} -+ -+static int ath_free_command_list(struct ps_cmd_packet **hci_packet_list, -+ uint32_t num_packets) -+{ -+ int i; -+ -+ if (*hci_packet_list == NULL) -+ return -1; -+ -+ for (i = 0; i < num_packets; i++) -+ free((*hci_packet_list)[i].Hcipacket); -+ -+ free(*hci_packet_list); -+ -+ return 0; -+} -+ -+/* -+ * This API is used to send the HCI command to controller and return -+ * with a HCI Command Complete event. -+ */ -+static int send_hci_cmd_wait_event(int dev, -+ uint8_t *hci_command, -+ int cmd_length, -+ uint8_t **event, uint8_t **buffer_to_free) -+{ -+ int r; -+ uint8_t *hci_event; -+ uint8_t pkt_type = 0x01; -+ -+ if (cmd_length == 0) -+ return -1; -+ -+ if (write(dev, &pkt_type, 1) != 1) -+ return -1; -+ -+ if (write(dev, (unsigned char *)hci_command, cmd_length) != cmd_length) -+ return -1; -+ -+ hci_event = (uint8_t *) malloc(100); -+ -+ if (!hci_event) -+ return -ENOMEM; -+ -+ r = read_hci_event(dev, (unsigned char *)hci_event, 100); -+ -+ if (r > 0) { -+ *event = hci_event; -+ *buffer_to_free = hci_event; -+ } else { -+ -+ /* Did not get an event from controller. return error */ -+ free(hci_event); -+ *buffer_to_free = NULL; -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int read_ps_event(uint8_t *data) -+{ -+ -+ if (data[5] == 0xFC && data[6] == 0x00) { -+ switch (data[4]) { -+ case 0x0B:/* CRC Check */ -+ case 0x0C:/* Change Baudrate */ -+ case 0x04:/* Enable sleep */ -+ return 0; -+ break; -+ default: -+ return -1; -+ break; -+ } -+ } -+ -+ return -1; -+} -+ -+static int get_ps_file_name(int devtype, int rom_version, char *path) -+{ -+ char *filename; -+ int status = 0; -+ -+ if (devtype == 0xdeadc0de) { -+ filename = PS_ASIC_FILE; -+ status = 1; -+ } else { -+ filename = PS_FPGA_FILE; -+ status = 0; -+ } -+ -+ sprintf(path, "%s%x/%s", FW_PATH, rom_version, filename); -+ -+ return status; -+} -+ -+static int get_patch_file_name(int dev_type, int rom_version, -+ int build_version, char *path) -+{ -+ -+ if ((dev_type != 0) && -+ (dev_type != 0xdeadc0de) && -+ (rom_version == 0x99999999) && -+ (build_version == 1)) -+ path[0] = '\0'; -+ else -+ sprintf(path, "%s%x/%s", FW_PATH, rom_version, PATCH_FILE); -+ -+ return 0; -+} -+static int get_ar3k_crc(int dev, int tag_count, int patch_count) -+{ -+ uint8_t hci_cmd[7]; -+ uint8_t *event; -+ uint8_t *buffer_to_free = NULL; -+ int retval = 1; -+ int crc; -+ -+ -+ if (patch_count > 0) -+ crc |= RAM_PATCH_REGION; -+ if (tag_count > 0) -+ crc |= RAM_PS_REGION; -+ -+ load_hci_header(hci_cmd, PS_VERIFY_CRC, 0, crc); -+ -+ if (send_hci_cmd_wait_event(dev, hci_cmd, -+ sizeof(hci_cmd), &event, -+ &buffer_to_free) == 0) { -+ if (read_ps_event(event) == 0) -+ retval = -1; -+ -+ if (buffer_to_free != NULL) -+ free(buffer_to_free); -+ } -+ -+ return retval; -+} -+static int get_device_type(int dev, uint32_t *code) -+{ -+ uint8_t hci_cmd[] = { -+ 0x05, 0xfc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x04 -+ }; -+ uint8_t *event; -+ uint8_t *buffer_to_free = NULL; -+ uint32_t reg; -+ -+ int result = -1; -+ *code = 0; -+ -+ hci_cmd[3] = (uint8_t) (DEV_REGISTER & 0xFF); -+ hci_cmd[4] = (uint8_t) ((DEV_REGISTER >> 8) & 0xFF); -+ hci_cmd[5] = (uint8_t) ((DEV_REGISTER >> 16) & 0xFF); -+ hci_cmd[6] = (uint8_t) ((DEV_REGISTER >> 24) & 0xFF); -+ -+ if (send_hci_cmd_wait_event(dev, hci_cmd, -+ sizeof(hci_cmd), &event, -+ &buffer_to_free) == 0) { -+ if (event[5] == 0xFC && event[6] == 0x00) { -+ -+ switch (event[4]) { -+ case 0x05: -+ reg = event[10]; -+ reg = ((reg << 8) | event[9]); -+ reg = ((reg << 8) | event[8]); -+ reg = ((reg << 8) | event[7]); -+ *code = reg; -+ result = 0; -+ -+ break; -+ -+ case 0x06: -+ break; -+ } -+ } -+ } -+ -+ if (buffer_to_free != NULL) -+ free(buffer_to_free); -+ -+ return result; -+} -+ -+static int read_ar3k_version(int pConfig, int *rom_version, int *build_version) -+{ -+ uint8_t hci_cmd[] = {0x1E, 0xfc, 0x00}; -+ uint8_t *event; -+ uint8_t *buffer_to_free = NULL; -+ int result = -1; -+ -+ if (send_hci_cmd_wait_event(pConfig, -+ hci_cmd, -+ sizeof(hci_cmd), -+ &event, -+ &buffer_to_free) == 0) { -+ if (event[5] == 0xFC && event[6] == 0x00 && event[4] == 0x1E) { -+ (*rom_version) = event[10]; -+ (*rom_version) = (((*rom_version) << 8) | event[9]); -+ (*rom_version) = (((*rom_version) << 8) | event[8]); -+ (*rom_version) = (((*rom_version) << 8) | event[7]); -+ -+ (*build_version) = event[14]; -+ (*build_version) = (((*build_version) << 8) | -+ event[13]); -+ (*build_version) = (((*build_version) << 8) | -+ event[12]); -+ (*build_version) = (((*build_version) << 8) | -+ event[11]); -+ -+ result = 1; -+ -+ } -+ if (buffer_to_free != NULL) -+ free(buffer_to_free); -+ } -+ -+ -+ -+ return result; -+} -+ -+static int str2bdaddr(char *str_bdaddr, char *bdaddr) -+{ -+ char bdbyte[3]; -+ char *str_byte = str_bdaddr; -+ int i, j; -+ unsigned char colon_present = 0; -+ -+ if (strstr(str_bdaddr, ":") != NULL) -+ colon_present = 1; -+ -+ bdbyte[2] = '\0'; -+ -+ for (i = 0, j = 5; i < 6; i++, j--) { -+ -+ bdbyte[0] = str_byte[0]; -+ bdbyte[1] = str_byte[1]; -+ bdaddr[j] = strtol(bdbyte, NULL, 16); -+ -+ if (colon_present == 1) -+ str_byte += 3; -+ else -+ str_byte += 2; -+ } -+ return 0; -+} -+ -+static int write_bdaddr(int pConfig, char *bdaddr) -+{ -+ uint8_t bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01, -+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -+ }; -+ uint8_t *event; -+ uint8_t *buffer_to_free = NULL; -+ int result = -1; -+ -+ str2bdaddr(bdaddr, (char *)&bdaddr_cmd[7]); -+ -+ if (send_hci_cmd_wait_event(pConfig, -+ bdaddr_cmd, -+ sizeof(bdaddr_cmd), -+ &event, -+ &buffer_to_free) == 0) { -+ -+ if (event[5] == 0xFC && event[6] == 0x00) { -+ if (event[4] == 0x0B) -+ result = 0; -+ } -+ -+ } else -+ perror("Write failed\n"); -+ -+ if (buffer_to_free != NULL) -+ free(buffer_to_free); -+ -+ return result; -+} -+ -+int ath_ps_download(int hdev) -+{ -+ int i; -+ int status = 0; -+ int tag_count = 0; -+ int patch_count = 0; -+ int total_tag_len = 0; -+ int rom_version = 0, build_version = 0; -+ -+ struct ps_cmd_packet *hci_cmd_list; /* List storing the commands */ -+ uint32_t num_cmds; -+ uint8_t *event; -+ uint8_t *buffer_to_free; -+ uint32_t dev_type; -+ -+ char patch_file_name[PATH_MAX]; -+ char ps_file_name[PATH_MAX]; -+ char bdaddr_file_name[PATH_MAX]; -+ -+ FILE *stream; -+ char bdaddr[21]; -+ -+ hci_cmd_list = NULL; -+ -+ do { -+ /* -+ * Verfiy firmware version. depending on it select the PS -+ * config file to download. -+ */ -+ if (get_device_type(hdev, &dev_type) == -1) { -+ status = -1; -+ break; -+ } -+ if (read_ar3k_version(hdev, -+ &rom_version, -+ &build_version) == -1) { -+ status = -1; -+ break; -+ } -+ -+ get_ps_file_name(dev_type, rom_version, ps_file_name); -+ -+ get_patch_file_name(dev_type, rom_version, build_version, -+ patch_file_name); -+ -+ /* Read the PS file to a dynamically allocated buffer */ -+ stream = fopen(ps_file_name, "r"); -+ if (stream == NULL) { -+ perror("firmware file open error\n"); -+ status = -1; -+ break; -+ } -+ tag_count = ath_parse_ps(stream, &total_tag_len); -+ -+ fclose(stream); -+ -+ if (tag_count == -1) { -+ status = -1; -+ break; -+ } -+ -+ /* -+ * It is not necessary that Patch file be available, -+ * continue with PS Operations if. -+ * failed. -+ */ -+ if (patch_file_name[0] == '\0') -+ status = 0; -+ stream = fopen(patch_file_name, "r"); -+ if (stream == NULL) -+ status = 0; -+ else { -+ /* parse and store the Patch file contents to -+ * a global variables -+ */ -+ patch_count = parse_patch_file(stream); -+ -+ fclose(stream); -+ -+ if (patch_count < 0) { -+ status = -1; -+ break; -+ } -+ } -+ -+ /* -+ * Send the CRC packet, -+ * Continue with the PS operations -+ * only if the CRC check failed -+ */ -+ if (get_ar3k_crc(hdev, tag_count, patch_count) < 0) { -+ status = 0; -+ break; -+ } -+ -+ /* Create an HCI command list -+ * from the parsed PS and patch information -+ */ -+ ath_create_cmd_list(&hci_cmd_list, -+ &num_cmds, -+ tag_count, -+ patch_count, -+ total_tag_len); -+ -+ for (i = 0; i < num_cmds; i++) { -+ -+ if (send_hci_cmd_wait_event -+ (hdev, hci_cmd_list[i].Hcipacket, -+ hci_cmd_list[i].packetLen, &event, -+ &buffer_to_free) == 0) { -+ -+ if (read_ps_event(event) < 0) { -+ -+ /* Exit if the status is not success */ -+ if (buffer_to_free != NULL) -+ free(buffer_to_free); -+ -+ status = -1; -+ break; -+ } -+ if (buffer_to_free != NULL) -+ free(buffer_to_free); -+ } else { -+ status = 0; -+ break; -+ } -+ } -+ /* Read the PS file to a dynamically allocated buffer */ -+ sprintf(bdaddr_file_name, "%s%x/%s", -+ FW_PATH, -+ rom_version, -+ BDADDR_FILE); -+ -+ stream = fopen(bdaddr_file_name, "r"); -+ -+ if (stream == NULL) { -+ status = 0; -+ break; -+ } -+ -+ if (fgets(bdaddr, 20, stream) != NULL) -+ status = write_bdaddr(hdev, bdaddr); -+ -+ fclose(stream); -+ -+ } while (FALSE); -+ -+ if (hci_cmd_list != NULL) -+ ath_free_command_list(&hci_cmd_list, num_cmds); -+ -+ return status; -+} --- -1.7.0.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-autopair.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-autopair.patch deleted file mode 100644 index e9126a34e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-autopair.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 36358d4a7b3471f5a124a95fec9ed0e4871299e0 Mon Sep 17 00:00:00 2001 -From: Scott James Remnant -Date: Wed, 18 Apr 2012 15:53:55 -0700 -Subject: [PATCH 14/14] autopair: use 0000 as PIN for dumb devices - -Android tries 0000 for a set of audio devices, so follow suit and -do the same even though most audio devices support SSP these days. - -BUG=chromium-os:25211 -TEST=verified with audio devices after 'hciconfig hci0 sspmode 0' ---- - plugins/autopair.c | 26 +++++++++++++++++++++++--- - 1 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/plugins/autopair.c b/plugins/autopair.c -index 05de3ff..5b773c5 100644 ---- a/plugins/autopair.c -+++ b/plugins/autopair.c -@@ -150,10 +150,24 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - } - - switch ((class & 0x1f00) >> 8) { -- case 0x05: -+ case 0x04: // Audio/Video -+ switch ((class & 0xfc) >> 2) { -+ case 0x01: // Wearable Headset Device -+ case 0x02: // Hands-free Device -+ case 0x06: // Headphones -+ case 0x07: // Portable Audio -+ case 0x0a: // HiFi Audio Device -+ if (autopair_attempt(device)) { -+ memcpy(pinbuf, "0000", 4); -+ return 4; -+ } -+ break; -+ } -+ break; -+ case 0x05: // Peripheral - switch ((class & 0xc0) >> 6) { -- case 0x01: -- case 0x03: -+ case 0x01: // Keyboard -+ case 0x03: // Combo keyboard/pointing device - if (autopair_attempt(device)) { - char pinstr[7]; - srand(time(NULL)); -@@ -164,6 +178,12 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - return 6; - } - break; -+ case 0x02: // Pointing device -+ if (autopair_attempt(device)) { -+ memcpy(pinbuf, "0000", 4); -+ return 4; -+ } -+ break; - } - break; - } --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-dbus.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-dbus.patch deleted file mode 100644 index 24b56b75c1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-dbus.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/bluetooth.conf b/src/bluetooth.conf -index 664dbd9..3263112 100644 ---- a/src/bluetooth.conf -+++ b/src/bluetooth.conf -@@ -7,7 +7,11 @@ - - - - -+ -+ -+ -+ - - - -@@ -18,13 +22,7 @@ - - - -- -- -- -- -- -- -+ - - - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-initially-powered.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-initially-powered.patch deleted file mode 100644 index 8526997b55..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-initially-powered.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/main.conf b/src/main.conf -index 321f622..f6784fb 100644 ---- a/src/main.conf -+++ b/src/main.conf -@@ -38,7 +38,7 @@ AutoConnectTimeout = 60 - - # What value should be assumed for the adapter Powered property when - # SetProperty(Powered, ...) hasn't been called yet. Defaults to true --InitiallyPowered = true -+InitiallyPowered = false - - # Remember the previously stored Powered state when initializing adapters - RememberPowered = true diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-plugdev.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-plugdev.patch deleted file mode 100755 index 726838a513..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-plugdev.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf ---- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100 -+++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200 -@@ -17,6 +17,10 @@ - - - -+ -+ -+ -+ - - - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ps3-gamepad.rules b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ps3-gamepad.rules deleted file mode 100644 index 288f086931..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-ps3-gamepad.rules +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Match the PS3 Controller RAW HID device when plugged in via USB, -# place in the bluetooth group so bluetoothd can set pairing information. -SUBSYSTEM=="hidraw", SUBSYSTEMS=="usb", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0268", GROUP="bluetooth", MODE="0660" - -# Match the PS3 Controller RAW HID device when connected via Bluetooth, -# place in the bluetooth group so bluetoothd can update pairing information -# and stop the lights from flashing. -SUBSYSTEM=="hidraw", SUBSYSTEMS=="hid", KERNELS=="*:054C:0268.*", GROUP="bluetooth", MODE="0660" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-sdp-path.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-sdp-path.patch deleted file mode 100644 index 6dac6bf83c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-sdp-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/sdp.h b/lib/sdp.h -index 2fe74d5..e559a5c 100644 ---- a/lib/sdp.h -+++ b/lib/sdp.h -@@ -34,7 +34,7 @@ extern "C" { - #include - #include - --#define SDP_UNIX_PATH "/var/run/sdp" -+#define SDP_UNIX_PATH "/var/run/bluetooth/sdp" - #define SDP_RESPONSE_TIMEOUT 20 - #define SDP_REQ_BUFFER_SIZE 2048 - #define SDP_RSP_BUFFER_SIZE 65535 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-upstart.conf b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-upstart.conf deleted file mode 100644 index b635f9b31a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/bluez-upstart.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description "Start the bluetooth daemon" -author "chromium-os-dev@chromium.org" - -start on starting system-services -stop on stopping system-services - -env BLUETOOTH_LIBDIR=/var/lib/bluetooth -env BLUETOOTH_RUNDIR=/var/run/bluetooth - -pre-start script - mkdir -p -m 0750 ${BLUETOOTH_LIBDIR} ${BLUETOOTH_RUNDIR} - chown -R bluetooth:bluetooth ${BLUETOOTH_LIBDIR} ${BLUETOOTH_RUNDIR} -end script - -respawn - -script - ulimit -l unlimited - exec /sbin/minijail0 -u bluetooth -g bluetooth \ - -c 3500 -- \ - /usr/sbin/bluetoothd --nodetach -end script diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-conf.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-conf.d deleted file mode 100644 index d87acdb282..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Bind rfcomm devices (allowed values are "true" and "false") -RFCOMM_ENABLE=true - -# Config file for rfcomm -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-init.d b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-init.d deleted file mode 100644 index d3b819e1ab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/files/rfcomm-init.d +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.1 2011/12/31 21:09:18 pacho Exp $ - -depend() { - after coldplug - need dbus localmount hostname -} - -start() { - if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then - if [ -f "${RFCOMM_CONFIG}" ]; then - ebegin "Starting rfcomm" - /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all - eend $? - else - ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists" - fi - fi -} - -stop() { - ebegin "Shutting down rfcomm" - /usr/bin/rfcomm release all - eend $? -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/metadata.xml deleted file mode 100644 index a9fb95ffdb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/bluez/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - mobile - pda - - dev-zero@gentoo.org - - - betelgeuse@gentoo.org - - - pacho@gentoo.org - - Taking care of this until Petteri and Tiziano have - enough time for maintaing bluez. - - - - Use sys-auth/pambase[consolekit] to - determine access to bluetooth devices based on whether a user is - logged in locally or remotely - Install old daemons like hidd and sdpd that are - deprecated by the new Service framework - Install tools for testing of - various Bluetooth functions - - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/Manifest deleted file mode 100644 index b1fb4e18dc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST crda-1.1.1.tar.bz2 21666 RMD160 035e381f6276dacd06afc05fbfefdbbf7e768091 SHA1 73643b3f49b34c4150df4abb793a36792cc68fb7 SHA256 59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/crda-1.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/crda-1.1.1.ebuild deleted file mode 100644 index 70468d83f8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/crda-1.1.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.1.ebuild,v 1.1 2010/01/26 17:02:57 chainsaw Exp $ - -EAPI="2" - -inherit toolchain-funcs multilib - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks." -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" -IUSE="" -RDEPEND="dev-libs/libgcrypt - dev-libs/libnl:0 - net-wireless/wireless-regdb" -DEPEND="${RDEPEND} - dev-python/m2crypto" - -src_prepare() { - ##Make sure we install the rules where udev rules go... - sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || \ - die "Makefile sed failed" - - # install version that also handles "add" events - cp -f "${FILESDIR}"/regulatory.rules "${S}"/udev || \ - die "Failed to install new regulatory.rules" - - # Make sure we hit the correct pkg-config wrapper - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - "${S}"/Makefile || die -} - -src_compile() { - # - # NB: crda assumes regdbdump built for the target can run on - # the build host which doesn't work; use all_noverify as - # a WAR - emake CC="$(tc-getCC)" all_noverify || die "Compilation failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/files/regulatory.rules b/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/files/regulatory.rules deleted file mode 100644 index fa4d756e0a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/crda/files/regulatory.rules +++ /dev/null @@ -1,5 +0,0 @@ -# Runs CRDA for kernel wireless regulatory events. -# For more information see: -# http://wireless.kernel.org/en/developers/Regulatory/CRDA - -KERNEL=="regulatory*", ACTION=="add|change", SUBSYSTEM=="platform", RUN+="/sbin/crda" diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-0.0.1-r25.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-0.0.1-r25.ebuild deleted file mode 100644 index ea7aa46ac5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-0.0.1-r25.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_COMMIT="24b2d89de0aa91ba968ead7bcb92450280255806" -CROS_WORKON_TREE="3dc85a711e8560caa66ff457623c985d8256abe2" -CROS_WORKON_PROJECT="chromiumos/third_party/gdmwimax" - -inherit cros-workon - -DESCRIPTION="GCT GDM7205 WiMAX SDK" -HOMEPAGE="http://www.gctsemi.com/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -src_prepare() { - # Create build configuration file. - cat > .config <<-EOF - CONFIG_DM_INTERFACE=y - CONFIG_DM_NET_DEVICE=eth0 - CONFIG_LOG_FILE_BUF_SIZE=0x80000 - CONFIG_ENABLE_BW_SWITCHING_FOR_KT=n - CONFIG_ENABLE_SERVICE_FLOW=n - CONFIG_WIMAX2=n - EOF -} - -src_compile() { - # Do not fortify source. See crosbug.com/p/10133 for details. - append-flags -U_FORTIFY_SOURCE - tc-export AR CC - emake -C sdk - emake -C cm -} - -src_install() { - # Install SDK library. - dolib sdk/libgdmwimax.a - - # Install SDK headers. - insinto /usr/include/gct - doins sdk/{gctapi.h,gcttype.h,WiMaxType.h} - - # Install connection manager executable and configuration file. - exeinto /opt/gct - doexe cm/cm - insinto /opt/gct - doins cm/cm.conf - - # Install firmware. - insinto /lib/firmware/gdm72xx - doins firmware/gdmuimg.bin -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-9999.ebuild deleted file mode 100644 index 488042ea81..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/gdmwimax/gdmwimax-9999.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_PROJECT="chromiumos/third_party/gdmwimax" - -inherit cros-workon - -DESCRIPTION="GCT GDM7205 WiMAX SDK" -HOMEPAGE="http://www.gctsemi.com/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -src_prepare() { - # Create build configuration file. - cat > .config <<-EOF - CONFIG_DM_INTERFACE=y - CONFIG_DM_NET_DEVICE=eth0 - CONFIG_LOG_FILE_BUF_SIZE=0x80000 - CONFIG_ENABLE_BW_SWITCHING_FOR_KT=n - CONFIG_ENABLE_SERVICE_FLOW=n - CONFIG_WIMAX2=n - EOF -} - -src_compile() { - # Do not fortify source. See crosbug.com/p/10133 for details. - append-flags -U_FORTIFY_SOURCE - tc-export AR CC - emake -C sdk - emake -C cm -} - -src_install() { - # Install SDK library. - dolib sdk/libgdmwimax.a - - # Install SDK headers. - insinto /usr/include/gct - doins sdk/{gctapi.h,gcttype.h,WiMaxType.h} - - # Install connection manager executable and configuration file. - exeinto /opt/gct - doexe cm/cm - insinto /opt/gct - doins cm/cm.conf - - # Install firmware. - insinto /lib/firmware/gdm72xx - doins firmware/gdmuimg.bin -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-0.7.2-r51.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-0.7.2-r51.ebuild deleted file mode 100644 index 12de66916d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-0.7.2-r51.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.7.1.ebuild,v 1.1 2010/01/24 20:49:34 gurligebis Exp $ - -EAPI="2" -CROS_WORKON_COMMIT="728b68f811a2b0b12ea57c2e5386bee7e36f0bf9" -CROS_WORKON_TREE="6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5" -CROS_WORKON_PROJECT="chromiumos/third_party/hostap" -CROS_WORKON_LOCALNAME="wpa_supplicant" - -inherit toolchain-funcs eutils cros-workon - -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" -HOMEPAGE="http://hostap.epitest.fi" -#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" - -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="ipv6 logwatch madwifi +ssl +wps" - -DEPEND="ssl? ( dev-libs/openssl ) - dev-libs/libnl:0 - madwifi? ( || - ( >net-wireless/madwifi-ng-tools-0.9.3 - net-wireless/madwifi-old ) )" -RDEPEND="${DEPEND}" - -MY_S="${WORKDIR}/${P}/hostapd" - -src_prepare() { - cd ${MY_S} - sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ - "${MY_S}/hostapd.conf" -} - -src_configure() { - local CONFIG="${MY_S}/.config" - - # toolchain setup - echo "CC = $(tc-getCC)" > ${CONFIG} - - # EAP authentication methods - echo "CONFIG_EAP=y" >> ${CONFIG} - echo "CONFIG_EAP_MD5=y" >> ${CONFIG} - - if use ssl; then - # SSL authentication methods - echo "CONFIG_EAP_TLS=y" >> ${CONFIG} - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} - fi - - if use wps; then - # Enable Wi-Fi Protected Setup - echo "CONFIG_WPS=y" >> ${CONFIG} - echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} - einfo "Enabling Wi-Fi Protected Setup support" - fi - - echo "CONFIG_EAP_GTC=y" >> ${CONFIG} - echo "CONFIG_EAP_SIM=y" >> ${CONFIG} - echo "CONFIG_EAP_AKA=y" >> ${CONFIG} - echo "CONFIG_EAP_PAX=y" >> ${CONFIG} - echo "CONFIG_EAP_PSK=y" >> ${CONFIG} - echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} - echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} - echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} - echo "CONFIG_IEEE80211W=y" >> ${CONFIG} - - einfo "Enabling drivers: " - - if use madwifi; then - # Add include path for madwifi-driver headers - einfo " Madwifi driver enabled" - echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG} - echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG} - else - einfo " Madwifi driver disabled" - fi - - einfo " nl80211 driver enabled" - echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} - - # misc - echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} - echo "CONFIG_IEEE80211N=y" >> ${CONFIG} - - if use ipv6; then - # IPv6 support - echo "CONFIG_IPV6=y" >> ${CONFIG} - fi - - echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} - echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} - - # TODO: Add support for BSD drivers - - default_src_configure -} - -src_compile() { - default_src_compile - - emake -C hostapd || die "emake failed" - - if use ssl; then - cd ${MY_S} - emake nt_password_hash || die "emake nt_password_hash failed" - emake hlr_auc_gw || die "emake hlr_auc_gw failed" - fi -} - -src_install() { - cd ${MY_S} - dosbin hostapd - dobin hostapd_cli - - use ssl && dobin nt_password_hash - use ssl && dobin hlr_auc_gw - - doman hostapd.8 hostapd_cli.1 - - dodoc ChangeLog README - if use wps; then - dodoc README-WPS - fi - - docinto examples - dodoc wired.conf - - if use logwatch; then - insinto /etc/log.d/conf/services/ - doins logwatch/hostapd.conf - - exeinto /etc/log.d/scripts/services/ - doexe logwatch/hostapd - fi -} - -pkg_postinst() { - einfo - einfo "In order to use ${PN} you need to set up your wireless card" - einfo "for master mode in /etc/conf.d/net and then start" - einfo "/etc/init.d/hostapd." - einfo - einfo "Example configuration:" - einfo - einfo "config_wlan0=( \"192.168.1.1/24\" )" - einfo "channel_wlan0=\"6\"" - einfo "essid_wlan0=\"test\"" - einfo "mode_wlan0=\"master\"" - einfo - if use madwifi; then - einfo "This package compiles against the headers installed by" - einfo "madwifi-old, madwifi-ng or madwifi-ng-tools." - einfo "You should remerge ${PN} after upgrading these packages." - einfo - einfo "Since you are using the madwifi-ng driver, you should disable or" - einfo "comment out wme_enabled from hostapd.conf, since it will" - einfo "cause problems otherwise (see bug #260377" - fi - #if [ -e "${KV_DIR}"/net/mac80211 ]; then - # einfo "This package now compiles against the headers installed by" - # einfo "the kernel source for the mac80211 driver. You should " - # einfo "re-emerge ${PN} after upgrading your kernel source." - #fi - - if use wps; then - einfo "You have enabled Wi-Fi Protected Setup support, please" - einfo "read the README-WPS file in /usr/share/doc/${P}" - einfo "for info on how to use WPS" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-9999.ebuild deleted file mode 100644 index d466ba7874..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/hostapd/hostapd-9999.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.7.1.ebuild,v 1.1 2010/01/24 20:49:34 gurligebis Exp $ - -EAPI="2" -CROS_WORKON_PROJECT="chromiumos/third_party/hostap" -CROS_WORKON_LOCALNAME="wpa_supplicant" - -inherit toolchain-funcs eutils cros-workon - -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" -HOMEPAGE="http://hostap.epitest.fi" -#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" - -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="ipv6 logwatch madwifi +ssl +wps" - -DEPEND="ssl? ( dev-libs/openssl ) - dev-libs/libnl:0 - madwifi? ( || - ( >net-wireless/madwifi-ng-tools-0.9.3 - net-wireless/madwifi-old ) )" -RDEPEND="${DEPEND}" - -MY_S="${WORKDIR}/${P}/hostapd" - -src_prepare() { - cd ${MY_S} - sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ - "${MY_S}/hostapd.conf" -} - -src_configure() { - local CONFIG="${MY_S}/.config" - - # toolchain setup - echo "CC = $(tc-getCC)" > ${CONFIG} - - # EAP authentication methods - echo "CONFIG_EAP=y" >> ${CONFIG} - echo "CONFIG_EAP_MD5=y" >> ${CONFIG} - - if use ssl; then - # SSL authentication methods - echo "CONFIG_EAP_TLS=y" >> ${CONFIG} - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} - fi - - if use wps; then - # Enable Wi-Fi Protected Setup - echo "CONFIG_WPS=y" >> ${CONFIG} - echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} - einfo "Enabling Wi-Fi Protected Setup support" - fi - - echo "CONFIG_EAP_GTC=y" >> ${CONFIG} - echo "CONFIG_EAP_SIM=y" >> ${CONFIG} - echo "CONFIG_EAP_AKA=y" >> ${CONFIG} - echo "CONFIG_EAP_PAX=y" >> ${CONFIG} - echo "CONFIG_EAP_PSK=y" >> ${CONFIG} - echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} - echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} - echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} - echo "CONFIG_IEEE80211W=y" >> ${CONFIG} - - einfo "Enabling drivers: " - - if use madwifi; then - # Add include path for madwifi-driver headers - einfo " Madwifi driver enabled" - echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG} - echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG} - else - einfo " Madwifi driver disabled" - fi - - einfo " nl80211 driver enabled" - echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} - - # misc - echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} - echo "CONFIG_IEEE80211N=y" >> ${CONFIG} - - if use ipv6; then - # IPv6 support - echo "CONFIG_IPV6=y" >> ${CONFIG} - fi - - echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} - echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} - - # TODO: Add support for BSD drivers - - default_src_configure -} - -src_compile() { - default_src_compile - - emake -C hostapd || die "emake failed" - - if use ssl; then - cd ${MY_S} - emake nt_password_hash || die "emake nt_password_hash failed" - emake hlr_auc_gw || die "emake hlr_auc_gw failed" - fi -} - -src_install() { - cd ${MY_S} - dosbin hostapd - dobin hostapd_cli - - use ssl && dobin nt_password_hash - use ssl && dobin hlr_auc_gw - - doman hostapd.8 hostapd_cli.1 - - dodoc ChangeLog README - if use wps; then - dodoc README-WPS - fi - - docinto examples - dodoc wired.conf - - if use logwatch; then - insinto /etc/log.d/conf/services/ - doins logwatch/hostapd.conf - - exeinto /etc/log.d/scripts/services/ - doexe logwatch/hostapd - fi -} - -pkg_postinst() { - einfo - einfo "In order to use ${PN} you need to set up your wireless card" - einfo "for master mode in /etc/conf.d/net and then start" - einfo "/etc/init.d/hostapd." - einfo - einfo "Example configuration:" - einfo - einfo "config_wlan0=( \"192.168.1.1/24\" )" - einfo "channel_wlan0=\"6\"" - einfo "essid_wlan0=\"test\"" - einfo "mode_wlan0=\"master\"" - einfo - if use madwifi; then - einfo "This package compiles against the headers installed by" - einfo "madwifi-old, madwifi-ng or madwifi-ng-tools." - einfo "You should remerge ${PN} after upgrading these packages." - einfo - einfo "Since you are using the madwifi-ng driver, you should disable or" - einfo "comment out wme_enabled from hostapd.conf, since it will" - einfo "cause problems otherwise (see bug #260377" - fi - #if [ -e "${KV_DIR}"/net/mac80211 ]; then - # einfo "This package now compiles against the headers installed by" - # einfo "the kernel source for the mac80211 driver. You should " - # einfo "re-emerge ${PN} after upgrading your kernel source." - #fi - - if use wps; then - einfo "You have enabled Wi-Fi Protected Setup support, please" - einfo "read the README-WPS file in /usr/share/doc/${P}" - einfo "for info on how to use WPS" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/Manifest deleted file mode 100644 index 93889c843a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST iw-0.9.22.tar.bz2 50526 SHA256 138ce4dc827d8b0af55fe1c444e749b985c1540d791b27922aad880d12908bb1 -DIST iw-3.0.tar.bz2 56543 SHA256 a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb SHA512 19310785594ad79dd8419f2d2a78e72dd096d15b5535481f555b1b7004a80c5d0d005f0b4cfc2d7fdb27f73fe8936c999804b3da7189349ba7db0def7f0d3f9b WHIRLPOOL fefd12cb1e5d72a1becc0c4cfcdf40b7045bc2ef1925fe1ffe116c6a8161493614c853db6446f68fb47e9963fae0f61767433c93badae4b003a548b840b62555 -DIST iw-3.1.tar.bz2 57450 SHA256 24e69f2596827669b2f47f033bd502c003e6f1ff58ccbeeb1cff9cdc56ae828a SHA512 90bedc78af6be85b0e1f97feb092a47a4f4be40ecb3bcd0bdd2c71c0094345ee71a74c65bb953c2cf11d3112a5c3663bd05cf6563b07bad75330bd8b7f9cee8e WHIRLPOOL f3c169d3e42496d7d286b2768f4c9ea4b2148d6b37441e8f83f195fbfae989f4d7996665a15a9d427efbcaa31dd6a69a6c0fde94e7ae769e55923f9a447a5f0d -DIST iw-3.6.tar.bz2 65762 SHA256 df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857 SHA512 8436e51cb6b963e393ea147845fa004c99934d245f8af3c3f43b5e72b684191359c565f70be6a9e7f23e0780e90e9c5f6b952ef05deff5a0c50aec8bb0dad483 WHIRLPOOL e2d8500b0938d19ed5aadc1802a7fa7931874c62c9f244363d4b4c2a8c0cde04083bddaee3665e519f3ac803fa647e9d806fecd862a64d34ce76a81c30758a9e diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-beacon-loss.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-beacon-loss.patch deleted file mode 100644 index a9ab24ba23..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-beacon-loss.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ur iw-3.1-orig/nl80211.h iw-3.1/nl80211.h ---- iw-3.1-orig/nl80211.h 2012-01-05 14:11:08.008100900 -0800 -+++ iw-3.1/nl80211.h 2012-01-05 14:22:20.009073676 -0800 -@@ -1437,6 +1437,8 @@ - * @NL80211_STA_INFO_BSS_PARAM: current station's view of BSS, nested attribute - * containing info as possible, see &enum nl80211_sta_bss_param - * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected -+ * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update. -+ * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32) - * @__NL80211_STA_INFO_AFTER_LAST: internal - * @NL80211_STA_INFO_MAX: highest possible station info attribute - */ -@@ -1458,6 +1460,8 @@ - NL80211_STA_INFO_RX_BITRATE, - NL80211_STA_INFO_BSS_PARAM, - NL80211_STA_INFO_CONNECTED_TIME, -+ NL80211_STA_INFO_STA_FLAGS, -+ NL80211_STA_INFO_BEACON_LOSS, - - /* keep last */ - __NL80211_STA_INFO_AFTER_LAST, -diff -ur iw-3.1-orig/station.c iw-3.1/station.c ---- iw-3.1-orig/station.c 2011-09-05 03:21:59.000000000 -0700 -+++ iw-3.1/station.c 2012-01-05 14:13:18.030228076 -0800 -@@ -50,6 +50,8 @@ - [NL80211_STA_INFO_PLINK_STATE] = { .type = NLA_U8 }, - [NL80211_STA_INFO_TX_RETRIES] = { .type = NLA_U32 }, - [NL80211_STA_INFO_TX_FAILED] = { .type = NLA_U32 }, -+ [NL80211_STA_INFO_CONNECTED_TIME] = { .type = NLA_U32 }, -+ [NL80211_STA_INFO_BEACON_LOSS] = { .type = NLA_U32 }, - }; - - static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { -@@ -83,6 +85,9 @@ - if_indextoname(nla_get_u32(tb[NL80211_ATTR_IFINDEX]), dev); - printf("Station %s (on %s)", mac_addr, dev); - -+ if (sinfo[NL80211_STA_INFO_CONNECTED_TIME]) -+ printf("\n\tconnected time:\t%u", -+ nla_get_u32(sinfo[NL80211_STA_INFO_CONNECTED_TIME])); - if (sinfo[NL80211_STA_INFO_INACTIVE_TIME]) - printf("\n\tinactive time:\t%u ms", - nla_get_u32(sinfo[NL80211_STA_INFO_INACTIVE_TIME])); -@@ -104,6 +109,9 @@ - if (sinfo[NL80211_STA_INFO_TX_FAILED]) - printf("\n\ttx failed:\t%u", - nla_get_u32(sinfo[NL80211_STA_INFO_TX_FAILED])); -+ if (sinfo[NL80211_STA_INFO_BEACON_LOSS]) -+ printf("\n\tbeacon loss:\t%u", -+ nla_get_u32(sinfo[NL80211_STA_INFO_BEACON_LOSS])); - if (sinfo[NL80211_STA_INFO_SIGNAL]) - printf("\n\tsignal: \t%d dBm", - (int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL])); diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-nl80211.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-nl80211.patch deleted file mode 100644 index 514039e8cb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.1-nl80211.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -u iw-3.1.orig/nl80211.h iw-3.1/nl80211.h ---- iw-3.1.orig/nl80211.h 2011-10-19 16:37:30.000000000 -0700 -+++ iw-3.1/nl80211.h 2011-10-19 16:40:08.000000000 -0700 -@@ -1201,6 +1201,8 @@ - NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX, - NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX, - -+ NL80211_ATTR_SCAN_FLAGS, -+ - NL80211_ATTR_SUPPORT_MESH_AUTH, - NL80211_ATTR_STA_PLINK_STATE, - -@@ -1212,6 +1214,15 @@ - NL80211_ATTR_INTERFACE_COMBINATIONS, - NL80211_ATTR_SOFTWARE_IFTYPES, - -+ NL80211_ATTR_HIDDEN_SSID, -+ -+ NL80211_ATTR_IE_PROBE_RESP, -+ NL80211_ATTR_IE_ASSOC_RESP, -+ -+ NL80211_ATTR_ROAM_SUPPORT, -+ -+ NL80211_ATTR_PMKSA_CANDIDATE, -+ - NL80211_ATTR_REKEY_DATA, - - NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS, diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-nl80211.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-nl80211.patch deleted file mode 100644 index b6f1531e36..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-nl80211.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru iw-3.6.org//nl80211.h iw-3.6/nl80211.h ---- iw-3.6.org//nl80211.h 2012-09-24 10:48:35.589737190 -0700 -+++ iw-3.6/nl80211.h 2012-09-24 10:48:57.519902011 -0700 -@@ -1438,6 +1438,8 @@ - NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX, - NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX, - -+ NL80211_ATTR_SCAN_FLAGS, -+ - NL80211_ATTR_SUPPORT_MESH_AUTH, - NL80211_ATTR_STA_PLINK_STATE, - diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-scan.patch b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-scan.patch deleted file mode 100644 index 0e455d375e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/files/iw-3.6-scan.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -u iw-3.6.orig//nl80211.h iw-3.6/nl80211.h ---- iw-3.6.orig//nl80211.h 2012-09-24 11:20:29.524118445 -0700 -+++ iw-3.6/nl80211.h 2012-09-24 11:20:38.254184112 -0700 -@@ -3025,4 +3025,18 @@ - NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U = 1<<3, - }; - -+/** -+ * enum nl80211_scan_flags - scan request control flags -+ * -+ * Scan request control flags are used to control the handling -+ * of NL80211_CMD_TRIGGER_SCAN, requests. -+ * -+ * @NL80211_SCAN_FLAG_TX_ABORT: abort scan if tx collides -+ * @NL80211_SCAN_FLAG_FLUSH: flush bss cache before scan -+ */ -+enum nl80211_scan_flags { -+ NL80211_SCAN_FLAG_TX_ABORT = 1<<0, -+ NL80211_SCAN_FLAG_FLUSH = 1<<1, -+}; -+ - #endif /* __LINUX_NL80211_H */ -diff -u iw-3.6.orig//scan.c iw-3.6/scan.c ---- iw-3.6.orig//scan.c 2012-09-24 11:20:29.524118445 -0700 -+++ iw-3.6/scan.c 2012-09-24 11:20:34.704157409 -0700 -@@ -73,6 +73,7 @@ - bool passive = false, have_ssids = false, have_freqs = false; - size_t tmp; - unsigned char *ies; -+ int flags = 0; - - ssids = nlmsg_alloc(); - if (!ssids) -@@ -102,6 +103,14 @@ - parse = DONE; - passive = true; - break; -+ } else if (strcmp(argv[i], "txabort") == 0) { -+ parse = DONE; -+ flags |= NL80211_SCAN_FLAG_TX_ABORT; -+ break; -+ } else if (strcmp(argv[i], "flush") == 0) { -+ parse = DONE; -+ flags |= NL80211_SCAN_FLAG_FLUSH; -+ break; - } - case DONE: - return 1; -@@ -136,6 +145,8 @@ - - if (have_freqs) - nla_put_nested(msg, NL80211_ATTR_SCAN_FREQUENCIES, freqs); -+ if (flags) -+ NLA_PUT_U32(msg, NL80211_ATTR_SCAN_FLAGS, flags); - - err = 0; - nla_put_failure: -@@ -1287,14 +1298,11 @@ - }; - int trig_argc, dump_argc, err; - -- if (argc >= 3 && !strcmp(argv[2], "-u")) { -- dump_argc = 4; -- dump_argv[3] = "-u"; -- } else if (argc >= 3 && !strcmp(argv[2], "-b")) { -- dump_argc = 4; -- dump_argv[3] = "-b"; -- } else -- dump_argc = 3; -+ dump_argc = 3; -+ if (argc >= 3 && !strcmp(argv[2], "-u")) -+ dump_argv[dump_argc++] = "-u"; -+ else if (argc >= 3 && !strcmp(argv[2], "-b")) -+ dump_argv[dump_argc++] = "-b"; - - trig_argc = 3 + (argc - 2) + (3 - dump_argc); - trig_argv = calloc(trig_argc, sizeof(*trig_argv)); -@@ -1344,7 +1352,7 @@ - dump_argv[0] = argv[0]; - return handle_cmd(state, id, dump_argc, dump_argv); - } --TOPLEVEL(scan, "[-u] [freq *] [ies ] [ssid *|passive]", 0, 0, -+TOPLEVEL(scan, "[-u] [freq *] [ies ] [ssid *|passive|txabort|flush]", 0, 0, - CIB_NETDEV, handle_scan_combined, - "Scan on the given frequencies and probe for the given SSIDs\n" - "(or wildcard if not given) unless passive scanning is requested.\n" -@@ -1354,7 +1362,8 @@ - NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump, - "Dump the current scan results. If -u is specified, print unknown\n" - "data in scan results."); --COMMAND(scan, trigger, "[freq *] [ies ] [ssid *|passive]", -+COMMAND(scan, trigger, "[freq *] [ies ] [ssid *|passive|txabort|flush]", - NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan, - "Trigger a scan on the given frequencies with probing for the given\n" -+ - "SSIDs (or wildcard if not given) unless passive scanning is requested."); diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-0.9.22.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-0.9.22.ebuild deleted file mode 100644 index e7f0130028..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-0.9.22.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-0.9.17.ebuild,v 1.5 2010/02/23 18:53:43 armin76 Exp $ - -inherit toolchain-funcs - -DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" -HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" -SRC_URI="http://wireless.kernel.org/download/${PN}/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=dev-libs/libnl-1.1" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -CC=$(tc-getCC) -LD=$(tc-getLD) - -src_install() { - emake install DESTDIR="${D}" || die "Failed to install" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.0.ebuild deleted file mode 100644 index e7f0130028..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-0.9.17.ebuild,v 1.5 2010/02/23 18:53:43 armin76 Exp $ - -inherit toolchain-funcs - -DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" -HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" -SRC_URI="http://wireless.kernel.org/download/${PN}/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=dev-libs/libnl-1.1" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -CC=$(tc-getCC) -LD=$(tc-getLD) - -src_install() { - emake install DESTDIR="${D}" || die "Failed to install" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1-r1.ebuild deleted file mode 120000 index 135f7a4409..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -iw-3.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1.ebuild deleted file mode 100644 index 45aa9af516..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.1.ebuild,v 1.3 2011/10/27 16:03:02 jer Exp $ - -EAPI="2" - -inherit toolchain-funcs eutils - -DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" -HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" -SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=dev-libs/libnl-1.1" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${P}-nl80211.patch" - epatch "${FILESDIR}/${P}-beacon-loss.patch" - tc-export CC LD -} - -src_install() { - emake install DESTDIR="${D}" || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6-r1.ebuild deleted file mode 120000 index d2dcd633bb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -iw-3.6.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6.ebuild deleted file mode 100644 index 657bb41c37..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iw/iw-3.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.1.ebuild,v 1.3 2011/10/27 16:03:02 jer Exp $ - -EAPI="2" - -inherit toolchain-funcs eutils - -DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack" -HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw" -SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=dev-libs/libnl-1.1" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${P}-nl80211.patch" - epatch "${FILESDIR}/${P}-scan.patch" - tc-export CC LD -} - -src_install() { - emake install DESTDIR="${D}" || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/Manifest deleted file mode 100644 index ff716c5558..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iwlwifi-2000-ucode-18.168.6.1.tgz 341558 SHA256 35739afcbfbc6ad7e4e17068230f548a43717f6445063441c430845f2944a92b SHA512 6f629b70afd3d5b01532339da63daea0442c69dfe402b463b8b361269920dae9c00b04861f61719f819785b2f4e05502ecb95f5878ac705bc13ef8c861514fa6 WHIRLPOOL fb1bd33c25116dc1e745c334b349f50ec978960972084e7337d6ec9edb738db0e00a5cb033c66d32ad22031cf86c1788200c7b602743163835a890cc52d21535 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/iwl2000-ucode-18.168.6.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/iwl2000-ucode-18.168.6.1.ebuild deleted file mode 100644 index e50908a796..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl2000-ucode/iwl2000-ucode-18.168.6.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -MY_PN="iwlwifi-2000-ucode" - -DESCRIPTION="Intel (R) Centrino Wireless-N 2200 ucode" -HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" -SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" - -LICENSE="ipw3945" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" - -DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /lib/firmware - doins "${S}/iwlwifi-2000-6.ucode" || die - - dodoc README* || die "dodoc failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/Manifest deleted file mode 100644 index 03fb6e067f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iwlwifi-3945-ucode-15.32.2.9.tgz 66635 RMD160 1caf86f5c6dc7ba3f40a86faef95c82dbeab9837 SHA1 0e53846a25b9ec5f6f56559f6cc0778227e5564c SHA256 536206a1f7881ab63cc38180af0dc05186e0588449b2f603415873bae8014e2d diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/iwl3945-ucode-15.32.2.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/iwl3945-ucode-15.32.2.9-r1.ebuild deleted file mode 100644 index 028e806944..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl3945-ucode/iwl3945-ucode-15.32.2.9-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ - -MY_PN="iwlwifi-3945-ucode" - -DESCRIPTION="Intel (R) PRO/Wireless 3945ABG/BG Network Connection" -HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" -SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" - -LICENSE="ipw3945" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" - -DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /lib/firmware - doins "${S}/iwlwifi-3945-2.ucode" || die - - dodoc README* || die "dodoc failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/Manifest deleted file mode 100644 index 33778fd7cb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iwlwifi-4965-ucode-228.61.2.24.tgz 81309 RMD160 df063ef6cd017f26ca71d8d169a09a52a2e1e1a0 SHA1 1d67aabf37a8693cb57a2559597e4674e08823b9 SHA256 b550e12dbbbba0601a306eb5bf287c703b1a32a61782fc08076483c8d870aad8 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/iwl4965-ucode-228.61.2.24-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/iwl4965-ucode-228.61.2.24-r1.ebuild deleted file mode 100644 index c8a63b07c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl4965-ucode/iwl4965-ucode-228.61.2.24-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ - -MY_PN="iwlwifi-4965-ucode" - -DESCRIPTION="Intel (R) Wireless WiFi 4965AGN ucode" -HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" -SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" - -LICENSE="ipw3945" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" - -DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /lib/firmware - doins "${S}/iwlwifi-4965-2.ucode" || die - - dodoc README* || die "dodoc failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/Manifest deleted file mode 100644 index 8a4dffc78d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iwlwifi-6000-ucode-9.221.4.1.tgz 216806 RMD160 7d5dd5d7366bd46141d80e63d8e7f1a468e8afbf SHA1 a888cf54974702594e82bcbfca20c26d8f906e9f SHA256 7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1-r1.ebuild deleted file mode 100644 index 0ed739fe1a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ - -MY_PN="iwlwifi-6000-ucode" - -DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" -HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" -SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" - -LICENSE="ipw3945" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" - -DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /lib/firmware - doins "${S}/iwlwifi-6000-4.ucode" || die - - dodoc README* || die "dodoc failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/Manifest deleted file mode 100644 index 6496c5c279..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iwlwifi-6000g2a-ucode-17.168.5.2.tgz 210543 SHA256 6c6f10f876ae59695a089dc57658a3261b10dea36737e3d188a74998b7c5dceb SHA512 f9570204ff44621b99bfd54e704df9f37ca63ec8762cc2d352ca39da065bb2ad9d1c142b5172b08586bc407d50b0da655cbc7b30a6d3f07dd6411787a37ac485 WHIRLPOOL 7d3e8885148cac34e7bdbe82411dd78273d545604e047fcdc6eb72ba5627cd56bc214be00e707e0b0bd23c0ee8577e544d562e53a2ab569aaf6407171c1d6154 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/iwl6005-ucode-17.168.5.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/iwl6005-ucode-17.168.5.2-r1.ebuild deleted file mode 100644 index 5e323d1b9f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6005-ucode/iwl6005-ucode-17.168.5.2-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ - -MY_PN="iwlwifi-6000g2a-ucode" - -DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" -HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" -SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" - -LICENSE="ipw3945" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" - -DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /lib/firmware - doins "${S}/iwlwifi-6000g2a-5.ucode" || die - - dodoc README* || die "dodoc failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/Manifest deleted file mode 100644 index ade4090839..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iwlwifi-6000g2b-ucode-18.168.6.1.tgz 330313 SHA256 1683c76b52c3505205447c338603ad08611fcc2da024f476e56e1298b4f10bea SHA512 6bc37e75c7286cac49b84160c33b6f5218284fa460bb3e874a9bef2f0b669ebb5998dbed1e45815cd91d6eedad681dd5a4a75358ec4066c6db629e2b3e44ba16 WHIRLPOOL 75cd46af33869a4c6678dba8264e7936ac73e6d292d26d9ea519dcb93ac506bf849c0eb4cda83a3ecdeed65719f8f1eaf48b474b2767f2ee015c1d710a465845 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/iwl6030-ucode-18.168.6.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/iwl6030-ucode-18.168.6.1-r1.ebuild deleted file mode 100644 index 4e8b89917e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6030-ucode/iwl6030-ucode-18.168.6.1-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ - -MY_PN="iwlwifi-6000g2b-ucode" - -DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" -HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" -SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" - -LICENSE="ipw3945" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" - -DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /lib/firmware - doins "${S}/iwlwifi-6000g2b-6.ucode" || die - - dodoc README* || die "dodoc failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/Manifest deleted file mode 100644 index 22b8e3d236..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iwlwifi-6050-ucode-41.28.5.1.tgz 223378 RMD160 7d8b97e39dc497edce81cd8c37bc4f50bf951e88 SHA1 3e3f426cfe6a6451ab236a73458e2d7b9edac141 SHA256 597d9a3ddb4b69f4590b436cf33d30a342bab2de3c9d8fa3d007b039accb20c4 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/iwl6050-ucode-41.28.5.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/iwl6050-ucode-41.28.5.1-r1.ebuild deleted file mode 100644 index a07ee13a60..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/iwl6050-ucode/iwl6050-ucode-41.28.5.1-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $ - -MY_PN="iwlwifi-6050-ucode" - -DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode" -HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" -SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" - -LICENSE="ipw3945" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="" - -DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /lib/firmware - doins "${S}/iwlwifi-6050-5.ucode" || die - - dodoc README* || die "dodoc failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-14.64.2.47-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-14.64.2.47-r15.ebuild deleted file mode 100644 index 9f99ea90a1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-14.64.2.47-r15.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_COMMIT="93ce6f598da2aa68003d1ebb305f32ec88755344" -CROS_WORKON_TREE="e678d0d27c25cba5abe0581e078ede22b87ba6ab" -CROS_WORKON_PROJECT="chromiumos/third_party/marvell" - -inherit eutils cros-workon - -DESCRIPTION="Marvell SD8787 firmware image" -HOMEPAGE="http://www.marvell.com/" -LICENSE="Marvell International Ltd." - -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RESTRICT="binchecks strip test" - -DEPEND="" -RDEPEND="" - -CROS_WORKON_LOCALNAME="marvell" - -src_install() { - dodir /lib/firmware/mrvl || die - cp -a "${S}"/sd87* "${D}"/lib/firmware/mrvl/ || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-9999.ebuild deleted file mode 100644 index 095a1b8d78..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/marvell_sd8787/marvell_sd8787-9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_PROJECT="chromiumos/third_party/marvell" - -inherit eutils cros-workon - -DESCRIPTION="Marvell SD8787 firmware image" -HOMEPAGE="http://www.marvell.com/" -LICENSE="Marvell International Ltd." - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RESTRICT="binchecks strip test" - -DEPEND="" -RDEPEND="" - -CROS_WORKON_LOCALNAME="marvell" - -src_install() { - dodir /lib/firmware/mrvl || die - cp -a "${S}"/sd87* "${D}"/lib/firmware/mrvl/ || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/files/rt2870.bin b/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/files/rt2870.bin deleted file mode 100644 index 3dd6fe3126..0000000000 Binary files a/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/files/rt2870.bin and /dev/null differ diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/realtek-rt2800-firmware-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/realtek-rt2800-firmware-0.0.1.ebuild deleted file mode 100644 index 84c44bfcb9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/realtek-rt2800-firmware/realtek-rt2800-firmware-0.0.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Ebuild that installs Realtek 2800 USB firmware." - -HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git" -LICENSE="ralink-firmware" -SLOT="0" -KEYWORDS="x86 arm amd64" - -RT2800_USB_FW_NAME="rt2870.bin" - -S=${WORKDIR} - -src_install() { - insinto /lib/firmware - doins "${FILESDIR}/${RT2800_USB_FW_NAME}" -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/Manifest b/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/Manifest deleted file mode 100644 index 53d8a2c4f1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wireless-regdb-2010.11.24.tar.bz2 13213 SHA256 77b33ac88baef36839e777d5e235be160f5c90dfcb058f4e7707f1873d9c73d3 SHA512 b4b68a341cc339ca39d59c6381a2cd2cefbc7c748a78330bddb2f5a5ed4f5678f9df4ddf7eb35d73dd33f1e1f559a12c10a285a924e00b6b735f555791e643b6 WHIRLPOOL 2cbb37ee96d258d1e7979828fcf32e9540fbd835b8d4944c1b1a21e3e7fb04e001230f6cf1b4f03e149acd245c11d444bcc74915709b9d6b0732e7dad5127fd2 diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild deleted file mode 100644 index 8ef77ddd75..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild,v 1.1 2009/11/26 11:46:13 chainsaw Exp $ - -inherit multilib - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing untouched binary version." -} - -src_install() { - insinto /usr/$(get_libdir)/crda/; doins regulatory.bin - insinto /usr/$(get_libdir)/crda/pubkeys; doins linville.key.pub.pem - doman regulatory.bin.5 - dodoc README db.txt -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r116.ebuild b/sdk_container/src/third_party/coreos-overlay/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r116.ebuild deleted file mode 100644 index ae24f8392b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r116.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild,v 1.7 2009/07/24 16:42:43 josejx Exp $ - -EAPI="2" -CROS_WORKON_COMMIT="728b68f811a2b0b12ea57c2e5386bee7e36f0bf9" -CROS_WORKON_TREE="6fa69fc25b9ed779d0e60b293e3b7c40edc95bb5" -CROS_WORKON_PROJECT="chromiumos/third_party/hostap" - -inherit eutils toolchain-funcs qt3 qt4 cros-workon - -DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" -HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" -#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" -LICENSE="|| ( GPL-2 BSD )" - -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD" - -DEPEND="dev-libs/libnl:0 - dbus? ( sys-apps/dbus ) - kernel_linux? ( - eap-sim? ( sys-apps/pcsc-lite ) - madwifi? ( || - ( >net-wireless/madwifi-ng-tools-0.9.3 - net-wireless/madwifi-old ) - ) - ) - !kernel_linux? ( net-libs/libpcap ) - qt4? ( x11-libs/qt-gui:4 - x11-libs/qt-svg:4 ) - !qt4? ( qt3? ( x11-libs/qt:3 ) ) - readline? ( sys-libs/ncurses sys-libs/readline ) - ssl? ( dev-libs/openssl chromeos-base/chaps dev-libs/engine_pkcs11 ) - !ssl? ( gnutls? ( net-libs/gnutls ) ) - !ssl? ( !gnutls? ( dev-libs/libtommath ) )" -RDEPEND="${DEPEND}" - -MY_S="${WORKDIR}/${P}/wpa_supplicant" - -pkg_setup() { - if use gnutls && use ssl ; then - einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" - fi - - if use qt3 && use qt4 ; then - einfo "You have both 'qt3' and 'qt4' USE flags enabled: defaulting to USE=\"qt4\"" - fi -} - -src_prepare() { - cd ${MY_S} - # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD - sed -i \ - -e "s:\(#include \):#include \n\1:" \ - ../src/l2_packet/l2_packet_freebsd.c || die - - # People seem to take the example configuration file too literally (bug #102361) - sed -i \ - -e "s:^\(opensc_engine_path\):#\1:" \ - -e "s:^\(pkcs11_engine_path\):#\1:" \ - -e "s:^\(pkcs11_module_path\):#\1:" \ - wpa_supplicant.conf || die - - # Change configuration to match Gentoo locations (bug #143750) - sed -i \ - -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ - -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ - wpa_supplicant.conf || die -} - -src_configure() { - local CFGFILE=${MY_S}/.config - - # Toolchain setup - echo "CC = $(tc-getCC)" > ${CFGFILE} - - # Build w/ debug symbols - echo "CFLAGS += -ggdb" >> ${CFGFILE} - - # Basic setup - echo "CONFIG_CTRL_IFACE=y" >> ${CFGFILE} - echo "CONFIG_BACKEND=file" >> ${CFGFILE} - - # Basic authentication methods - # NOTE: These are the options set by the Chromium OS build - echo "CONFIG_DYNAMIC_EAP_METHODS=y" >> ${CFGFILE} - echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CFGFILE} - echo "CONFIG_EAP_MD5=y" >> ${CFGFILE} - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CFGFILE} - echo "CONFIG_EAP_TLS=y" >> ${CFGFILE} - echo "CONFIG_EAP_PEAP=y" >> ${CFGFILE} - echo "CONFIG_EAP_TTLS=y" >> ${CFGFILE} - echo "CONFIG_EAP_GTC=y" >> ${CFGFILE} - echo "CONFIG_EAP_OTP=y" >> ${CFGFILE} - echo "CONFIG_EAP_LEAP=y" >> ${CFGFILE} - echo "CONFIG_PKCS12=y" >> ${CFGFILE} - echo "CONFIG_PEERKEY=y" >> ${CFGFILE} - echo "CONFIG_BGSCAN_SIMPLE=y" >> ${CFGFILE} - echo "CONFIG_BGSCAN_LEARN=y" >> ${CFGFILE} - echo "CONFIG_BGSCAN_DELTA=y" >> ${CFGFILE} - echo "CONFIG_IEEE80211W=y" >> ${CFGFILE} - - if use dbus ; then - echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> ${CFGFILE} - echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> ${CFGFILE} - fi - - if use debug ; then - echo "CONFIG_DEBUG_SYSLOG=y" >> ${CFGFILE} - echo "CONFIG_DEBUG_SYSLOG_FACILITY=LOG_LOCAL6" >> ${CFGFILE} - fi - - if use eap-sim ; then - # Smart card authentication - echo "CONFIG_EAP_SIM=y" >> ${CFGFILE} - echo "CONFIG_EAP_AKA=y" >> ${CFGFILE} - echo "CONFIG_EAP_AKA_PRIME=y" >> ${CFGFILE} - echo "CONFIG_PCSC=y" >> ${CFGFILE} - fi - - if use readline ; then - # readline/history support for wpa_cli - echo "CONFIG_READLINE=y" >> ${CFGFILE} - fi - - # SSL authentication methods - if use ssl ; then - echo "CONFIG_TLS=openssl" >> ${CFGFILE} - echo "CONFIG_SMARTCARD=y" >> ${CFGFILE} - elif use gnutls ; then - echo "CONFIG_TLS=gnutls" >> ${CFGFILE} - echo "CONFIG_GNUTLS_EXTRA=y" >> ${CFGFILE} - else - echo "CONFIG_TLS=internal" >> ${CFGFILE} - fi - - if use kernel_linux ; then - # Linux specific drivers - #echo "CONFIG_DRIVER_ATMEL=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_BROADCOM=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_HERMES=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_HOSTAP=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_IPW=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CFGFILE} - echo "CONFIG_DRIVER_NL80211=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_PRISM54=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_RALINK=y" >> ${CFGFILE} - echo "CONFIG_DRIVER_WEXT=y" >> ${CFGFILE} - echo "CONFIG_DRIVER_WIRED=y" >> ${CFGFILE} - - if use madwifi ; then - # Add include path for madwifi-driver headers - echo "CFLAGS += -I/usr/include/madwifi" >> ${CFGFILE} - echo "CONFIG_DRIVER_MADWIFI=y" >> ${CFGFILE} - fi - - if use ps3 ; then - echo "CONFIG_DRIVER_PS3=y" >> ${CFGFILE} - fi - - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - echo "CONFIG_DRIVER_BSD=y" >> ${CFGFILE} - fi - - # Wi-Fi Protected Setup (WPS) - if use wps ; then - echo "CONFIG_WPS=y" >> ${CFGFILE} - fi - - # Enable mitigation against certain attacks against TKIP - echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> ${CFGFILE} -} - -src_compile() { - emake -C wpa_supplicant || die "emake failed" - - if use qt4 ; then - cd "${MY_S}"/wpa_gui-qt4 - eqmake4 wpa_gui.pro - emake || die "Qt4 wpa_gui compilation failed" - elif use qt3 ; then - cd "${MY_S}"/wpa_gui - eqmake3 wpa_gui.pro - emake || die "Qt3 wpa_gui compilation failed" - fi -} - -src_install() { - cd ${MY_S} - dosbin wpa_supplicant || die - dobin wpa_cli wpa_passphrase || die - - # baselayout-1 compat - if has_version "\):#include \n\1:" \ - ../src/l2_packet/l2_packet_freebsd.c || die - - # People seem to take the example configuration file too literally (bug #102361) - sed -i \ - -e "s:^\(opensc_engine_path\):#\1:" \ - -e "s:^\(pkcs11_engine_path\):#\1:" \ - -e "s:^\(pkcs11_module_path\):#\1:" \ - wpa_supplicant.conf || die - - # Change configuration to match Gentoo locations (bug #143750) - sed -i \ - -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ - -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ - wpa_supplicant.conf || die -} - -src_configure() { - local CFGFILE=${MY_S}/.config - - # Toolchain setup - echo "CC = $(tc-getCC)" > ${CFGFILE} - - # Build w/ debug symbols - echo "CFLAGS += -ggdb" >> ${CFGFILE} - - # Basic setup - echo "CONFIG_CTRL_IFACE=y" >> ${CFGFILE} - echo "CONFIG_BACKEND=file" >> ${CFGFILE} - - # Basic authentication methods - # NOTE: These are the options set by the Chromium OS build - echo "CONFIG_DYNAMIC_EAP_METHODS=y" >> ${CFGFILE} - echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CFGFILE} - echo "CONFIG_EAP_MD5=y" >> ${CFGFILE} - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CFGFILE} - echo "CONFIG_EAP_TLS=y" >> ${CFGFILE} - echo "CONFIG_EAP_PEAP=y" >> ${CFGFILE} - echo "CONFIG_EAP_TTLS=y" >> ${CFGFILE} - echo "CONFIG_EAP_GTC=y" >> ${CFGFILE} - echo "CONFIG_EAP_OTP=y" >> ${CFGFILE} - echo "CONFIG_EAP_LEAP=y" >> ${CFGFILE} - echo "CONFIG_PKCS12=y" >> ${CFGFILE} - echo "CONFIG_PEERKEY=y" >> ${CFGFILE} - echo "CONFIG_BGSCAN_SIMPLE=y" >> ${CFGFILE} - echo "CONFIG_BGSCAN_LEARN=y" >> ${CFGFILE} - echo "CONFIG_BGSCAN_DELTA=y" >> ${CFGFILE} - echo "CONFIG_IEEE80211W=y" >> ${CFGFILE} - - if use dbus ; then - echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> ${CFGFILE} - echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> ${CFGFILE} - fi - - if use debug ; then - echo "CONFIG_DEBUG_SYSLOG=y" >> ${CFGFILE} - echo "CONFIG_DEBUG_SYSLOG_FACILITY=LOG_LOCAL6" >> ${CFGFILE} - fi - - if use eap-sim ; then - # Smart card authentication - echo "CONFIG_EAP_SIM=y" >> ${CFGFILE} - echo "CONFIG_EAP_AKA=y" >> ${CFGFILE} - echo "CONFIG_EAP_AKA_PRIME=y" >> ${CFGFILE} - echo "CONFIG_PCSC=y" >> ${CFGFILE} - fi - - if use readline ; then - # readline/history support for wpa_cli - echo "CONFIG_READLINE=y" >> ${CFGFILE} - fi - - # SSL authentication methods - if use ssl ; then - echo "CONFIG_TLS=openssl" >> ${CFGFILE} - echo "CONFIG_SMARTCARD=y" >> ${CFGFILE} - elif use gnutls ; then - echo "CONFIG_TLS=gnutls" >> ${CFGFILE} - echo "CONFIG_GNUTLS_EXTRA=y" >> ${CFGFILE} - else - echo "CONFIG_TLS=internal" >> ${CFGFILE} - fi - - if use kernel_linux ; then - # Linux specific drivers - #echo "CONFIG_DRIVER_ATMEL=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_BROADCOM=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_HERMES=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_HOSTAP=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_IPW=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CFGFILE} - echo "CONFIG_DRIVER_NL80211=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_PRISM54=y" >> ${CFGFILE} - #echo "CONFIG_DRIVER_RALINK=y" >> ${CFGFILE} - echo "CONFIG_DRIVER_WEXT=y" >> ${CFGFILE} - echo "CONFIG_DRIVER_WIRED=y" >> ${CFGFILE} - - if use madwifi ; then - # Add include path for madwifi-driver headers - echo "CFLAGS += -I/usr/include/madwifi" >> ${CFGFILE} - echo "CONFIG_DRIVER_MADWIFI=y" >> ${CFGFILE} - fi - - if use ps3 ; then - echo "CONFIG_DRIVER_PS3=y" >> ${CFGFILE} - fi - - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - echo "CONFIG_DRIVER_BSD=y" >> ${CFGFILE} - fi - - # Wi-Fi Protected Setup (WPS) - if use wps ; then - echo "CONFIG_WPS=y" >> ${CFGFILE} - fi - - # Enable mitigation against certain attacks against TKIP - echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> ${CFGFILE} -} - -src_compile() { - emake -C wpa_supplicant || die "emake failed" - - if use qt4 ; then - cd "${MY_S}"/wpa_gui-qt4 - eqmake4 wpa_gui.pro - emake || die "Qt4 wpa_gui compilation failed" - elif use qt3 ; then - cd "${MY_S}"/wpa_gui - eqmake3 wpa_gui.pro - emake || die "Qt3 wpa_gui compilation failed" - fi -} - -src_install() { - cd ${MY_S} - dosbin wpa_supplicant || die - dobin wpa_cli wpa_passphrase || die - - # baselayout-1 compat - if has_version "