diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootstat/bootstat-0.0.1-r19.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootstat/bootstat-0.0.1-r19.ebuild deleted file mode 100644 index daef026c6b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootstat/bootstat-0.0.1-r19.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_COMMIT="7cbe18c6f1b8446d486a501a94297e6b04128b6d" -CROS_WORKON_TREE="b5ef87a2635b6cbba9816bf32c256b3cdec80cef" -CROS_WORKON_PROJECT="chromiumos/platform/bootstat" -inherit cros-workon - -DESCRIPTION="Chrome OS Boot Time Statistics Utilities" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86 arm" -IUSE="" - -RDEPEND="" - -DEPEND="dev-cpp/gtest" - -src_compile() { - tc-export CC CXX AR PKG_CONFIG - emake || die "bootstat compile failed." -} - -src_test() { - tc-export CC CXX AR PKG_CONFIG - emake tests || die "could not build tests" - if ! use x86 && ! use amd64 ; then - echo Skipping unit tests on non-x86 platform - else - for test in ./*_test; do - "${test}" ${GTEST_ARGS} || die "${test} failed" - done - fi -} - -src_install() { - into / - dosbin bootstat || die - dosbin bootstat_get_last || die - dobin bootstat_summary || die - - into /usr - dolib.a libbootstat.a || die - - insinto /usr/include/metrics - doins bootstat.h || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootstat/bootstat-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootstat/bootstat-9999.ebuild deleted file mode 100644 index 2552bb3f59..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootstat/bootstat-9999.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_PROJECT="chromiumos/platform/bootstat" -inherit cros-workon - -DESCRIPTION="Chrome OS Boot Time Statistics Utilities" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" -IUSE="" - -RDEPEND="" - -DEPEND="dev-cpp/gtest" - -src_compile() { - tc-export CC CXX AR PKG_CONFIG - emake || die "bootstat compile failed." -} - -src_test() { - tc-export CC CXX AR PKG_CONFIG - emake tests || die "could not build tests" - if ! use x86 && ! use amd64 ; then - echo Skipping unit tests on non-x86 platform - else - for test in ./*_test; do - "${test}" ${GTEST_ARGS} || die "${test} failed" - done - fi -} - -src_install() { - into / - dosbin bootstat || die - dosbin bootstat_get_last || die - dobin bootstat_summary || die - - into /usr - dolib.a libbootstat.a || die - - insinto /usr/include/metrics - doins bootstat.h || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 748ebb1ab2..51f7bbca12 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -100,14 +100,7 @@ RDEPEND="${RDEPEND} # things like line editing in dash, so its interactive mode is very bare. # TODO(ifup): # coreos-base/crash-reporter -# coreos-base/chromeos-debugd -# coreos-base/chromeos-init -# coreos-base/cros-disks -# coreos-base/shill -# coreos-base/userfeedback # coreos-base/metrics -# sys-apps/ureadahead -# coreos-base/bootstat RDEPEND="${RDEPEND} sys-apps/findutils diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild deleted file mode 100644 index 12fa2a955a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild +++ /dev/null @@ -1,81 +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="8bc9b0296b66a1f93a34aa613cc45864450f69c6" -CROS_WORKON_TREE="6c05b98c91993c6c4921e505f83372bf87cbc5bd" -CROS_WORKON_PROJECT="chromiumos/platform/cros-disks" -CROS_WORKON_OUTOFTREE_BUILD=1 - -inherit cros-debug cros-workon - -DESCRIPTION="Disk mounting daemon for Chromium OS" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="arm amd64 x86" -IUSE="test" - -LIBCHROME_VERS="125070" - -RDEPEND=" - app-arch/unrar - chromeos-base/chromeos-minijail - chromeos-base/libchromeos - chromeos-base/metrics - dev-cpp/gflags - dev-libs/dbus-c++ - >=dev-libs/glib-2.30 - sys-apps/rootdev - sys-apps/util-linux - sys-block/parted - sys-fs/avfs - sys-fs/fuse-exfat - sys-fs/ntfs3g - virtual/udev -" - -DEPEND="${RDEPEND} - chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - chromeos-base/system_api - dev-cpp/gmock - test? ( dev-cpp/gtest )" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - cros-workon_src_compile -} - -src_test() { - # Needed for `cros_run_unit_tests`. - cros-workon_src_test -} - -src_install() { - exeinto /opt/google/cros-disks - doexe "${OUT}"/disks - - # Install USB device IDs file. - insinto /opt/google/cros-disks - doins usb-device-info - - # Install seccomp policy file. - newins "avfsd-seccomp-${ARCH}.policy" avfsd-seccomp.policy - - # Install upstart config file. - insinto /etc/init - doins cros-disks.conf - - # Install D-Bus config file. - insinto /etc/dbus-1/system.d - doins org.chromium.CrosDisks.conf -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-9999.ebuild deleted file mode 100644 index 6710e9678e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-9999.ebuild +++ /dev/null @@ -1,79 +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/platform/cros-disks" -CROS_WORKON_OUTOFTREE_BUILD=1 - -inherit cros-debug cros-workon - -DESCRIPTION="Disk mounting daemon for Chromium OS" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" -IUSE="test" - -LIBCHROME_VERS="125070" - -RDEPEND=" - app-arch/unrar - chromeos-base/chromeos-minijail - chromeos-base/libchromeos - chromeos-base/metrics - dev-cpp/gflags - dev-libs/dbus-c++ - >=dev-libs/glib-2.30 - sys-apps/rootdev - sys-apps/util-linux - sys-block/parted - sys-fs/avfs - sys-fs/fuse-exfat - sys-fs/ntfs3g - virtual/udev -" - -DEPEND="${RDEPEND} - chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - chromeos-base/system_api - dev-cpp/gmock - test? ( dev-cpp/gtest )" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - cros-workon_src_compile -} - -src_test() { - # Needed for `cros_run_unit_tests`. - cros-workon_src_test -} - -src_install() { - exeinto /opt/google/cros-disks - doexe "${OUT}"/disks - - # Install USB device IDs file. - insinto /opt/google/cros-disks - doins usb-device-info - - # Install seccomp policy file. - newins "avfsd-seccomp-${ARCH}.policy" avfsd-seccomp.policy - - # Install upstart config file. - insinto /etc/init - doins cros-disks.conf - - # Install D-Bus config file. - insinto /etc/dbus-1/system.d - doins org.chromium.CrosDisks.conf -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/shill/shill-0.0.1-r1052.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/shill/shill-0.0.1-r1052.ebuild deleted file mode 100644 index 3820e10f8c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/shill/shill-0.0.1-r1052.ebuild +++ /dev/null @@ -1,101 +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="d73783fb016a4c9d7d8644db83c8caeb447b0063" -CROS_WORKON_TREE="e68fbfeee03d9d1e0e4a248b13d7081eaaacf317" -CROS_WORKON_PROJECT="chromiumos/platform/shill" - -inherit cros-debug cros-workon toolchain-funcs multilib - -DESCRIPTION="Shill Connection Manager for Chromium OS" -HOMEPAGE="http://src.chromium.org" -LICENSE="BSD" -SLOT="0" -IUSE="test" -KEYWORDS="amd64 arm x86" - -RDEPEND="chromeos-base/bootstat - chromeos-base/chromeos-minijail - !=chromeos-base/mobile-providers-0.0.1-r12 - chromeos-base/vpn-manager - dev-libs/dbus-c++ - >=dev-libs/glib-2.30 - dev-libs/libnl:3 - dev-libs/nss - dev-libs/protobuf - net-dialup/ppp - net-dns/c-ares - net-misc/dhcpcd - net-misc/openvpn - net-wireless/wpa_supplicant[dbus]" - -DEPEND="${RDEPEND} - chromeos-base/system_api - chromeos-base/wimax_manager - test? ( dev-cpp/gmock ) - test? ( dev-cpp/gtest ) - virtual/modemmanager" - -make_flags() { - echo LIBDIR="/usr/$(get_libdir)" -} - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - - emake $(make_flags) shill shims -} - -src_test() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - - # Build tests - emake $(make_flags) shill_unittest - - # Run tests if we're on x86 - if ! use x86 && ! use amd64 ; then - echo Skipping tests on non-x86/amd64 platform... - else - for ut in shill ; do - "${S}/${ut}_unittest" \ - ${GTEST_ARGS} || die "${ut}_unittest failed" - done - fi -} - -src_install() { - dobin bin/ff_debug - dobin bin/mm_debug - dobin bin/set_apn - dobin bin/set_arpgw - dobin bin/shill_login_user - dobin bin/shill_logout_user - dobin bin/wpa_debug - dobin shill - local shims_dir="/usr/$(get_libdir)/shill/shims" - exeinto "${shims_dir}" - doexe build/shims/net-diags-upload - doexe build/shims/nss-get-cert - doexe build/shims/openvpn-script - doexe build/shims/set-apn-helper - doexe build/shims/shill-pppd-plugin.so - insinto "${shims_dir}" - doins build/shims/wpa_supplicant.conf - insinto /etc - doins shims/nsswitch.conf - dosym /var/run/shill/resolv.conf /etc/resolv.conf - insinto /etc/dbus-1/system.d - doins shims/org.chromium.flimflam.conf - insinto /usr/share/shill - doins data/cellular_operator_info - # Install introspection XML - insinto /usr/share/dbus-1/interfaces - doins dbus_bindings/org.chromium.flimflam.*.xml -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/shill/shill-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/shill/shill-9999.ebuild deleted file mode 100644 index 28c42305ca..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/shill/shill-9999.ebuild +++ /dev/null @@ -1,99 +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/platform/shill" - -inherit cros-debug cros-workon toolchain-funcs multilib - -DESCRIPTION="Shill Connection Manager for Chromium OS" -HOMEPAGE="http://src.chromium.org" -LICENSE="BSD" -SLOT="0" -IUSE="test" -KEYWORDS="~amd64 ~arm ~x86" - -RDEPEND="chromeos-base/bootstat - chromeos-base/chromeos-minijail - !=chromeos-base/mobile-providers-0.0.1-r12 - chromeos-base/vpn-manager - dev-libs/dbus-c++ - >=dev-libs/glib-2.30 - dev-libs/libnl:3 - dev-libs/nss - dev-libs/protobuf - net-dialup/ppp - net-dns/c-ares - net-misc/dhcpcd - net-misc/openvpn - net-wireless/wpa_supplicant[dbus]" - -DEPEND="${RDEPEND} - chromeos-base/system_api - chromeos-base/wimax_manager - test? ( dev-cpp/gmock ) - test? ( dev-cpp/gtest ) - virtual/modemmanager" - -make_flags() { - echo LIBDIR="/usr/$(get_libdir)" -} - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - - emake $(make_flags) shill shims -} - -src_test() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - - # Build tests - emake $(make_flags) shill_unittest - - # Run tests if we're on x86 - if ! use x86 && ! use amd64 ; then - echo Skipping tests on non-x86/amd64 platform... - else - for ut in shill ; do - "${S}/${ut}_unittest" \ - ${GTEST_ARGS} || die "${ut}_unittest failed" - done - fi -} - -src_install() { - dobin bin/ff_debug - dobin bin/mm_debug - dobin bin/set_apn - dobin bin/set_arpgw - dobin bin/shill_login_user - dobin bin/shill_logout_user - dobin bin/wpa_debug - dobin shill - local shims_dir="/usr/$(get_libdir)/shill/shims" - exeinto "${shims_dir}" - doexe build/shims/net-diags-upload - doexe build/shims/nss-get-cert - doexe build/shims/openvpn-script - doexe build/shims/set-apn-helper - doexe build/shims/shill-pppd-plugin.so - insinto "${shims_dir}" - doins build/shims/wpa_supplicant.conf - insinto /etc - doins shims/nsswitch.conf - dosym /var/run/shill/resolv.conf /etc/resolv.conf - insinto /etc/dbus-1/system.d - doins shims/org.chromium.flimflam.conf - insinto /usr/share/shill - doins data/cellular_operator_info - # Install introspection XML - insinto /usr/share/dbus-1/interfaces - doins dbus_bindings/org.chromium.flimflam.*.xml -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/userfeedback/userfeedback-0.0.1-r81.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/userfeedback/userfeedback-0.0.1-r81.ebuild deleted file mode 100644 index b57afa743b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/userfeedback/userfeedback-0.0.1-r81.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_COMMIT="be13c42c801e18096f357684dc2a2848a4bf5162" -CROS_WORKON_TREE="f209555c63c55fe03d652edfb83c61d912c54f16" -CROS_WORKON_PROJECT="chromiumos/platform/userfeedback" - -inherit cros-workon - -DESCRIPTION="Log scripts used by userfeedback to report cros system information" -HOMEPAGE="http://www.chromium.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND="chromeos-base/chromeos-init - chromeos-base/modem-utilities - chromeos-base/vboot_reference - media-libs/fontconfig - sys-apps/mosys - sys-apps/net-tools - sys-apps/pciutils - sys-apps/usbutils - x11-apps/setxkbmap" - -DEPEND="" - -src_install() { - exeinto /usr/share/userfeedback/scripts - doexe scripts/* || die "Could not copy scripts" - - insinto /usr/share/userfeedback/etc - doins etc/* || die "Could not copy etc" - - insinto /etc/init - doins init/* || die "Could not copy init" -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/userfeedback/userfeedback-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/userfeedback/userfeedback-9999.ebuild deleted file mode 100644 index ca412403ea..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/userfeedback/userfeedback-9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -CROS_WORKON_PROJECT="chromiumos/platform/userfeedback" - -inherit cros-workon - -DESCRIPTION="Log scripts used by userfeedback to report cros system information" -HOMEPAGE="http://www.chromium.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="chromeos-base/chromeos-init - chromeos-base/modem-utilities - chromeos-base/vboot_reference - media-libs/fontconfig - sys-apps/mosys - sys-apps/net-tools - sys-apps/pciutils - sys-apps/usbutils - x11-apps/setxkbmap" - -DEPEND="" - -src_install() { - exeinto /usr/share/userfeedback/scripts - doexe scripts/* || die "Could not copy scripts" - - insinto /usr/share/userfeedback/etc - doins etc/* || die "Could not copy etc" - - insinto /etc/init - doins init/* || die "Could not copy init" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.1-r26.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.1-r26.ebuild deleted file mode 100644 index 8a29b1ac55..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.1-r26.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_COMMIT="594d7b583de7b49d93f0fb1553d46a43c6b6f8b2" -CROS_WORKON_TREE="3c1f68b1c84462e5e30c6f8f6f354ecff67f44bd" -CROS_WORKON_PROJECT="chromiumos/third_party/cbootimage" - -inherit cros-workon - -DESCRIPTION="Utility for signing Tegra2 boot images" -HOMEPAGE="http://git.chromium.org" -SRC_URI="" -LICENSE="GPLv2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - - doexe cbootimage - doexe bct_dump -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2-r1.ebuild deleted file mode 120000 index 72bbd4aa79..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -cbootimage-0.0.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2.ebuild deleted file mode 100644 index 55b192852f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-0.0.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -EGIT_REPO_URI="git://nv-tegra.nvidia.com/tools/cbootimage.git" -EGIT_COMMIT="0bbfaf91d1bfdf1bebf884d100e874e4e6b16b6a" -inherit git-2 - -DESCRIPTION="Utility for signing Tegra2 boot images" -HOMEPAGE="http://nv-tegra.nvidia.com/gitweb/?p=tools/cbootimage.git" -SRC_URI="" - -LICENSE="GPLv2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -src_install() { - dobin cbootimage bct_dump -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-9999.ebuild deleted file mode 100644 index ee848a31e7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/cbootimage/cbootimage-9999.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_PROJECT="chromiumos/third_party/cbootimage" - -inherit cros-workon - -DESCRIPTION="Utility for signing Tegra2 boot images" -HOMEPAGE="http://git.chromium.org" -SRC_URI="" -LICENSE="GPLv2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - - doexe cbootimage - doexe bct_dump -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/Manifest deleted file mode 100644 index 4319fcd2d2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ftdi_eeprom-0.4_rc1.tar.gz 35296 SHA256 014535173150062af45190988b559c702073589aa5fb040974556dbac05fb065 SHA512 27ae9909f236235909913f559e0975c4c808a7dbb49f4614cd9714ab23844ce841e79491b524c39479b7d29f1334043630f5cd49bdedcd0173b2706d7ba4d6a3 WHIRLPOOL 5e408bce01cca128dc3284b5b448c455612d95a6095aaca18669ce12b5a1ddac0e73f4ff89762323da66ca75816ea78b2a4ab6faa01eed66ed49271dc12bdf21 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/CHANGELOG b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/CHANGELOG deleted file mode 100644 index bffc2df647..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/CHANGELOG +++ /dev/null @@ -1,9 +0,0 @@ -getopts.patch: -- bugfix to allow programming of devices with default FTDI id:0x0403/0x6001 - to a new vid/pid. Previously, ftdi_eeprom assumed that the vid/pid in the - config file otherwise. In addition, added ability to override serial number - in config file on command line. - - Now to program board for first time: - ftdi_eeprom -v 0x403 -p 0x6001 -s 000-001 /usr/share/ftdi_eeprom/mini-servo.conf - where: inside mini-servo.conf vid/pid is 0x18d1/0x5000 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-01.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-01.conf deleted file mode 100644 index 2d8f457eb7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-01.conf +++ /dev/null @@ -1,46 +0,0 @@ -vendor_id=0x18d1 -product_id=0x5000 - -max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. - -########### -# Strings # -########### -# total of these strings is <= eeprom_size - 28bytes -# for 232R ( 128B ) so 100bytes -manufacturer="Google Inc" -product="mini-servo:810-10011-00" -serial="000-00000000" #- - -########### -# Options # -########### -self_powered=true # Turn this off for bus powered -remote_wakeup=false # Turn this on for remote wakeup feature -use_serial=true # Use the serial number string - -# Avail options: BM|R|other -chip_type=R -# Avail options: -# TXDEN|PWREN|RXLED|TXLED|TXRXLED|SLEEP|CLK48|CLK24|CLK12|CLK6| -# IO_MODE|BITBANG_WR|BITBANG_RD|SPECIAL -cbus0=IO_MODE -cbus1=IO_MODE -cbus2=IO_MODE -cbus3=IO_MODE -cbus4=PWREN - -# Normally out don't have to change one of these flags -# 2010/12/21 : tbroch : deprecated in ToT for chip_type -#BM_type_chip=true # Newer chips are all BM type -in_is_isochronous=false # In Endpoint is Isochronous -out_is_isochronous=false # Out Endpoint is Isochronous -suspend_pull_downs=false # Enable suspend pull downs for lower power -change_usb_version=false # Change USB Version -usb_version=0x0200 # Only used when change_usb_version is enabled - -######## -# Misc # -######## - -filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-02.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-02.conf deleted file mode 100644 index e972bfabf3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/mini-servo_rev-02.conf +++ /dev/null @@ -1,47 +0,0 @@ -vendor_id=0x18d1 -product_id=0x5000 - -max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. - -########### -# Strings # -########### -# total of these strings is <= eeprom_size - 28bytes -# for 232R ( 128B ) so 100bytes -manufacturer="Google Inc" -product="mini-servo:810-10011-01" -# serial 3-digits hand-labelled on pack of mini-servos -serial="000-000" #- - -########### -# Options # -########### -self_powered=true # Turn this off for bus powered -remote_wakeup=false # Turn this on for remote wakeup feature -use_serial=true # Use the serial number string - -# Avail options: BM|R|other -chip_type=R -# Avail options: -# TXDEN|PWREN|RXLED|TXLED|TXRXLED|SLEEP|CLK48|CLK24|CLK12|CLK6| -# IO_MODE|BITBANG_WR|BITBANG_RD|SPECIAL -cbus0=IO_MODE -cbus1=IO_MODE -cbus2=IO_MODE -cbus3=IO_MODE -cbus4=PWREN - -# Normally out don't have to change one of these flags -# 2010/12/21 : tbroch : deprecated in ToT for chip_type -#BM_type_chip=true # Newer chips are all BM type -in_is_isochronous=false # In Endpoint is Isochronous -out_is_isochronous=false # Out Endpoint is Isochronous -suspend_pull_downs=false # Enable suspend pull downs for lower power -change_usb_version=false # Change USB Version -usb_version=0x0200 # Only used when change_usb_version is enabled - -######## -# Misc # -######## - -filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-00.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-00.conf deleted file mode 100644 index 505868e1f2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-00.conf +++ /dev/null @@ -1,37 +0,0 @@ -vendor_id=0x18d1 -product_id=0x5001 - -max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. - -########### -# Strings # -########### -# total of these strings is <= eeprom_size - 28bytes -manufacturer="Google Inc" -product="servo:810-10010-00" -serial="000-00000" #- - -########### -# Options # -########### -self_powered=true # Turn this off for bus powered -remote_wakeup=false # Turn this on for remote wakeup feature -use_serial=true # Use the serial number string - -# Avail options: BM|R|other -chip_type=BM - -# Normally out don't have to change one of these flags -# 2010/12/21 : tbroch : deprecated in ToT for chip_type -#BM_type_chip=true # Newer chips are all BM type -in_is_isochronous=false # In Endpoint is Isochronous -out_is_isochronous=false # Out Endpoint is Isochronous -suspend_pull_downs=false # Enable suspend pull downs for lower power -change_usb_version=false # Change USB Version -usb_version=0x0200 # Only used when change_usb_version is enabled - -######## -# Misc # -######## - -filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-01.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-01.conf deleted file mode 100644 index 30e53ed591..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-01.conf +++ /dev/null @@ -1,37 +0,0 @@ -vendor_id=0x18d1 -product_id=0x5001 - -max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. - -########### -# Strings # -########### -# total of these strings is <= eeprom_size - 28bytes -manufacturer="Google Inc" -product="servo:810-10010-01" -serial="000-00000" #- - -########### -# Options # -########### -self_powered=true # Turn this off for bus powered -remote_wakeup=false # Turn this on for remote wakeup feature -use_serial=true # Use the serial number string - -# Avail options: BM|R|other -chip_type=BM - -# Normally out don't have to change one of these flags -# 2010/12/21 : tbroch : deprecated in ToT for chip_type -#BM_type_chip=true # Newer chips are all BM type -in_is_isochronous=false # In Endpoint is Isochronous -out_is_isochronous=false # Out Endpoint is Isochronous -suspend_pull_downs=false # Enable suspend pull downs for lower power -change_usb_version=false # Change USB Version -usb_version=0x0200 # Only used when change_usb_version is enabled - -######## -# Misc # -######## - -filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02a.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02a.conf deleted file mode 100644 index 34057e0dc3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02a.conf +++ /dev/null @@ -1,37 +0,0 @@ -vendor_id=0x18d1 -product_id=0x5002 - -max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. - -########### -# Strings # -########### -# total of these strings is <= eeprom_size - 28bytes -manufacturer="Google Inc" -product="servo:810-10010-02" -serial="000-00000" #- - -########### -# Options # -########### -self_powered=true # Turn this off for bus powered -remote_wakeup=false # Turn this on for remote wakeup feature -use_serial=true # Use the serial number string - -# Avail options: BM|R|other -chip_type=BM - -# Normally out don't have to change one of these flags -# 2010/12/21 : tbroch : deprecated in ToT for chip_type -#BM_type_chip=true # Newer chips are all BM type -in_is_isochronous=false # In Endpoint is Isochronous -out_is_isochronous=false # Out Endpoint is Isochronous -suspend_pull_downs=false # Enable suspend pull downs for lower power -change_usb_version=false # Change USB Version -usb_version=0x0200 # Only used when change_usb_version is enabled - -######## -# Misc # -######## - -filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02b.conf b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02b.conf deleted file mode 100644 index 235d5fdbaf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/confs/servo_rev-02b.conf +++ /dev/null @@ -1,37 +0,0 @@ -vendor_id=0x18d1 -product_id=0x5003 - -max_power=0 # Max. power consumption: value * 2 mA. Use 0 if self_powered = true. - -########### -# Strings # -########### -# total of these strings is <= eeprom_size - 28bytes -manufacturer="Google Inc" -product="servo:810-10010-02" -serial="000-00000" #- - -########### -# Options # -########### -self_powered=true # Turn this off for bus powered -remote_wakeup=false # Turn this on for remote wakeup feature -use_serial=true # Use the serial number string - -# Avail options: BM|R|other -chip_type=BM - -# Normally out don't have to change one of these flags -# 2010/12/21 : tbroch : deprecated in ToT for chip_type -#BM_type_chip=true # Newer chips are all BM type -in_is_isochronous=false # In Endpoint is Isochronous -out_is_isochronous=false # Out Endpoint is Isochronous -suspend_pull_downs=false # Enable suspend pull downs for lower power -change_usb_version=false # Change USB Version -usb_version=0x0200 # Only used when change_usb_version is enabled - -######## -# Misc # -######## - -filename="eeprom.new" # Filename, leave empty to skip file writing diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/getopts.patch b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/getopts.patch deleted file mode 100644 index 5a549bbfbf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/files/getopts.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/src/main.c b/src/main.c -index 81e6e93..972cc92 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -90,6 +91,9 @@ int main(int argc, char *argv[]) - normal variables - */ - int _read = 0, _erase = 0, _flash = 0; -+ int _vendor = 0x0403, _product = 0x6011; -+ char _serial[128] = {'\0'}; -+ - unsigned char eeprom_buf[128]; - char *filename; - int size_check; -@@ -102,35 +106,68 @@ int main(int argc, char *argv[]) - printf("\nFTDI eeprom generator v%s\n", VERSION); - printf ("(c) Intra2net AG \n"); - -- if (argc != 2 && argc != 3) -+ int longval = 0; -+ struct option long_options[] = { -+ {"read-eeprom", no_argument, &_read, 1}, -+ {"erase-eeprom", no_argument, &_erase, 1}, -+ {"flash-eeprom", no_argument, &_flash, 1}, -+ {"vendor", required_argument, &longval, 'v'}, -+ {"product", required_argument, &longval, 'p'}, -+ {"serial", required_argument, &longval, 's'}, -+ {0, 0, 0, 0} -+ }; -+ -+ int option_index = 0; -+ char c; -+ while ((c = getopt_long(argc, argv, "v:p:s:", -+ long_options, &option_index)) != -1) { -+ switch (c) { -+ case 'v': -+ _vendor = strtoul(optarg, NULL, 0); -+ break; -+ case 'p': -+ _product = strtoul(optarg, NULL, 0); -+ break; -+ case 's': -+ strcpy(_serial, optarg); -+ break; -+ case 0: -+ switch (longval) { -+ case 'v': -+ _vendor = strtoul(optarg, NULL, 0); -+ break; -+ case 'p': -+ _product = strtoul(optarg, NULL, 0); -+ break; -+ case 's': -+ strcpy(_serial, optarg); -+ break; -+ default: -+ break; -+ } -+ default: -+ break; -+ } -+ } -+ -+ if (!_read & !_erase & !_flash) - { -- printf("Syntax: %s [commands] config-file\n", argv[0]); -+ printf("Syntax: %s [switches|command] config-file\n", argv[0]); - printf("Valid commands:\n"); -- printf("--read-eeprom Read eeprom and write to -filename- from config-file\n"); -- printf("--erase-eeprom Erase eeprom\n"); -- printf("--flash-eeprom Flash eeprom\n"); -+ printf("--read-eeprom Read eeprom and write to -filename- from config-file\n"); -+ printf("--erase-eeprom Erase eeprom\n"); -+ printf("--flash-eeprom Flash eeprom\n"); -+ printf("--vendor|-v Vendor id to probe for on USB\n"); -+ printf("--product|-p Product id to probe for on USB\n"); -+ printf("--serial|-s Serial string to override\n"); - exit (-1); - } - -- if (argc == 3) -- { -- if (strcmp(argv[1], "--read-eeprom") == 0) -- _read = 1; -- if (strcmp(argv[1], "--erase-eeprom") == 0) -- _erase = 1; -- if (strcmp(argv[1], "--flash-eeprom") == 0) -- _flash = 1; -- -- argc_filename = 2; -- } -- else -- { -- argc_filename = 1; -- } -+ argc_filename = optind; - - if ((fp = fopen(argv[argc_filename], "r")) == NULL) - { -- printf ("Can't open configuration file\n"); -+ printf ("Can't open configuration file %s\n", argv[argc_filename]); - exit (-1); - } - fclose (fp); -@@ -163,14 +200,16 @@ int main(int argc, char *argv[]) - eeprom.out_is_isochronous = cfg_getbool(cfg, "out_is_isochronous"); - eeprom.suspend_pull_downs = cfg_getbool(cfg, "suspend_pull_downs"); - -- eeprom.use_serial = cfg_getbool(cfg, "use_serial"); -+ eeprom.use_serial = (_serial[0] == '\0') ? -+ cfg_getbool(cfg, "use_serial") : 1; - eeprom.change_usb_version = cfg_getbool(cfg, "change_usb_version"); - eeprom.usb_version = cfg_getint(cfg, "usb_version"); - - - eeprom.manufacturer = cfg_getstr(cfg, "manufacturer"); - eeprom.product = cfg_getstr(cfg, "product"); -- eeprom.serial = cfg_getstr(cfg, "serial"); -+ eeprom.serial = (_serial[0] == '\0') ? -+ cfg_getstr(cfg, "serial") : _serial; - eeprom.high_current = cfg_getbool(cfg, "high_current"); - eeprom.cbus_function[0] = str_to_cbus(cfg_getstr(cfg, "cbus0"), 13); - eeprom.cbus_function[1] = str_to_cbus(cfg_getstr(cfg, "cbus1"), 13); -@@ -198,11 +237,12 @@ int main(int argc, char *argv[]) - } - else - { -- printf("Unable to find FTDI devices under given vendor/product id: 0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id); -- printf("Error code: %d (%s)\n", i, ftdi_get_error_string(&ftdi)); -- printf("Retrying with default FTDI id.\n"); -+ printf("Unable to find FTDI devices under given id:0x%02x/0x%02x\n", -+ eeprom.vendor_id, eeprom.product_id); - -- i = ftdi_usb_open(&ftdi, 0x0403, 0x6001); -+ printf("Error code: %d (%s)\n", i, ftdi_get_error_string(&ftdi)); -+ printf("Retrying with id:0x%02x/0x%02x\n", _vendor, _product); -+ i = ftdi_usb_open(&ftdi, _vendor, _product); - if (i != 0) - { - printf("Error: %s\n", ftdi.error_str); diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.4_rc1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.4_rc1.ebuild deleted file mode 100644 index e718e1423f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.4_rc1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3.ebuild,v 1.1 2010/06/22 22:19:02 vapier Exp $ - -EAPI="2" - -inherit autotools - -DESCRIPTION="Utility to program external EEPROM for FTDI USB chips" -HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/" -# -# from HEAD 08d3572 'Support for FT232R eeprom features' -# -SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${PN}-${PV}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND=">=dev-embedded/libftdi-0.19 - dev-libs/confuse" - -src_prepare() { - epatch ${FILESDIR}/getopts.patch || die "patching getopts.patch" - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die - insinto "/usr/share/ftdi_eeprom" - for item in ${FILESDIR}/confs/*.conf; do - doins ${item} - done - dodoc AUTHORS ChangeLog README src/example.conf -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-0.0.1-r4.ebuild deleted file mode 100644 index 20b5b011da..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-0.0.1-r4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_COMMIT="66f1f0d949f4ca4836c1a65b622629205240e37a" -CROS_WORKON_TREE="9e4e01d060cdaf9232236674d7e2a5bd14f1dfae" -CROS_WORKON_PROJECT="chromiumos/third_party/tegra-power-query" - -inherit cros-workon - -DESCRIPTION="Utility monitoring power usage on Harmony and Seaboard" -HOMEPAGE="" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - - doexe tegra-power-query || die "doexe failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-9999.ebuild deleted file mode 100644 index 26d9f8196d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegra-power-query/tegra-power-query-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_PROJECT="chromiumos/third_party/tegra-power-query" - -inherit cros-workon - -DESCRIPTION="Utility monitoring power usage on Harmony and Seaboard" -HOMEPAGE="" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - - doexe tegra-power-query || die "doexe failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.1.ebuild deleted file mode 100644 index de03982c15..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.1.ebuild +++ /dev/null @@ -1,24 +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 - -EGIT_REPO_URI="git://nv-tegra.nvidia.com/tools/tegrarcm.git" -EGIT_COMMIT="v${PV}" -inherit git-2 - -DESCRIPTION="Utility for downloading code to tegra system in recovery mode" -HOMEPAGE="http://sourceforge.net/projects/tegra-rcm/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=dev-libs/crypto++-5.6 - virtual/libusb:1" -RDEPEND="${DEPEND}" - -src_install() { - dobin src/tegrarcm -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2-r1.ebuild deleted file mode 120000 index 66614c9b2c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -tegrarcm-1.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2.ebuild deleted file mode 100644 index 3bf1009543..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrarcm/tegrarcm-1.2.ebuild +++ /dev/null @@ -1,30 +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 - -EGIT_REPO_URI="git://nv-tegra.nvidia.com/tools/tegrarcm.git" -EGIT_COMMIT="v${PV}" -inherit git-2 - -inherit autotools - -DESCRIPTION="Utility for downloading code to tegra system in recovery mode" -HOMEPAGE="http://sourceforge.net/projects/tegra-rcm/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-libs/crypto++-5.6 - virtual/libusb:1" -DEPEND="${RDEPEND}" - -src_prepare() { - eautoreconf -} - -src_install() { - dobin src/tegrarcm -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-0.0.1-r3.ebuild deleted file mode 100644 index 964659e7a4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-0.0.1-r3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_COMMIT="1be161a89525d840e1f6d1f21b3f45645a7dedb3" -CROS_WORKON_TREE="aeb5f4b3e2d7743026b2c267a4424203c924ffeb" -CROS_WORKON_PROJECT="chromiumos/third_party/tegrastats" - -DESCRIPTION="Software to inspect and adjust DVFS parameters on tegra." -HOMEPAGE="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm" -IUSE="" - -inherit cros-workon toolchain-funcs - -RDEPEND="" -DEPEND="" - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - emake || die "emake failed" -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - doexe tegrastats/tegrastats || die "doexe failed" - doexe dfs_stress/dfs_stress || die "doexe failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-9999.ebuild deleted file mode 100644 index 18352cd385..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-embedded/tegrastats/tegrastats-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_PROJECT="chromiumos/third_party/tegrastats" - -DESCRIPTION="Software to inspect and adjust DVFS parameters on tegra." -HOMEPAGE="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="" - -inherit cros-workon toolchain-funcs - -RDEPEND="" -DEPEND="" - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - emake || die "emake failed" -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - doexe tegrastats/tegrastats || die "doexe failed" - doexe dfs_stress/dfs_stress || die "doexe failed" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/Manifest deleted file mode 100644 index 753f28cd8b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -DIST icedtea6-bin-core-1.6.2-r2-amd64.tar.bz2 35017403 RMD160 63a96e552f965958b7363d2981d644ce53c0d06e SHA1 f0eb52a7931a8d5ccd52e66215de3161be4ca878 SHA256 592dab401eeb917d318654d415dc2f0d67072e2c580d55dd9effafc5d216dae1 -DIST icedtea6-bin-core-1.6.2-r2-x86.tar.bz2 36159131 RMD160 ae9dfa92b901dbfec7d8328b51a64902190ecc4c SHA1 1b8cd20efd9f68dd7a5a785676f95accdf5dcf12 SHA256 2f54786a29f30c241cce0b70ab1f248058fe78c3c98d0de1f0bd16483b888d9c -DIST icedtea6-bin-doc-1.6.2-r2.tar.bz2 11510147 RMD160 b86886925754856cf08c785fdd8a80dd59811966 SHA1 1a96565f44d635fcb23bdebc8af88ca9cf737754 SHA256 024ac62c13e8fbcf0830c1e360c85b295289df1fdba65bd674928d3f8904e605 -DIST icedtea6-bin-examples-1.6.2-r2-amd64.tar.bz2 2175800 RMD160 d0a46694e41d93db51a6935727dd39b8c3239b1f SHA1 08eb009e0d7cd5bb82b28d14ee87416db6e214cd SHA256 ff8fdcdcf9d2b89b4f29e63e27ce8aedde1175593ccbe0367a46c9c4ec1d10d9 -DIST icedtea6-bin-examples-1.6.2-r2-x86.tar.bz2 2139371 RMD160 8cd334021b118de0b3b3313a88a9f4b9bf54886b SHA1 0c44c070f0f612ee0e7361545fa14ed048ee9afb SHA256 2725142d2b6c3f965d173d23357b610bae0f88ad3c75b88d6ad30494619ecc31 -DIST icedtea6-bin-nsplugin-1.6.2-r2-amd64.tar.bz2 87974 RMD160 6db9830f6c59524513bdd200b8f645677f8764d2 SHA1 511392dcce3b56a97222488927ee4f66db969303 SHA256 4c8a5cb3c0d71cf14f464e4a99fd94515de8755f9d318a6d03959f710c0909ad -DIST icedtea6-bin-nsplugin-1.6.2-r2-x86.tar.bz2 75695 RMD160 6ec9b559386334da68eb464b847bd082b60886e7 SHA1 37c0ab74ad64b5cea1aca01747599f0fa1201519 SHA256 3b3b31cd004700cc68d3def11df9e0cef9c679bb2ae867256570a185d483538d -DIST icedtea6-bin-src-1.6.2-r2.tar.bz2 26607726 RMD160 8ae63a6e69b42b3745014ef0ba43d1f494c07997 SHA1 ad3631199b021024245c181c86c2d400512ffdf1 SHA256 afad5f25f8ef7aa58bee06094316da26256e1a3c48a950ed27371a9fc5270865 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/files/icedtea6-bin.env b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/files/icedtea6-bin.env deleted file mode 100644 index c896da51d7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/files/icedtea6-bin.env +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/files/icedtea6-bin.env,v 1.1 2008/12/24 22:22:37 caster Exp $ - -VERSION="IcedTea6-bin @PV@" -JAVA_HOME=/opt/@P@ -JDK_HOME=/opt/@P@ -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" -MANPATH="/opt/@P@/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.6" -# Taken from sun.boot.class.path property -BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r3.ebuild deleted file mode 100644 index 43e8fc8148..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild,v 1.3 2010/02/19 19:35:21 maekke Exp $ - -EAPI="1" - -inherit java-vm-2 - -dist="mirror://gentoo/" -DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK" -TARBALL_VERSION="${PV}-r2" -SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 ) - x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 ) - doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 ) - examples? ( - amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 ) - x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 ) - ) - nsplugin? ( - amd64? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 ) - x86? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 ) - ) - source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )" -HOMEPAGE="http://icedtea.classpath.org" - -IUSE="X alsa doc examples nsplugin source" -RESTRICT="strip" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0" -KEYWORDS="amd64 x86" - -S="${WORKDIR}/${PN}-${TARBALL_VERSION}" - -RDEPEND=">=sys-devel/gcc-4.3 - >=sys-libs/glibc-2.9 - >=media-libs/giflib-4.1.6-r1 - virtual/jpeg - >=media-libs/libpng-1.2.38 - >=sys-libs/zlib-1.2.3-r1 - alsa? ( >=media-libs/alsa-lib-1.0.20 ) - X? ( - >=media-libs/freetype-2.3.9:2 - >=media-libs/fontconfig-2.6.0-r2:1.0 - >=x11-libs/libXext-1.0.5 - >=x11-libs/libXi-1.2.1 - >=x11-libs/libXtst-1.0.3 - >=x11-libs/libX11-1.2.2 - x11-libs/libXt - ) - nsplugin? ( - >=dev-libs/atk-1.26.0 - >=dev-libs/glib-2.20.5:2 - >=dev-libs/nspr-4.8 - >=x11-libs/cairo-1.8.8 - >=x11-libs/gtk+-2.16.6:2 - >=x11-libs/pango-1.24.5 - )" -DEPEND="" - -QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/server/libjvm.so" -QA_EXECSTACK_x86="opt/${P}/jre/lib/i386/server/libjvm.so - opt/${P}/jre/lib/i386/client/libjvm.so" - -src_install() { - local dest="/opt/${P}" - local ddest="${D}/${dest}" - dodir "${dest}" || die - - local arch=${ARCH} - - # doins can't handle symlinks. - cp -pRP bin include jre lib man "${ddest}" || die "failed to copy" - - dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die - if use doc ; then - dohtml -r ../doc/html/* || die "Failed to install documentation" - fi - - if use examples; then - cp -pRP share/{demo,sample} "${ddest}" || die - fi - - if use source ; then - cp src.zip "${ddest}" || die - fi - - if use nsplugin ; then - use x86 && arch=i386 - install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so" - fi - - set_java_env - java-vm_revdep-mask -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - if use nsplugin; then - elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin" - elog "Note that the plugin works only in browsers based on xulrunner-1.9.1" - elog "such as Firefox 3.5, and not in other versions! xulrunner-1.9.2 (Firefox 3.6)" - elog "is not supported by upstream yet." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.1-r26 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.1-r26 deleted file mode 100644 index c767d32221..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.1-r26 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Utility for signing Tegra2 boot images -EAPI=2 -HOMEPAGE=http://git.chromium.org -IUSE=cros_workon_tree_3c1f68b1c84462e5e30c6f8f6f354ecff67f44bd -KEYWORDS=amd64 arm x86 -LICENSE=GPLv2 -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_=acad41ae17e123a35451a5d1225c321b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2 deleted file mode 100644 index 266c2eaf54..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=install unpack -DEPEND=dev-vcs/git -DESCRIPTION=Utility for signing Tegra2 boot images -EAPI=4 -HOMEPAGE=http://nv-tegra.nvidia.com/gitweb/?p=tools/cbootimage.git -KEYWORDS=amd64 arm x86 -LICENSE=GPLv2 -SLOT=0 -_eclasses_=git-2 da60d6e85fa94cef4d510cab24e01e36 -_md5_=05892305a5a6dcaf3e0203bd9b4537eb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2-r1 deleted file mode 100644 index 266c2eaf54..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-0.0.2-r1 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=install unpack -DEPEND=dev-vcs/git -DESCRIPTION=Utility for signing Tegra2 boot images -EAPI=4 -HOMEPAGE=http://nv-tegra.nvidia.com/gitweb/?p=tools/cbootimage.git -KEYWORDS=amd64 arm x86 -LICENSE=GPLv2 -SLOT=0 -_eclasses_=git-2 da60d6e85fa94cef4d510cab24e01e36 -_md5_=05892305a5a6dcaf3e0203bd9b4537eb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-9999 deleted file mode 100644 index 901953ea7b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/cbootimage-9999 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Utility for signing Tegra2 boot images -EAPI=2 -HOMEPAGE=http://git.chromium.org -IUSE=cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=GPLv2 -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_=e82c175813fe805c599d763ad9b2576b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.4_rc1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.4_rc1 deleted file mode 100644 index ddc699bd12..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.4_rc1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=dev-embedded/libftdi-0.19 dev-libs/confuse || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Utility to program external EEPROM for FTDI USB chips -EAPI=2 -HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/ -KEYWORDS=x86 amd64 -LICENSE=LGPL-2 -RDEPEND=>=dev-embedded/libftdi-0.19 dev-libs/confuse -SLOT=0 -SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/ftdi_eeprom-0.4_rc1.tar.gz -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=5ae88b325ebe097da461933662574597 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-0.0.1-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-0.0.1-r4 deleted file mode 100644 index 998bd94fee..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-0.0.1-r4 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Utility monitoring power usage on Harmony and Seaboard -EAPI=2 -IUSE=cros_workon_tree_9e4e01d060cdaf9232236674d7e2a5bd14f1dfae -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_=1a35f5228e4d8ab67933f7aa2ff26ff3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-9999 deleted file mode 100644 index 64e42c9396..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegra-power-query-9999 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Utility monitoring power usage on Harmony and Seaboard -EAPI=2 -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_=8ae9c5833be8c38a0a3a8e86da0d78ed diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.1 deleted file mode 100644 index ad89de3202..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.1 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install unpack -DEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 dev-vcs/git -DESCRIPTION=Utility for downloading code to tegra system in recovery mode -EAPI=4 -HOMEPAGE=http://sourceforge.net/projects/tegra-rcm/ -KEYWORDS=amd64 x86 -LICENSE=BSD -RDEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 -SLOT=0 -_eclasses_=git-2 da60d6e85fa94cef4d510cab24e01e36 -_md5_=cdb4af0606e6cad577fe408c9999e61b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2 deleted file mode 100644 index e475e7597d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install prepare unpack -DEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Utility for downloading code to tegra system in recovery mode -EAPI=4 -HOMEPAGE=http://sourceforge.net/projects/tegra-rcm/ -KEYWORDS=amd64 x86 -LICENSE=BSD -RDEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=cbed7b0a86693248a0a4f828af36e209 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2-r1 deleted file mode 100644 index e475e7597d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrarcm-1.2-r1 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install prepare unpack -DEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Utility for downloading code to tegra system in recovery mode -EAPI=4 -HOMEPAGE=http://sourceforge.net/projects/tegra-rcm/ -KEYWORDS=amd64 x86 -LICENSE=BSD -RDEPEND=>=dev-libs/crypto++-5.6 virtual/libusb:1 -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=cbed7b0a86693248a0a4f828af36e209 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-0.0.1-r3 deleted file mode 100644 index fd556c01af..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-0.0.1-r3 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Based on the eutils eclass -EAPI=2 -IUSE=cros_workon_tree_aeb5f4b3e2d7743026b2c267a4424203c924ffeb -KEYWORDS=amd64 arm -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_=7a73342dd75ffface546eae8e6203407 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-9999 deleted file mode 100644 index ce910bc0b0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-embedded/tegrastats-9999 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile info install setup unpack -DEPEND=dev-vcs/git -DESCRIPTION=Based on the eutils eclass -EAPI=2 -IUSE=cros_workon_tree_ -KEYWORDS=~amd64 ~arm -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_=550bd591273d966e70daeb492221dc20 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/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 deleted file mode 100644 index d7c55cc65e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 +++ /dev/null @@ -1,7 +0,0 @@ -DEFINED_PHASES=install -DESCRIPTION=Rules for setting permissions right on /dev/mali0 -EAPI=4 -KEYWORDS=arm -LICENSE=BSD -SLOT=0 -_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 deleted file mode 100644 index d7c55cc65e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 +++ /dev/null @@ -1,7 +0,0 @@ -DEFINED_PHASES=install -DESCRIPTION=Rules for setting permissions right on /dev/mali0 -EAPI=4 -KEYWORDS=arm -LICENSE=BSD -SLOT=0 -_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 deleted file mode 100644 index b393638a07..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack -DEPEND==sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !=x11-libs/libvdpau-0.3-r1 gtk? ( media-video/nvidia-settings ) -RDEPEND==sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git -DESCRIPTION=Chromium OS multitouch driver regression tests. -EAPI=4 -IUSE=cros_workon_tree_7d097ae9d618817e2c9a274a07c3ec207a631583 -KEYWORDS=arm amd64 x86 -LICENSE=BSD -RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=8a5ea11aa36a73c4e56db6ab6f8ef1ac diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 deleted file mode 100644 index 5e5eafb18d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure info install prepare setup test unpack -DEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git -DESCRIPTION=Chromium OS multitouch driver regression tests. -EAPI=4 -IUSE=cros_workon_tree_ -KEYWORDS=~arm amd64 ~x86 -LICENSE=BSD -RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=3c61498470d6bd908bb97cf565c66646 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 deleted file mode 100644 index 35f8c15ac9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure info install prepare setup test unpack -DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git -DESCRIPTION=Chromium OS multitouch input driver for Xorg X server. -EAPI=4 -IUSE=cros_workon_tree_3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1 -KEYWORDS=arm amd64 x86 -LICENSE=BSD -RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=cf420d228f97cd5a8b4ee387258f2506 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 deleted file mode 100644 index e21f0078bc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure info install prepare setup test unpack -DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git -DESCRIPTION=Chromium OS multitouch input driver for Xorg X server. -EAPI=4 -IUSE=cros_workon_tree_ -KEYWORDS=~arm ~amd64 ~x86 -LICENSE=BSD -RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=d96ebc46f1e988ac78f9b3120ae18bc5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 deleted file mode 100644 index 033c11a317..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg] -DESCRIPTION=Generic Linux input driver -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 -LICENSE=MIT -RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg] -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=9d45ae64d4a90840058743a4ab653c51 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 deleted file mode 100644 index 033c11a317..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg] -DESCRIPTION=Generic Linux input driver -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 -LICENSE=MIT -RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg] -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=9d45ae64d4a90840058743a4ab653c51 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 deleted file mode 100644 index db0e1f8336..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack -DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git -DESCRIPTION=X.Org driver for ARM devices -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=cros_workon_tree_0d2d6cd5e23e84585ebe72df251360086c8408bf -KEYWORDS=-* arm -LICENSE=MIT -RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-armsoc-0.0.1.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=76626a63ead6a130a7b910ce5e45c597 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 deleted file mode 100644 index 031ac9cdbc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack -DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git -DESCRIPTION=X.Org driver for ARM devices -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=cros_workon_tree_ -KEYWORDS=-* ~arm -LICENSE=MIT -RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=944ebfd311dc1090a8066b5328a5fcf8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 deleted file mode 100644 index 968b108f5c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) >=x11-proto/dri2proto-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess -DESCRIPTION=X.Org driver for Intel cards -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=dri sna xvmc broken_partialswaps dri -KEYWORDS=amd64 ~ia64 x86 -x86-fbsd -LICENSE=MIT -RDEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.16.0.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=84828c443d7f2f2603fb2ab324282add diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 deleted file mode 100644 index c4cf1388f5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst unpack -DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0 -DESCRIPTION=Generic VESA video driver -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=debug -KEYWORDS=-* ~alpha amd64 ~ia64 x86 ~x86-fbsd -LICENSE=MIT -RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9 -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280 -_md5_=9ae88dd31766afb3218be4e38413dea4 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 "%s: %s\n", tag, program_name, message) < 0) { -+ int saved_errno = errno; -+ fclose (kmsg); -+ errno = saved_errno; -+ return -1; -+ } -+ -+ if (fclose (kmsg) < 0) -+ return -1; -+ -+ return 0; -+} -+ -+ -+/** - * crash_handler: - * @signum: signal number received. - * - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile.patch deleted file mode 100644 index 3fea7f645c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Naur upstart-0.6.3.orig/init/Makefile.am upstart-0.6.3.new/init/Makefile.am ---- upstart-0.6.3.orig/init/Makefile.am 2009-07-11 10:41:09.000000000 +0000 -+++ upstart-0.6.3.new/init/Makefile.am 2009-10-14 20:29:46.000000000 +0000 -@@ -69,7 +69,7 @@ - ../dbus/com.ubuntu.Upstart.xml - - $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ -+ $(NIH_DBUS_TOOL) \ - --mode=object --prefix=control --default-interface=com.ubuntu.Upstart0_6 \ - --output=$@ $< - -@@ -81,8 +81,8 @@ - com_ubuntu_Upstart_Job_XML = \ - ../dbus/com.ubuntu.Upstart.Job.xml - --$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ -+$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -+ $(NIH_DBUS_TOOL) \ - --mode=object --prefix=job_class --default-interface=com.ubuntu.Upstart0_6.Job \ - --output=$@ $< - -@@ -95,7 +95,7 @@ - ../dbus/com.ubuntu.Upstart.Instance.xml - - $(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ -+ $(NIH_DBUS_TOOL) \ - --mode=object --prefix=job --default-interface=com.ubuntu.Upstart0_6.Instance \ - --output=$@ $< - -diff -Naur upstart-0.6.3.orig/util/Makefile.am upstart-0.6.3.new/util/Makefile.am ---- upstart-0.6.3.orig/util/Makefile.am 2009-07-21 11:30:06.000000000 +0000 -+++ upstart-0.6.3.new/util/Makefile.am 2009-10-14 20:30:47.000000000 +0000 -@@ -90,7 +90,7 @@ - ../dbus/com.ubuntu.Upstart.xml - - $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ -+ $(NIH_DBUS_TOOL) \ - --mode=proxy --prefix=upstart --default-interface=com.ubuntu.Upstart0_6 \ - --output=$@ $< - -@@ -102,8 +102,8 @@ - com_ubuntu_Upstart_Job_XML = \ - ../dbus/com.ubuntu.Upstart.Job.xml - --$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ -+$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -+ $(NIH_DBUS_TOOL) \ - --mode=proxy --prefix=job_class --default-interface=com.ubuntu.Upstart0_6.Job \ - --output=$@ $< - -@@ -116,7 +116,7 @@ - ../dbus/com.ubuntu.Upstart.Instance.xml - - $(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool -- $(top_builddir)/nih-dbus-tool/nih-dbus-tool \ -+ $(NIH_DBUS_TOOL) \ - --mode=proxy --prefix=job --default-interface=com.ubuntu.Upstart0_6.Instance \ - --output=$@ $< - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile2.patch deleted file mode 100644 index f33bce0380..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.3-cross-compile2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur upstart-0.6.3.orig/nih-dbus-tool/Makefile.am upstart-0.6.3.new/nih-dbus-tool/Makefile.am ---- upstart-0.6.3.orig/nih-dbus-tool/Makefile.am 2009-07-31 08:15:52.000000000 +0000 -+++ upstart-0.6.3.new/nih-dbus-tool/Makefile.am 2009-10-14 21:53:52.000000000 +0000 -@@ -259,7 +259,7 @@ - $(MKDIR_P) `echo "$@" | \ - sed '/\//!d;s,/[^/]*$$,,' | \ - sort -u` -- $(builddir)/nih-dbus-tool --mode=object --prefix=my --output=$@ $< -+ $(NIH_DBUS_TOOL) --mode=object --prefix=my --output=$@ $< - - - com_netsplit_Nih_Test_proxy_OUTPUTS = \ -@@ -273,7 +273,7 @@ - $(MKDIR_P) `echo "$@" | \ - sed '/\//!d;s,/[^/]*$$,,' | \ - sort -u` -- $(builddir)/nih-dbus-tool --mode=proxy --prefix=proxy --output=$@ $< -+ $(NIH_DBUS_TOOL) --mode=proxy --prefix=proxy --output=$@ $< - - - # These have to be built sources because we can't compile test_*.o without diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.6-introspection.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.6-introspection.patch deleted file mode 100644 index f02494bb2e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-0.6.6-introspection.patch +++ /dev/null @@ -1,712 +0,0 @@ -=== modified file 'dbus/com.ubuntu.Upstart.Job.xml' ---- dbus/com.ubuntu.Upstart.Job.xml 2009-07-03 16:28:21 +0000 -+++ dbus/com.ubuntu.Upstart.Job.xml 2010-12-10 02:43:11 +0000 -@@ -3,7 +3,7 @@ - - com.ubuntu.Upstart.Job.xml - interface definition for job objects - -- Copyright © 2009 Canonical Ltd. -+ Copyright © 2010 Canonical Ltd. - Author: Scott James Remnant . - - This file is free software; Canonical Ltd gives unlimited permission -@@ -67,5 +67,10 @@ - - - -+ -+ -+ -+ -+ - - - -=== modified file 'init/job_class.c' ---- init/job_class.c 2010-12-13 18:15:24 +0000 -+++ init/job_class.c 2010-12-14 15:30:06 +0000 -@@ -2,7 +2,7 @@ - * - * job_class.c - job class definition handling - * -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2010 Canonical Ltd. - * Author: Scott James Remnant . - * - * This program is free software; you can redistribute it and/or modify -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -1161,3 +1162,198 @@ - - return 0; - } -+ -+ -+/** -+ * job_class_get_start_on: -+ * @class: class to obtain events from, -+ * @message: D-Bus connection and message received, -+ * @start_on: pointer for reply array. -+ * -+ * Implements the get method for the start_on property of the -+ * com.ubuntu.Upstart.Job interface. -+ * -+ * Called to obtain the set of events that will start jobs of the given -+ * @class, this is returned as an array of the event tree flattened into -+ * reverse polish form. -+ * -+ * Each array element is an array of strings representing the events, -+ * or a single element containing "/OR" or "/AND" to represent the -+ * operators. -+ * -+ * Returns: zero on success, negative value on raised error. -+ **/ -+int -+job_class_get_start_on (JobClass * class, -+ NihDBusMessage *message, -+ char **** start_on) -+{ -+ size_t len = 0; -+ -+ nih_assert (class != NULL); -+ nih_assert (message != NULL); -+ nih_assert (start_on != NULL); -+ -+ *start_on = nih_alloc (message, sizeof (char ***)); -+ if (! *start_on) -+ nih_return_no_memory_error (-1); -+ -+ len = 0; -+ (*start_on)[len] = NULL; -+ -+ if (class->start_on) { -+ NIH_TREE_FOREACH_POST (&class->start_on->node, iter) { -+ EventOperator *oper = (EventOperator *)iter; -+ -+ *start_on = nih_realloc (*start_on, message, -+ sizeof (char ***) * (len + 2)); -+ if (! *start_on) -+ nih_return_no_memory_error (-1); -+ -+ (*start_on)[len] = nih_str_array_new (*start_on); -+ if (! (*start_on)[len]) -+ nih_return_no_memory_error (-1); -+ -+ switch (oper->type) { -+ case EVENT_OR: -+ if (! nih_str_array_add (&(*start_on)[len], *start_on, -+ NULL, "/OR")) -+ nih_return_no_memory_error (-1); -+ break; -+ case EVENT_AND: -+ if (! nih_str_array_add (&(*start_on)[len], *start_on, -+ NULL, "/AND")) -+ nih_return_no_memory_error (-1); -+ break; -+ case EVENT_MATCH: -+ if (! nih_str_array_add (&(*start_on)[len], *start_on, -+ NULL, oper->name)) -+ nih_return_no_memory_error (-1); -+ if (oper->env) -+ if (! nih_str_array_append (&(*start_on)[len], *start_on, -+ NULL, oper->env)) -+ nih_return_no_memory_error (-1); -+ break; -+ } -+ -+ (*start_on)[++len] = NULL; -+ } -+ } -+ -+ return 0; -+} -+ -+/** -+ * job_class_get_stop_on: -+ * @class: class to obtain events from, -+ * @message: D-Bus connection and message received, -+ * @stop_on: pointer for reply array. -+ * -+ * Implements the get method for the stop_on property of the -+ * com.ubuntu.Upstart.Job interface. -+ * -+ * Called to obtain the set of events that will stop jobs of the given -+ * @class, this is returned as an array of the event tree flattened into -+ * reverse polish form. -+ * -+ * Each array element is an array of strings representing the events, -+ * or a single element containing "/OR" or "/AND" to represent the -+ * operators. -+ * -+ * Returns: zero on success, negative value on raised error. -+ **/ -+int -+job_class_get_stop_on (JobClass * class, -+ NihDBusMessage *message, -+ char **** stop_on) -+{ -+ size_t len = 0; -+ -+ nih_assert (class != NULL); -+ nih_assert (message != NULL); -+ nih_assert (stop_on != NULL); -+ -+ *stop_on = nih_alloc (message, sizeof (char ***)); -+ if (! *stop_on) -+ nih_return_no_memory_error (-1); -+ -+ len = 0; -+ (*stop_on)[len] = NULL; -+ -+ if (class->stop_on) { -+ NIH_TREE_FOREACH_POST (&class->stop_on->node, iter) { -+ EventOperator *oper = (EventOperator *)iter; -+ -+ *stop_on = nih_realloc (*stop_on, message, -+ sizeof (char ***) * (len + 2)); -+ if (! *stop_on) -+ nih_return_no_memory_error (-1); -+ -+ (*stop_on)[len] = nih_str_array_new (*stop_on); -+ if (! (*stop_on)[len]) -+ nih_return_no_memory_error (-1); -+ -+ switch (oper->type) { -+ case EVENT_OR: -+ if (! nih_str_array_add (&(*stop_on)[len], *stop_on, -+ NULL, "/OR")) -+ nih_return_no_memory_error (-1); -+ break; -+ case EVENT_AND: -+ if (! nih_str_array_add (&(*stop_on)[len], *stop_on, -+ NULL, "/AND")) -+ nih_return_no_memory_error (-1); -+ break; -+ case EVENT_MATCH: -+ if (! nih_str_array_add (&(*stop_on)[len], *stop_on, -+ NULL, oper->name)) -+ nih_return_no_memory_error (-1); -+ if (oper->env) -+ if (! nih_str_array_append (&(*stop_on)[len], *stop_on, -+ NULL, oper->env)) -+ nih_return_no_memory_error (-1); -+ break; -+ } -+ -+ (*stop_on)[++len] = NULL; -+ } -+ } -+ -+ return 0; -+} -+ -+/** -+ * job_class_get_emits: -+ * @class: class to obtain events from, -+ * @message: D-Bus connection and message received, -+ * @emits: pointer for reply array. -+ * -+ * Implements the get method for the emits property of the -+ * com.ubuntu.Upstart.Job interface. -+ * -+ * Called to obtain the list of additional events of the given @class -+ * which will be stored as an array in @emits. -+ * -+ * Returns: zero on success, negative value on raised error. -+ **/ -+int -+job_class_get_emits (JobClass * class, -+ NihDBusMessage *message, -+ char *** emits) -+{ -+ nih_assert (class != NULL); -+ nih_assert (message != NULL); -+ nih_assert (emits != NULL); -+ -+ if (class->emits) { -+ *emits = nih_str_array_copy (message, NULL, class->emits); -+ if (! *emits) -+ nih_return_no_memory_error (-1); -+ } else { -+ *emits = nih_str_array_new (message); -+ if (! *emits) -+ nih_return_no_memory_error (-1); -+ } -+ -+ return 0; -+} - -=== modified file 'init/job_class.h' ---- init/job_class.h 2010-12-13 18:15:24 +0000 -+++ init/job_class.h 2010-12-14 15:30:06 +0000 -@@ -1,6 +1,6 @@ - /* upstart - * -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2010 Canonical Ltd. - * Author: Scott James Remnant . - * - * This program is free software; you can redistribute it and/or modify -@@ -220,6 +220,16 @@ - char **version) - __attribute__ ((warn_unused_result)); - -+int job_class_get_start_on (JobClass *class, -+ NihDBusMessage *message, -+ char ****start_on); -+int job_class_get_stop_on (JobClass *class, -+ NihDBusMessage *message, -+ char ****stop_on); -+int job_class_get_emits (JobClass *class, -+ NihDBusMessage *message, -+ char ***emits); -+ - NIH_END_EXTERN - - #endif /* INIT_JOB_CLASS_H */ - -=== modified file 'init/tests/test_job_class.c' ---- init/tests/test_job_class.c 2009-07-09 11:50:19 +0000 -+++ init/tests/test_job_class.c 2010-12-14 15:09:52 +0000 -@@ -2,7 +2,7 @@ - * - * test_job_class.c - test suite for init/job_class.c - * -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2010 Canonical Ltd. - * Author: Scott James Remnant . - * - * This program is free software; you can redistribute it and/or modify -@@ -3232,6 +3232,415 @@ - } - } - -+void -+test_get_start_on (void) -+{ -+ NihDBusMessage *message = NULL; -+ JobClass *class = NULL; -+ EventOperator *oper = NULL; -+ EventOperator *and_oper = NULL; -+ NihError *error; -+ char ***start_on; -+ int ret; -+ -+ TEST_FUNCTION ("job_class_get_start_on"); -+ -+ /* Check that the job's start_on tree is returned as a flattened -+ * array of string arrays, as a child of the message. -+ */ -+ TEST_FEATURE ("with event tree"); -+ nih_error_init (); -+ job_class_init (); -+ -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ class = job_class_new (NULL, "test"); -+ -+ class->start_on = event_operator_new ( -+ class, EVENT_OR, NULL, NULL); -+ -+ and_oper = event_operator_new ( -+ class, EVENT_AND, NULL, NULL); -+ nih_tree_add (&class->start_on->node, &and_oper->node, -+ NIH_TREE_LEFT); -+ -+ oper = event_operator_new ( -+ class->start_on, EVENT_MATCH, "foo", NULL); -+ oper->env = nih_str_array_new (oper); -+ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "omnomnom")); -+ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "ABER=crombie")); -+ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "HOBBIT=frodo")); -+ -+ nih_tree_add (&class->start_on->node, &oper->node, -+ NIH_TREE_RIGHT); -+ -+ oper = event_operator_new ( -+ class->start_on, EVENT_MATCH, "wibble", NULL); -+ nih_tree_add (&and_oper->node, &oper->node, -+ NIH_TREE_LEFT); -+ -+ oper = event_operator_new ( -+ class->start_on, EVENT_MATCH, "wobble", NULL); -+ nih_tree_add (&and_oper->node, &oper->node, -+ NIH_TREE_RIGHT); -+ -+ message = nih_new (NULL, NihDBusMessage); -+ message->connection = NULL; -+ message->message = NULL; -+ } -+ -+ start_on = NULL; -+ -+ ret = job_class_get_start_on (class, message, &start_on); -+ -+ if (test_alloc_failed) { -+ TEST_LT (ret, 0); -+ -+ error = nih_error_get (); -+ TEST_EQ (error->number, ENOMEM); -+ nih_free (error); -+ -+ nih_free (message); -+ nih_free (class); -+ continue; -+ } -+ -+ TEST_EQ (ret, 0); -+ -+ TEST_ALLOC_PARENT (start_on, message); -+ TEST_ALLOC_SIZE (start_on, sizeof (char **) * 6); -+ -+ TEST_ALLOC_SIZE (start_on[0], sizeof (char *) * 2); -+ TEST_EQ_STR (start_on[0][0], "wibble"); -+ TEST_EQ_P (start_on[0][1], NULL); -+ -+ TEST_ALLOC_SIZE (start_on[1], sizeof (char *) * 2); -+ TEST_EQ_STR (start_on[1][0], "wobble"); -+ TEST_EQ_P (start_on[1][1], NULL); -+ -+ TEST_ALLOC_SIZE (start_on[2], sizeof (char *) * 2); -+ TEST_EQ_STR (start_on[2][0], "/AND"); -+ TEST_EQ_P (start_on[2][1], NULL); -+ -+ TEST_ALLOC_SIZE (start_on[3], sizeof (char *) * 5); -+ TEST_EQ_STR (start_on[3][0], "foo"); -+ TEST_EQ_STR (start_on[3][1], "omnomnom"); -+ TEST_EQ_STR (start_on[3][2], "ABER=crombie"); -+ TEST_EQ_STR (start_on[3][3], "HOBBIT=frodo"); -+ TEST_EQ_P (start_on[3][4], NULL); -+ -+ TEST_ALLOC_SIZE (start_on[4], sizeof (char *) * 2); -+ TEST_EQ_STR (start_on[4][0], "/OR"); -+ TEST_EQ_P (start_on[4][1], NULL); -+ -+ TEST_EQ_P (start_on[5], NULL); -+ -+ nih_free (message); -+ nih_free (class); -+ } -+ -+ -+ /* Check that an empty array is returned when the job has no -+ * start_on operator tree. -+ */ -+ TEST_FEATURE ("with no events"); -+ nih_error_init (); -+ job_class_init (); -+ -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ class = job_class_new (NULL, "test"); -+ -+ message = nih_new (NULL, NihDBusMessage); -+ message->connection = NULL; -+ message->message = NULL; -+ } -+ -+ start_on = NULL; -+ -+ ret = job_class_get_start_on (class, message, &start_on); -+ -+ if (test_alloc_failed) { -+ TEST_LT (ret, 0); -+ -+ error = nih_error_get (); -+ TEST_EQ (error->number, ENOMEM); -+ nih_free (error); -+ -+ nih_free (message); -+ nih_free (class); -+ continue; -+ } -+ -+ TEST_EQ (ret, 0); -+ -+ TEST_ALLOC_PARENT (start_on, message); -+ TEST_ALLOC_SIZE (start_on, sizeof (char **)); -+ TEST_EQ_P (start_on[0], NULL); -+ -+ nih_free (message); -+ nih_free (class); -+ } -+} -+ -+void -+test_get_stop_on (void) -+{ -+ NihDBusMessage *message = NULL; -+ JobClass *class = NULL; -+ EventOperator *oper = NULL; -+ EventOperator *and_oper = NULL; -+ NihError *error; -+ char ***stop_on; -+ int ret; -+ -+ TEST_FUNCTION ("job_class_get_stop_on"); -+ -+ /* Check that the job's stop_on tree is returned as a flattened -+ * array of string arrays, as a child of the message. -+ */ -+ TEST_FEATURE ("with event tree"); -+ nih_error_init (); -+ job_class_init (); -+ -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ class = job_class_new (NULL, "test"); -+ -+ class->stop_on = event_operator_new ( -+ class, EVENT_OR, NULL, NULL); -+ -+ and_oper = event_operator_new ( -+ class, EVENT_AND, NULL, NULL); -+ nih_tree_add (&class->stop_on->node, &and_oper->node, -+ NIH_TREE_LEFT); -+ -+ oper = event_operator_new ( -+ class->stop_on, EVENT_MATCH, "foo", NULL); -+ oper->env = nih_str_array_new (oper); -+ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "omnomnom")); -+ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "ABER=crombie")); -+ NIH_MUST (nih_str_array_add (&oper->env, oper, NULL, "HOBBIT=frodo")); -+ -+ nih_tree_add (&class->stop_on->node, &oper->node, -+ NIH_TREE_RIGHT); -+ -+ oper = event_operator_new ( -+ class->stop_on, EVENT_MATCH, "wibble", NULL); -+ nih_tree_add (&and_oper->node, &oper->node, -+ NIH_TREE_LEFT); -+ -+ oper = event_operator_new ( -+ class->stop_on, EVENT_MATCH, "wobble", NULL); -+ nih_tree_add (&and_oper->node, &oper->node, -+ NIH_TREE_RIGHT); -+ -+ message = nih_new (NULL, NihDBusMessage); -+ message->connection = NULL; -+ message->message = NULL; -+ } -+ -+ stop_on = NULL; -+ -+ ret = job_class_get_stop_on (class, message, &stop_on); -+ -+ if (test_alloc_failed) { -+ TEST_LT (ret, 0); -+ -+ error = nih_error_get (); -+ TEST_EQ (error->number, ENOMEM); -+ nih_free (error); -+ -+ nih_free (message); -+ nih_free (class); -+ continue; -+ } -+ -+ TEST_EQ (ret, 0); -+ -+ TEST_ALLOC_PARENT (stop_on, message); -+ TEST_ALLOC_SIZE (stop_on, sizeof (char **) * 6); -+ -+ TEST_ALLOC_SIZE (stop_on[0], sizeof (char *) * 2); -+ TEST_EQ_STR (stop_on[0][0], "wibble"); -+ TEST_EQ_P (stop_on[0][1], NULL); -+ -+ TEST_ALLOC_SIZE (stop_on[1], sizeof (char *) * 2); -+ TEST_EQ_STR (stop_on[1][0], "wobble"); -+ TEST_EQ_P (stop_on[1][1], NULL); -+ -+ TEST_ALLOC_SIZE (stop_on[2], sizeof (char *) * 2); -+ TEST_EQ_STR (stop_on[2][0], "/AND"); -+ TEST_EQ_P (stop_on[2][1], NULL); -+ -+ TEST_ALLOC_SIZE (stop_on[3], sizeof (char *) * 5); -+ TEST_EQ_STR (stop_on[3][0], "foo"); -+ TEST_EQ_STR (stop_on[3][1], "omnomnom"); -+ TEST_EQ_STR (stop_on[3][2], "ABER=crombie"); -+ TEST_EQ_STR (stop_on[3][3], "HOBBIT=frodo"); -+ TEST_EQ_P (stop_on[3][4], NULL); -+ -+ TEST_ALLOC_SIZE (stop_on[4], sizeof (char *) * 2); -+ TEST_EQ_STR (stop_on[4][0], "/OR"); -+ TEST_EQ_P (stop_on[4][1], NULL); -+ -+ TEST_EQ_P (stop_on[5], NULL); -+ -+ nih_free (message); -+ nih_free (class); -+ } -+ -+ -+ /* Check that an empty array is returned when the job has no -+ * stop_on operator tree. -+ */ -+ TEST_FEATURE ("with no events"); -+ nih_error_init (); -+ job_class_init (); -+ -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ class = job_class_new (NULL, "test"); -+ -+ message = nih_new (NULL, NihDBusMessage); -+ message->connection = NULL; -+ message->message = NULL; -+ } -+ -+ stop_on = NULL; -+ -+ ret = job_class_get_stop_on (class, message, &stop_on); -+ -+ if (test_alloc_failed) { -+ TEST_LT (ret, 0); -+ -+ error = nih_error_get (); -+ TEST_EQ (error->number, ENOMEM); -+ nih_free (error); -+ -+ nih_free (message); -+ nih_free (class); -+ continue; -+ } -+ -+ TEST_EQ (ret, 0); -+ -+ TEST_ALLOC_PARENT (stop_on, message); -+ TEST_ALLOC_SIZE (stop_on, sizeof (char **)); -+ TEST_EQ_P (stop_on[0], NULL); -+ -+ nih_free (message); -+ nih_free (class); -+ } -+} -+ -+void -+test_get_emits (void) -+{ -+ NihDBusMessage *message = NULL; -+ JobClass *class = NULL; -+ NihError *error; -+ char **emits; -+ int ret; -+ -+ TEST_FUNCTION ("job_class_get_emits"); -+ -+ /* Check that an array of strings is returned from the property -+ * as a child of the message when the job declares that it emits -+ * extra events. -+ */ -+ TEST_FEATURE ("with events"); -+ nih_error_init (); -+ job_class_init (); -+ -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ class = job_class_new (NULL, "test"); -+ class->emits = nih_str_array_new (class); -+ -+ NIH_MUST (nih_str_array_add (&class->emits, class, NULL, "foo")); -+ NIH_MUST (nih_str_array_add (&class->emits, class, NULL, "bar")); -+ NIH_MUST (nih_str_array_add (&class->emits, class, NULL, "baz")); -+ -+ message = nih_new (NULL, NihDBusMessage); -+ message->connection = NULL; -+ message->message = NULL; -+ } -+ -+ emits = NULL; -+ -+ ret = job_class_get_emits (class, message, &emits); -+ -+ if (test_alloc_failed) { -+ TEST_LT (ret, 0); -+ -+ error = nih_error_get (); -+ TEST_EQ (error->number, ENOMEM); -+ nih_free (error); -+ -+ nih_free (message); -+ nih_free (class); -+ continue; -+ } -+ -+ TEST_EQ (ret, 0); -+ -+ TEST_ALLOC_PARENT (emits, message); -+ TEST_ALLOC_SIZE (emits, sizeof (char *) * 4); -+ TEST_EQ_STR (emits[0], "foo"); -+ TEST_EQ_STR (emits[1], "bar"); -+ TEST_EQ_STR (emits[2], "baz"); -+ TEST_EQ_P (emits[3], NULL); -+ -+ nih_free (message); -+ nih_free (class); -+ } -+ -+ -+ /* Check that an empty array is returned from the property -+ * as a child of the message when the job doesn't declare -+ * any particular emitted events. -+ */ -+ TEST_FEATURE ("with no events"); -+ nih_error_init (); -+ job_class_init (); -+ -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ class = job_class_new (NULL, "test"); -+ -+ message = nih_new (NULL, NihDBusMessage); -+ message->connection = NULL; -+ message->message = NULL; -+ } -+ -+ emits = NULL; -+ -+ ret = job_class_get_emits (class, message, &emits); -+ -+ if (test_alloc_failed) { -+ TEST_LT (ret, 0); -+ -+ error = nih_error_get (); -+ TEST_EQ (error->number, ENOMEM); -+ nih_free (error); -+ -+ nih_free (message); -+ nih_free (class); -+ continue; -+ } -+ -+ TEST_EQ (ret, 0); -+ -+ TEST_ALLOC_PARENT (emits, message); -+ TEST_ALLOC_SIZE (emits, sizeof (char *)); -+ TEST_EQ_P (emits[0], NULL); -+ -+ nih_free (message); -+ nih_free (class); -+ } -+} -+ - - int - main (int argc, -@@ -3256,6 +3665,9 @@ - test_get_description (); - test_get_author (); - test_get_version (); -+ test_get_start_on (); -+ test_get_stop_on (); -+ test_get_emits (); - - return 0; - } - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-default-oom_score_adj.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-default-oom_score_adj.patch deleted file mode 100644 index 2c49cfbb09..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-default-oom_score_adj.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'init/job_class.h' ---- init/job_class.h 2011-08-11 21:02:51 +0000 -+++ init/job_class.h 2011-08-11 21:03:25 +0000 -@@ -108,7 +108,7 @@ - * - * The default OOM score adjustment for processes. - **/ --#define JOB_DEFAULT_OOM_SCORE_ADJ 0 -+#define JOB_DEFAULT_OOM_SCORE_ADJ -1000 - - /** - * JOB_DEFAULT_ENVIRONMENT: - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-fix-shell-redirect.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-fix-shell-redirect.patch deleted file mode 100644 index 4c8d47db64..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-fix-shell-redirect.patch +++ /dev/null @@ -1,237 +0,0 @@ -=== modified file 'init/job_process.c' ---- init/job_process.c 2011-03-22 17:46:46 +0000 -+++ init/job_process.c 2011-05-12 19:21:16 +0000 -@@ -145,7 +145,8 @@ - nih_local char *script = NULL; - char **e; - size_t argc, envc; -- int error = FALSE, fds[2], trace = FALSE, shell = FALSE; -+ int fds[2] = { -1, -1 }; -+ int error = FALSE, trace = FALSE, shell = FALSE; - - nih_assert (job != NULL); - -@@ -208,12 +209,9 @@ - - shell = TRUE; - -- /* FIXME actually always want it to be /proc/self/fd/3 and -- * dup2() in the child to make it that way ... no way -- * of passing that yet -- */ - cmd = NIH_MUST (nih_sprintf (argv, "%s/%d", -- "/proc/self/fd", fds[0])); -+ "/proc/self/fd", -+ JOB_PROCESS_SCRIPT_FD)); - NIH_MUST (nih_str_array_addp (&argv, NULL, - &argc, cmd)); - } -@@ -259,7 +257,7 @@ - - /* Spawn the process, repeat until fork() works */ - while ((job->pid[process] = job_process_spawn (job->class, argv, -- env, trace)) < 0) { -+ env, trace, fds[0])) < 0) { - NihError *err; - - err = nih_error_get (); -@@ -321,7 +319,8 @@ - * a path. Instruct the shell to close this extra fd and - * not to leak it. - */ -- NIH_ZERO (nih_io_printf (io, "exec %d<&-\n", fds[0])); -+ NIH_ZERO (nih_io_printf (io, "exec %d<&-\n", -+ JOB_PROCESS_SCRIPT_FD)); - - NIH_ZERO (nih_io_write (io, script, strlen (script))); - nih_io_shutdown (io); -@@ -336,7 +335,8 @@ - * @class: job class of process to be spawned, - * @argv: NULL-terminated list of arguments for the process, - * @env: NULL-terminated list of environment variables for the process, -- * @trace: whether to trace this process. -+ * @trace: whether to trace this process, -+ * @script_fd: script file descriptor. - * - * This function spawns a new process using the @class details to set up the - * environment for it; the process is always a session and process group -@@ -352,6 +352,9 @@ - * wait for this and then may use it to set options before continuing the - * process. - * -+ * If @script_fd is not -1, this file descriptor is dup()d to the special fd 9 -+ * (moving any other out of the way if necessary). -+ * - * This function only spawns the process, it is up to the caller to ensure - * that the information is saved into the job and that the process is watched, - * etc. -@@ -367,7 +370,8 @@ - job_process_spawn (JobClass *class, - char * const argv[], - char * const *env, -- int trace) -+ int trace, -+ int script_fd) - { - sigset_t child_set, orig_set; - pid_t pid; -@@ -433,8 +437,26 @@ - * far because read() returned zero. - */ - close (fds[0]); -+ if (fds[1] == JOB_PROCESS_SCRIPT_FD) { -+ int tmp = dup2 (fds[1], fds[0]); -+ if (tmp < 0) -+ job_process_error_abort (fds[1], JOB_PROCESS_ERROR_DUP, 0); -+ close (fds[1]); -+ fds[1] = tmp; -+ } - nih_io_set_cloexec (fds[1]); - -+ /* Move the script fd to special fd 9; the only gotcha is if that -+ * would be our error descriptor, but that's handled above. -+ */ -+ if ((script_fd != -1) && (script_fd != JOB_PROCESS_SCRIPT_FD)) { -+ int tmp = dup2 (script_fd, JOB_PROCESS_SCRIPT_FD); -+ if (tmp < 0) -+ job_process_error_abort (fds[1], JOB_PROCESS_ERROR_DUP, 0); -+ close (script_fd); -+ script_fd = tmp; -+ } -+ - /* Become the leader of a new session and process group, shedding - * any controlling tty (which we shouldn't have had anyway). - */ -@@ -664,6 +684,11 @@ - err->error.number = JOB_PROCESS_ERROR; - - switch (err->type) { -+ case JOB_PROCESS_ERROR_DUP: -+ err->error.message = NIH_MUST (nih_sprintf ( -+ err, _("unable to move script fd: %s"), -+ strerror (err->errnum))); -+ break; - case JOB_PROCESS_ERROR_CONSOLE: - err->error.message = NIH_MUST (nih_sprintf ( - err, _("unable to open console: %s"), - -=== modified file 'init/job_process.h' ---- init/job_process.h 2009-07-09 11:01:53 +0000 -+++ init/job_process.h 2011-05-12 19:21:16 +0000 -@@ -1,5 +1,6 @@ - /* upstart - * -+ * Copyright © 2011 Google Inc. - * Copyright © 2009 Canonical Ltd. - * Author: Scott James Remnant . - * -@@ -32,12 +33,23 @@ - - - /** -+ * JOB_PROCESS_SCRIPT_FD: -+ * -+ * The special fd used to pass the script to the shell process, this can be -+ * anything from 3-9 (0-2 are stdin/out/err, 10 and above aren't guaranteed -+ * by POSIX). -+ **/ -+#define JOB_PROCESS_SCRIPT_FD 9 -+ -+ -+/** - * JobProcessErrorType: - * - * These constants represent the different steps of process spawning that - * can produce an error. - **/ - typedef enum job_process_error_type { -+ JOB_PROCESS_ERROR_DUP, - JOB_PROCESS_ERROR_CONSOLE, - JOB_PROCESS_ERROR_RLIMIT, - JOB_PROCESS_ERROR_PRIORITY, -@@ -80,7 +92,7 @@ - int job_process_run (Job *job, ProcessType process); - - pid_t job_process_spawn (JobClass *class, char * const argv[], -- char * const *env, int trace) -+ char * const *env, int trace, int script_fd) - __attribute__ ((warn_unused_result)); - - void job_process_kill (Job *job, ProcessType process); - -=== modified file 'init/tests/test_job_process.c' ---- init/tests/test_job_process.c 2011-03-16 22:18:22 +0000 -+++ init/tests/test_job_process.c 2011-05-12 19:21:16 +0000 -@@ -822,7 +822,7 @@ - - class = job_class_new (NULL, "test"); - -- pid = job_process_spawn (class, args, NULL, FALSE); -+ pid = job_process_spawn (class, args, NULL, FALSE, -1); - TEST_GT (pid, 0); - - waitpid (pid, NULL, 0); -@@ -860,7 +860,7 @@ - class = job_class_new (NULL, "test"); - class->console = CONSOLE_NONE; - -- pid = job_process_spawn (class, args, NULL, FALSE); -+ pid = job_process_spawn (class, args, NULL, FALSE, -1); - TEST_GT (pid, 0); - - waitpid (pid, NULL, 0); -@@ -886,7 +886,7 @@ - class = job_class_new (NULL, "test"); - class->chdir = "/tmp"; - -- pid = job_process_spawn (class, args, NULL, FALSE); -+ pid = job_process_spawn (class, args, NULL, FALSE, -1); - TEST_GT (pid, 0); - - waitpid (pid, NULL, 0); -@@ -914,7 +914,7 @@ - - class = job_class_new (NULL, "test"); - -- pid = job_process_spawn (class, args, env, FALSE); -+ pid = job_process_spawn (class, args, env, FALSE, -1); - TEST_GT (pid, 0); - - waitpid (pid, NULL, 0); -@@ -939,7 +939,7 @@ - - class = job_class_new (NULL, "test"); - -- pid = job_process_spawn (class, args, NULL, FALSE); -+ pid = job_process_spawn (class, args, NULL, FALSE, -1); - TEST_GT (pid, 0); - - assert0 (waitid (P_PID, pid, &info, WEXITED | WSTOPPED | WCONTINUED)); -@@ -959,7 +959,7 @@ - - class = job_class_new (NULL, "test"); - -- pid = job_process_spawn (class, args, NULL, TRUE); -+ pid = job_process_spawn (class, args, NULL, TRUE, -1); - TEST_GT (pid, 0); - - assert0 (waitid (P_PID, pid, &info, WEXITED | WSTOPPED | WCONTINUED)); -@@ -988,7 +988,7 @@ - - class = job_class_new (NULL, "test"); - -- pid = job_process_spawn (class, args, NULL, FALSE); -+ pid = job_process_spawn (class, args, NULL, FALSE, -1); - TEST_LT (pid, 0); - - err = nih_error_get (); -@@ -1013,7 +1013,7 @@ - args[1] = function; - args[2] = NULL; - -- pid = job_process_spawn (class, args, NULL, FALSE); -+ pid = job_process_spawn (class, args, NULL, FALSE, -1); - TEST_GT (pid, 0); - - /* Ensure process is still running after some period of time. - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-kill-signal.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-kill-signal.patch deleted file mode 100644 index 89568f192d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-kill-signal.patch +++ /dev/null @@ -1,488 +0,0 @@ -=== modified file 'init/errors.h' ---- init/errors.h 2011-05-05 10:13:49 +0000 -+++ init/errors.h 2011-05-12 20:42:28 +0000 -@@ -40,6 +40,7 @@ - /* Errors while parsing configuration files */ - PARSE_ILLEGAL_INTERVAL, - PARSE_ILLEGAL_EXIT, -+ PARSE_ILLEGAL_SIGNAL, - PARSE_ILLEGAL_UMASK, - PARSE_ILLEGAL_NICE, - PARSE_ILLEGAL_OOM, -@@ -60,6 +61,7 @@ - #define ENVIRON_MISMATCHED_BRACES_STR N_("Mismatched braces") - #define PARSE_ILLEGAL_INTERVAL_STR N_("Illegal interval, expected number of seconds") - #define PARSE_ILLEGAL_EXIT_STR N_("Illegal exit status, expected integer") -+#define PARSE_ILLEGAL_SIGNAL_STR N_("Illegal signal status, expected integer") - #define PARSE_ILLEGAL_UMASK_STR N_("Illegal file creation mask, expected octal integer") - #define PARSE_ILLEGAL_NICE_STR N_("Illegal nice value, expected -20 to 19") - #define PARSE_ILLEGAL_OOM_STR N_("Illegal oom adjustment, expected -16 to 15 or 'never'") - -=== modified file 'init/job_class.c' ---- init/job_class.c 2011-05-05 10:13:49 +0000 -+++ init/job_class.c 2011-05-12 20:42:28 +0000 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #include - #include -@@ -199,6 +200,7 @@ - class->task = FALSE; - - class->kill_timeout = JOB_DEFAULT_KILL_TIMEOUT; -+ class->kill_signal = SIGTERM; - - class->respawn = FALSE; - class->respawn_limit = JOB_DEFAULT_RESPAWN_LIMIT; - -=== modified file 'init/job_class.h' ---- init/job_class.h 2011-05-12 19:31:50 +0000 -+++ init/job_class.h 2011-05-12 20:42:28 +0000 -@@ -85,6 +85,7 @@ - * @expect: what to expect before entering the next state after spawned, - * @task: start requests are not unblocked until instances have finished, - * @kill_timeout: time to wait between sending TERM and KILL signals, -+ * @kill_signal: first signal to send (usually SIGTERM), - * @respawn: instances should be restarted if main process fails, - * @respawn_limit: number of respawns in @respawn_interval that we permit, - * @respawn_interval: barrier for @respawn_limit, -@@ -129,6 +130,7 @@ - int task; - - time_t kill_timeout; -+ int kill_signal; - - int respawn; - int respawn_limit; - -=== modified file 'init/job_process.c' ---- init/job_process.c 2011-05-12 19:31:50 +0000 -+++ init/job_process.c 2011-05-12 20:42:28 +0000 -@@ -802,9 +802,9 @@ - * @process: process to be killed. - * - * This function forces a @job to leave its current state by sending -- * @process the TERM signal, and maybe later the KILL signal. The actual -- * state changes are performed by job_child_reaper when the process -- * has actually terminated. -+ * @process the "kill signal" defined signal (TERM by default), and maybe -+ * later the KILL signal. The actual state changes are performed by -+ * job_child_reaper when the process has actually terminated. - **/ - void - job_process_kill (Job *job, -@@ -815,15 +815,17 @@ - nih_assert (job->kill_timer == NULL); - nih_assert (job->kill_process = -1); - -- nih_info (_("Sending TERM signal to %s %s process (%d)"), -+ nih_info (_("Sending %s signal to %s %s process (%d)"), -+ nih_signal_to_name (job->class->kill_signal), - job_name (job), process_name (process), job->pid[process]); - -- if (system_kill (job->pid[process], FALSE) < 0) { -+ if (system_kill (job->pid[process], job->class->kill_signal) < 0) { - NihError *err; - - err = nih_error_get (); - if (err->number != ESRCH) -- nih_warn (_("Failed to send TERM signal to %s %s process (%d): %s"), -+ nih_warn (_("Failed to send %s signal to %s %s process (%d): %s"), -+ nih_signal_to_name (job->class->kill_signal), - job_name (job), process_name (process), - job->pid[process], err->message); - nih_free (err); -@@ -863,15 +865,17 @@ - job->kill_timer = NULL; - job->kill_process = -1; - -- nih_info (_("Sending KILL signal to %s %s process (%d)"), -+ nih_info (_("Sending %s signal to %s %s process (%d)"), -+ "KILL", - job_name (job), process_name (process), job->pid[process]); - -- if (system_kill (job->pid[process], TRUE) < 0) { -+ if (system_kill (job->pid[process], SIGKILL) < 0) { - NihError *err; - - err = nih_error_get (); - if (err->number != ESRCH) -- nih_warn (_("Failed to send KILL signal to %s %s process (%d): %s"), -+ nih_warn (_("Failed to send %s signal to %s %s process (%d): %s"), -+ "KILL", - job_name (job), process_name (process), - job->pid[process], err->message); - nih_free (err); - -=== modified file 'init/man/init.5' ---- init/man/init.5 2011-05-12 19:31:50 +0000 -+++ init/man/init.5 2011-05-12 20:42:28 +0000 -@@ -563,10 +563,20 @@ - .\" - .SS Miscellaneous - .TP -+.B kill signal \fISIGNAL -+Specifies the stopping signal, -+.I SIGTERM -+by default, a job's main process will receive when stopping the -+running job. -+ -+.nf -+kill signal INT -+.fi -+.\" -+.TP - .B kill timeout \fIINTERVAL - Specifies the interval between sending the job's main process the --.I SIGTERM --and -+"stopping" (see above) and - .I SIGKILL - signals when stopping the running job. - .\" - -=== modified file 'init/parse_job.c' ---- init/parse_job.c 2011-05-12 19:31:50 +0000 -+++ init/parse_job.c 2011-05-12 20:42:28 +0000 -@@ -1782,6 +1782,7 @@ - { - size_t a_pos, a_lineno; - int ret = -1; -+ char *endptr; - nih_local char *arg = NULL; - - nih_assert (class != NULL); -@@ -1799,7 +1800,6 @@ - - if (! strcmp (arg, "timeout")) { - nih_local char *timearg = NULL; -- char *endptr; - - /* Update error position to the timeout value */ - *pos = a_pos; -@@ -1816,14 +1816,40 @@ - if (errno || *endptr || (class->kill_timeout < 0)) - nih_return_error (-1, PARSE_ILLEGAL_INTERVAL, - _(PARSE_ILLEGAL_INTERVAL_STR)); -- -- ret = nih_config_skip_comment (file, len, &a_pos, &a_lineno); -- -+ } else if (! strcmp (arg, "signal")) { -+ unsigned long status; -+ nih_local char *sigarg = NULL; -+ int signal; -+ -+ /* Update error position to the exit status */ -+ *pos = a_pos; -+ if (lineno) -+ *lineno = a_lineno; -+ -+ sigarg = nih_config_next_arg (NULL, file, len, &a_pos, -+ &a_lineno); -+ -+ if (! sigarg) -+ goto finish; -+ -+ signal = nih_signal_from_name (sigarg); -+ if (signal < 0) { -+ errno = 0; -+ status = strtoul (sigarg, &endptr, 10); -+ if (errno || *endptr || (status > INT_MAX)) -+ nih_return_error (-1, PARSE_ILLEGAL_SIGNAL, -+ _(PARSE_ILLEGAL_SIGNAL_STR)); -+ } -+ -+ /* Set the signal */ -+ class->kill_signal = signal; - } else { - nih_return_error (-1, NIH_CONFIG_UNKNOWN_STANZA, - _(NIH_CONFIG_UNKNOWN_STANZA_STR)); - } - -+ ret = nih_config_skip_comment (file, len, &a_pos, &a_lineno); -+ - finish: - *pos = a_pos; - if (lineno) - -=== modified file 'init/system.c' ---- init/system.c 2010-02-26 15:29:07 +0000 -+++ init/system.c 2011-05-12 20:42:28 +0000 -@@ -48,27 +48,21 @@ - /** - * system_kill: - * @pid: process id of process, -- * @force: force the death. -- * -- * Kill all processes in the same process group as @pid, which may not -- * necessarily be the group leader. -- * -- * When @force is FALSE, the TERM signal is sent; when it is TRUE, KILL -- * is sent instead. -+ * @signal: signal to send. -+ * -+ * Send all processes in the same process group as @pid, which may not -+ * necessarily be the group leader the @signal. - * - * Returns: zero on success, negative value on raised error. - **/ - int - system_kill (pid_t pid, -- int force) -+ int signal) - { -- int signal; - pid_t pgid; - - nih_assert (pid > 0); - -- signal = (force ? SIGKILL : SIGTERM); -- - pgid = getpgid (pid); - - if (kill (pgid > 0 ? -pgid : pid, signal) < 0) - -=== modified file 'init/system.h' ---- init/system.h 2010-02-26 15:29:07 +0000 -+++ init/system.h 2011-05-12 20:42:28 +0000 -@@ -29,7 +29,7 @@ - - NIH_BEGIN_EXTERN - --int system_kill (pid_t pid, int force) -+int system_kill (pid_t pid, int signal) - __attribute__ ((warn_unused_result)); - - int system_setup_console (ConsoleType type, int reset) - -=== modified file 'init/tests/test_job_class.c' ---- init/tests/test_job_class.c 2011-05-05 10:13:49 +0000 -+++ init/tests/test_job_class.c 2011-05-12 20:42:28 +0000 -@@ -121,6 +121,7 @@ - TEST_EQ (class->task, FALSE); - - TEST_EQ (class->kill_timeout, 5); -+ TEST_EQ (class->kill_signal, SIGTERM); - - TEST_EQ (class->respawn, FALSE); - TEST_EQ (class->respawn_limit, 10); - -=== modified file 'init/tests/test_parse_job.c' ---- init/tests/test_parse_job.c 2011-05-12 19:31:50 +0000 -+++ init/tests/test_parse_job.c 2011-05-12 20:42:28 +0000 -@@ -4799,6 +4799,39 @@ - } - - -+ /* Check that a kill stanza with the signal argument and signal, -+ * sets the right signal on the jobs class. -+ */ -+ TEST_FEATURE ("with signal and single argument"); -+ strcpy (buf, "kill signal INT\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 2); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->kill_signal, SIGINT); -+ -+ nih_free (job); -+ } -+ -+ - /* Check that the last of multiple kill stanzas is used. - */ - TEST_FEATURE ("with multiple timeout and single argument stanzas"); -@@ -4832,6 +4865,37 @@ - } - - -+ TEST_FEATURE ("with multiple signal and single argument stanzas"); -+ strcpy (buf, "kill signal INT\n"); -+ strcat (buf, "kill signal TERM\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 3); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->kill_signal, SIGTERM); -+ -+ nih_free (job); -+ } -+ -+ - /* Check that a kill stanza without an argument results in a syntax - * error. - */ -@@ -4889,6 +4953,25 @@ - nih_free (err); - - -+ /* Check that a kill stanza with the timeout argument but no timeout -+ * results in a syntax error. -+ */ -+ TEST_FEATURE ("with signal and missing argument"); -+ strcpy (buf, "kill signal\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, NIH_CONFIG_EXPECTED_TOKEN); -+ TEST_EQ (pos, 11); -+ TEST_EQ (lineno, 1); -+ nih_free (err); -+ -+ - /* Check that a kill timeout stanza with a non-integer argument - * results in a syntax error. - */ -@@ -4965,6 +5048,25 @@ - nih_free (err); - - -+ /* Check that a kill signal stanza with an unknown signal argument -+ * results in a syntax error. -+ */ -+ TEST_FEATURE ("with signal and unknown signal argument"); -+ strcpy (buf, "kill signal foo\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, PARSE_ILLEGAL_SIGNAL); -+ TEST_EQ (pos, 12); -+ TEST_EQ (lineno, 1); -+ nih_free (err); -+ -+ - /* Check that a kill stanza with the timeout argument and timeout, - * but with an extra argument afterwards results in a syntax - * error. -@@ -4983,6 +5085,26 @@ - TEST_EQ (pos, 16); - TEST_EQ (lineno, 1); - nih_free (err); -+ -+ -+ /* Check that a kill stanza with the signal argument and signal, -+ * but with an extra argument afterwards results in a syntax -+ * error. -+ */ -+ TEST_FEATURE ("with signal and extra argument"); -+ strcpy (buf, "kill signal INT foo\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, NIH_CONFIG_UNEXPECTED_TOKEN); -+ TEST_EQ (pos, 16); -+ TEST_EQ (lineno, 1); -+ nih_free (err); - } - - void - -=== modified file 'init/tests/test_system.c' ---- init/tests/test_system.c 2009-06-23 09:29:35 +0000 -+++ init/tests/test_system.c 2011-05-12 20:42:28 +0000 -@@ -51,7 +51,7 @@ - setpgid (pid1, pid1); - setpgid (pid2, pid1); - -- ret = system_kill (pid1, FALSE); -+ ret = system_kill (pid1, SIGTERM); - waitpid (pid1, &status, 0); - - TEST_EQ (ret, 0); -@@ -79,7 +79,7 @@ - setpgid (pid1, pid1); - setpgid (pid2, pid1); - -- ret = system_kill (pid1, TRUE); -+ ret = system_kill (pid1, SIGKILL); - waitpid (pid1, &status, 0); - - TEST_EQ (ret, 0); -@@ -114,7 +114,7 @@ - kill (pid1, SIGTERM); - waitpid (pid1, &status, 0); - -- ret = system_kill (pid2, FALSE); -+ ret = system_kill (pid2, SIGTERM); - waitpid (pid2, &status, 0); - - TEST_EQ (ret, 0); - -=== modified file 'po/ChangeLog' ---- po/ChangeLog 2011-03-17 01:03:01 +0000 -+++ po/ChangeLog 2011-05-12 20:42:28 +0000 -@@ -1,3 +1,7 @@ -+2011-05-12 Marc - A. Dahlhaus -+ -+ * POTFILES.in: Add errors.h -+ - 2011-03-16 Scott James Remnant - - * Makevars.template (COPYRIGHT_HOLDER): Update copyright. - -=== modified file 'po/POTFILES.in' ---- po/POTFILES.in 2010-02-04 03:42:29 +0000 -+++ po/POTFILES.in 2011-05-05 09:06:21 +0000 -@@ -3,6 +3,7 @@ - init/conf.c - init/control.c - init/environ.c -+init/errors.h - init/event.c - init/event_operator.c - init/job.c - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-log-verbosity.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-log-verbosity.patch deleted file mode 100644 index bfb27bef18..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-log-verbosity.patch +++ /dev/null @@ -1,11 +0,0 @@ -=== modified file 'init/main.c' ---- init/main.c 2010-12-13 18:15:24 +0000 -+++ init/main.c 2011-02-07 22:08:27 +0000 -@@ -314,6 +315,7 @@ - if (system_setup_console (CONSOLE_NONE, FALSE) < 0) - nih_free (nih_error_get ()); - -+ nih_log_set_priority (NIH_LOG_INFO); - nih_log_set_logger (logger_kmsg); - #endif /* DEBUG */ - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-negate-match.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-negate-match.patch deleted file mode 100644 index 35ce8f0dcc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-negate-match.patch +++ /dev/null @@ -1,38 +0,0 @@ -=== modified file 'init/event_operator.c' ---- init/event_operator.c 2010-11-19 14:34:51 +0000 -+++ init/event_operator.c 2012-08-10 20:16:45 +0000 -@@ -326,7 +326,7 @@ - * matches and no such variable. - */ - if (! (eenv && *eenv)) -- return FALSE; -+ return negate; - - /* Grab the value out by looking for the equals, we don't - * care about the name if we're positional and we've already - -=== modified file 'init/tests/test_event_operator.c' ---- init/tests/test_event_operator.c 2010-02-04 20:08:59 +0000 -+++ init/tests/test_event_operator.c 2012-08-10 20:16:17 +0000 -@@ -763,6 +763,20 @@ - TEST_FALSE (event_operator_match (oper, event, NULL)); - - -+ /* Check that unknown variable names match when negated. */ -+ TEST_FEATURE ("with unknown variable in operator"); -+ event->env = env1; -+ event->env[0] = "FRODO=foo"; -+ event->env[1] = "BILBO=bar"; -+ event->env[2] = NULL; -+ -+ oper->env = env2; -+ oper->env[0] = "MERRY!=baz"; -+ oper->env[1] = NULL; -+ -+ TEST_TRUE (event_operator_match (oper, event, NULL)); -+ -+ - /* Check that the operator environment may be globs. */ - TEST_FEATURE ("with globs in operator environment"); - event->env = env1; - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-oom-score.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-oom-score.patch deleted file mode 100644 index 9e40c1692a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-oom-score.patch +++ /dev/null @@ -1,744 +0,0 @@ -=== modified file 'init/errors.h' ---- init/errors.h 2009-06-23 09:29:35 +0000 -+++ init/errors.h 2011-08-11 20:56:28 +0000 -@@ -62,7 +62,8 @@ - #define PARSE_ILLEGAL_EXIT_STR N_("Illegal exit status, expected integer") - #define PARSE_ILLEGAL_UMASK_STR N_("Illegal file creation mask, expected octal integer") - #define PARSE_ILLEGAL_NICE_STR N_("Illegal nice value, expected -20 to 19") --#define PARSE_ILLEGAL_OOM_STR N_("Illegal oom adjustment, expected -16 to 15 or never") -+#define PARSE_ILLEGAL_OOM_STR N_("Illegal oom adjustment, expected -16 to 15 or 'never'") -+#define PARSE_ILLEGAL_OOM_SCORE_STR N_("Illegal oom score adjustment, expected -999 to 1000 or 'never'") - #define PARSE_ILLEGAL_LIMIT_STR N_("Illegal limit, expected 'unlimited' or integer") - #define PARSE_EXPECTED_EVENT_STR N_("Expected event") - #define PARSE_EXPECTED_OPERATOR_STR N_("Expected operator") - -=== modified file 'init/job_class.c' ---- init/job_class.c 2010-12-14 15:30:06 +0000 -+++ init/job_class.c 2011-08-11 21:00:44 +0000 -@@ -2,7 +2,7 @@ - * - * job_class.c - job class definition handling - * -- * Copyright © 2010 Canonical Ltd. -+ * Copyright © 2011 Canonical Ltd. - * Author: Scott James Remnant . - * - * This program is free software; you can redistribute it and/or modify -@@ -55,48 +55,6 @@ - #include "com.ubuntu.Upstart.Job.h" - - --/** -- * JOB_DEFAULT_KILL_TIMEOUT: -- * -- * The default length of time to wait after sending a process the TERM -- * signal before sending the KILL signal if it hasn't terminated. -- **/ --#define JOB_DEFAULT_KILL_TIMEOUT 5 -- --/** -- * JOB_DEFAULT_RESPAWN_LIMIT: -- * -- * The default number of times in JOB_DEFAULT_RESPAWN_INTERVAL seconds that -- * we permit a process to respawn before stoping it -- **/ --#define JOB_DEFAULT_RESPAWN_LIMIT 10 -- --/** -- * JOB_DEFAULT_RESPAWN_INTERVAL: -- * -- * The default number of seconds before resetting the respawn timer. -- **/ --#define JOB_DEFAULT_RESPAWN_INTERVAL 5 -- --/** -- * JOB_DEFAULT_UMASK: -- * -- * The default file creation mark for processes. -- **/ --#define JOB_DEFAULT_UMASK 022 -- --/** -- * JOB_DEFAULT_ENVIRONMENT: -- * -- * Environment variables to always copy from our own environment, these -- * can be overriden in the job definition or by events since they have the -- * lowest priority. -- **/ --#define JOB_DEFAULT_ENVIRONMENT \ -- "PATH", \ -- "TERM" -- -- - /* Prototypes for static functions */ - static void job_class_add (JobClass *class); - static int job_class_remove (JobClass *class); -@@ -210,8 +168,8 @@ - class->console = CONSOLE_NONE; - - class->umask = JOB_DEFAULT_UMASK; -- class->nice = 0; -- class->oom_adj = 0; -+ class->nice = JOB_DEFAULT_NICE; -+ class->oom_score_adj = JOB_DEFAULT_OOM_SCORE_ADJ; - - for (i = 0; i < RLIMIT_NLIMITS; i++) - class->limits[i] = NULL; - -=== modified file 'init/job_class.h' ---- init/job_class.h 2010-12-14 15:30:06 +0000 -+++ init/job_class.h 2011-08-11 20:59:46 +0000 -@@ -1,6 +1,6 @@ - /* upstart - * -- * Copyright © 2010 Canonical Ltd. -+ * Copyright © 2011 Canonical Ltd. - * Author: Scott James Remnant . - * - * This program is free software; you can redistribute it and/or modify -@@ -67,6 +67,62 @@ - - - /** -+ * JOB_DEFAULT_KILL_TIMEOUT: -+ * -+ * The default length of time to wait after sending a process the TERM -+ * signal before sending the KILL signal if it hasn't terminated. -+ **/ -+#define JOB_DEFAULT_KILL_TIMEOUT 5 -+ -+/** -+ * JOB_DEFAULT_RESPAWN_LIMIT: -+ * -+ * The default number of times in JOB_DEFAULT_RESPAWN_INTERVAL seconds that -+ * we permit a process to respawn before stoping it -+ **/ -+#define JOB_DEFAULT_RESPAWN_LIMIT 10 -+ -+/** -+ * JOB_DEFAULT_RESPAWN_INTERVAL: -+ * -+ * The default number of seconds before resetting the respawn timer. -+ **/ -+#define JOB_DEFAULT_RESPAWN_INTERVAL 5 -+ -+/** -+ * JOB_DEFAULT_UMASK: -+ * -+ * The default file creation mark for processes. -+ **/ -+#define JOB_DEFAULT_UMASK 022 -+ -+/** -+ * JOB_DEFAULT_NICE: -+ * -+ * The default nice level for processes. -+ **/ -+#define JOB_DEFAULT_NICE 0 -+ -+/** -+ * JOB_DEFAULT_OOM_SCORE_ADJ: -+ * -+ * The default OOM score adjustment for processes. -+ **/ -+#define JOB_DEFAULT_OOM_SCORE_ADJ 0 -+ -+/** -+ * JOB_DEFAULT_ENVIRONMENT: -+ * -+ * Environment variables to always copy from our own environment, these -+ * can be overriden in the job definition or by events since they have the -+ * lowest priority. -+ **/ -+#define JOB_DEFAULT_ENVIRONMENT \ -+ "PATH", \ -+ "TERM" -+ -+ -+/** - * JobClass: - * @entry: list header, - * @name: unique name, -@@ -93,7 +149,7 @@ - * @console: how to arrange processes' stdin/out/err file descriptors, - * @umask: file mode creation mask, - * @nice: process priority, -- * @oom_adj: OOM killer adjustment, -+ * @oom_score_adj: OOM killer score adjustment, - * @limits: resource limits indexed by resource, - * @chroot: root directory of process (implies @chdir if not set), - * @chdir: working directory of process, -@@ -141,7 +197,7 @@ - - mode_t umask; - int nice; -- int oom_adj; -+ int oom_score_adj; - struct rlimit *limits[RLIMIT_NLIMITS]; - char *chroot; - char *chdir; - -=== modified file 'init/job_process.c' ---- init/job_process.c 2011-08-11 20:55:33 +0000 -+++ init/job_process.c 2011-08-11 21:00:11 +0000 -@@ -513,16 +513,24 @@ - - /* Adjust the process OOM killer priority. - */ -- if (class->oom_adj) { -+ if (class->oom_score_adj != JOB_DEFAULT_OOM_SCORE_ADJ) { -+ int oom_value; - snprintf (filename, sizeof (filename), -- "/proc/%d/oom_adj", getpid ()); -- -+ "/proc/%d/oom_score_adj", getpid ()); -+ oom_value = class->oom_score_adj; - fd = fopen (filename, "w"); -+ if ((! fd) && (errno == ENOENT)) { -+ snprintf (filename, sizeof (filename), -+ "/proc/%d/oom_adj", getpid ()); -+ oom_value = (class->oom_score_adj -+ * ((class->oom_score_adj < 0) ? 17 : 15)) / 1000; -+ fd = fopen (filename, "w"); -+ } - if (! fd) { - nih_error_raise_system (); - job_process_error_abort (fds[1], JOB_PROCESS_ERROR_OOM_ADJ, 0); - } else { -- fprintf (fd, "%d\n", class->oom_adj); -+ fprintf (fd, "%d\n", oom_value); - - if (fclose (fd)) { - nih_error_raise_system (); - -=== modified file 'init/main.c' ---- init/main.c 2011-08-11 20:55:33 +0000 -+++ init/main.c 2011-08-11 21:00:11 +0000 -@@ -32,6 +32,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -54,6 +55,7 @@ - #include "paths.h" - #include "events.h" - #include "system.h" -+#include "job_class.h" - #include "job_process.h" - #include "event.h" - #include "conf.h" -@@ -292,6 +294,38 @@ - NULL)); - - -+ /* Adjust our OOM priority to the default, which will be inherited -+ * by all jobs. -+ */ -+ if (JOB_DEFAULT_OOM_SCORE_ADJ) { -+ char filename[PATH_MAX]; -+ int oom_value; -+ FILE *fd; -+ -+ snprintf (filename, sizeof (filename), -+ "/proc/%d/oom_score_adj", getpid ()); -+ oom_value = JOB_DEFAULT_OOM_SCORE_ADJ; -+ fd = fopen (filename, "w"); -+ if ((! fd) && (errno == ENOENT)) { -+ snprintf (filename, sizeof (filename), -+ "/proc/%d/oom_adj", getpid ()); -+ oom_value = (JOB_DEFAULT_OOM_SCORE_ADJ -+ * ((JOB_DEFAULT_OOM_SCORE_ADJ < 0) ? 17 : 15)) / 1000; -+ fd = fopen (filename, "w"); -+ } -+ if (! fd) { -+ nih_warn ("%s: %s", _("Unable to set default oom score"), -+ strerror (errno)); -+ } else { -+ fprintf (fd, "%d\n", oom_value); -+ -+ if (fclose (fd)) -+ nih_warn ("%s: %s", _("Unable to set default oom score"), -+ strerror (errno)); -+ } -+ } -+ -+ - /* Read configuration */ - NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE)); - NIH_MUST (conf_source_new (NULL, CONFDIR, CONF_JOB_DIR)); - -=== modified file 'init/man/init.5' ---- init/man/init.5 2011-03-15 18:36:57 +0000 -+++ init/man/init.5 2011-08-11 20:56:28 +0000 -@@ -1,4 +1,4 @@ --.TH init 5 2010-12-14 "Upstart" -+.TH init 5 2011-05-12 "Upstart" - .\" - .SH NAME - init \- Upstart init daemon job configuration -@@ -500,15 +500,15 @@ - for more details. - .\" - .TP --.B oom \fIADJUSTMENT\fR|\fBnever -+.B oom score \fIADJUSTMENT\fR|\fBnever - Normally the OOM killer regards all processes equally, this stanza - advises the kernel to treat this job differently. - - .I ADJUSTMENT - may be an integer value from --.I -16 -+.I -999 - (very unlikely to be killed by the OOM killer) up to --.I 14 -+.I 1000 - (very likely to be killed by the OOM killer). It may also be the special - value - .B never - -=== modified file 'init/parse_job.c' ---- init/parse_job.c 2011-01-17 16:37:54 +0000 -+++ init/parse_job.c 2011-08-11 20:56:28 +0000 -@@ -2233,6 +2233,7 @@ - nih_local char *arg = NULL; - char *endptr; - size_t a_pos, a_lineno; -+ int oom_adj; - int ret = -1; - - nih_assert (class != NULL); -@@ -2247,12 +2248,37 @@ - if (! arg) - goto finish; - -- if (! strcmp (arg, "never")) { -- class->oom_adj = -17; -+ if (! strcmp (arg, "score")) { -+ nih_local char *scorearg = NULL; -+ -+ /* Update error position to the score value */ -+ *pos = a_pos; -+ if (lineno) -+ *lineno = a_lineno; -+ -+ scorearg = nih_config_next_arg (NULL, file, len, -+ &a_pos, &a_lineno); -+ if (! scorearg) -+ goto finish; -+ -+ if (! strcmp (scorearg, "never")) { -+ class->oom_score_adj = -1000; -+ } else { -+ errno = 0; -+ class->oom_score_adj = (int)strtol (scorearg, &endptr, 10); -+ if (errno || *endptr || -+ (class->oom_score_adj < -1000) || -+ (class->oom_score_adj > 1000)) -+ nih_return_error (-1, PARSE_ILLEGAL_OOM, -+ _(PARSE_ILLEGAL_OOM_SCORE_STR)); -+ } -+ } else if (! strcmp (arg, "never")) { -+ class->oom_score_adj = -1000; - } else { - errno = 0; -- class->oom_adj = (int)strtol (arg, &endptr, 10); -- if (errno || *endptr || (class->oom_adj < -17) || (class->oom_adj > 15)) -+ oom_adj = (int)strtol (arg, &endptr, 10); -+ class->oom_score_adj = (oom_adj * 1000) / ((oom_adj < 0) ? 17 : 15); -+ if (errno || *endptr || (oom_adj < -17) || (oom_adj > 15)) - nih_return_error (-1, PARSE_ILLEGAL_OOM, - _(PARSE_ILLEGAL_OOM_STR)); - } - -=== modified file 'init/tests/test_job_class.c' ---- init/tests/test_job_class.c 2011-03-16 22:42:48 +0000 -+++ init/tests/test_job_class.c 2011-08-11 20:56:28 +0000 -@@ -133,7 +133,7 @@ - - TEST_EQ (class->umask, 022); - TEST_EQ (class->nice, 0); -- TEST_EQ (class->oom_adj, 0); -+ TEST_EQ (class->oom_score_adj, 0); - - for (i = 0; i < RLIMIT_NLIMITS; i++) - TEST_EQ_P (class->limits[i], NULL); - -=== modified file 'init/tests/test_parse_job.c' ---- init/tests/test_parse_job.c 2010-12-14 16:20:38 +0000 -+++ init/tests/test_parse_job.c 2011-08-11 20:56:28 +0000 -@@ -6161,6 +6161,8 @@ - nih_free (err); - } - -+#define ADJ_TO_SCORE(x) ((x * 1000) / ((x < 0) ? 17 : 15)) -+ - void - test_stanza_oom (void) - { -@@ -6198,11 +6200,39 @@ - - TEST_ALLOC_SIZE (job, sizeof (JobClass)); - -- TEST_EQ (job->oom_adj, 10); -- -- nih_free (job); -- } -- -+ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(10)); -+ -+ nih_free (job); -+ } -+ -+ TEST_FEATURE ("with positive score argument"); -+ strcpy (buf, "oom score 100\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 2); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->oom_score_adj, 100); -+ -+ nih_free (job); -+ } - - /* Check that an oom stanza with a negative timeout results - * in it being stored in the job. -@@ -6231,7 +6261,36 @@ - - TEST_ALLOC_SIZE (job, sizeof (JobClass)); - -- TEST_EQ (job->oom_adj, -10); -+ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(-10)); -+ -+ nih_free (job); -+ } -+ -+ TEST_FEATURE ("with negative score argument"); -+ strcpy (buf, "oom score -100\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 2); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->oom_score_adj, -100); - - nih_free (job); - } -@@ -6264,7 +6323,40 @@ - - TEST_ALLOC_SIZE (job, sizeof (JobClass)); - -- TEST_EQ (job->oom_adj, -17); -+ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(-17)); -+ -+ nih_free (job); -+ } -+ -+ -+ /* Check that an oom score stanza may have the special never -+ * argument which stores -1000 in the job. -+ */ -+ TEST_FEATURE ("with never score argument"); -+ strcpy (buf, "oom score never\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 2); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->oom_score_adj, -1000); - - nih_free (job); - } -@@ -6297,7 +6389,100 @@ - - TEST_ALLOC_SIZE (job, sizeof (JobClass)); - -- TEST_EQ (job->oom_adj, 10); -+ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(10)); -+ -+ nih_free (job); -+ } -+ -+ TEST_FEATURE ("with multiple score stanzas"); -+ strcpy (buf, "oom score -500\n"); -+ strcat (buf, "oom score 500\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 3); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->oom_score_adj, 500); -+ -+ nih_free (job); -+ } -+ -+ /* Check that the last of multiple distinct oom stanzas is -+ * used. -+ */ -+ TEST_FEATURE ("with an oom overriding an oom score stanza"); -+ strcpy (buf, "oom score -10\n"); -+ strcat (buf, "oom 10\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 3); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->oom_score_adj, ADJ_TO_SCORE(10)); -+ -+ nih_free (job); -+ } -+ -+ TEST_FEATURE ("with an oom score overriding an oom stanza"); -+ strcpy (buf, "oom -10\n"); -+ strcat (buf, "oom score 10\n"); -+ -+ TEST_ALLOC_FAIL { -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), -+ &pos, &lineno); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, ENOMEM); -+ nih_free (err); -+ -+ continue; -+ } -+ -+ TEST_EQ (pos, strlen (buf)); -+ TEST_EQ (lineno, 3); -+ -+ TEST_ALLOC_SIZE (job, sizeof (JobClass)); -+ -+ TEST_EQ (job->oom_score_adj, 10); - - nih_free (job); - } -@@ -6322,6 +6507,25 @@ - nih_free (err); - - -+ /* Check that an oom score stanza without an argument results in a -+ * syntax error. -+ */ -+ TEST_FEATURE ("with missing score argument"); -+ strcpy (buf, "oom score\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, NIH_CONFIG_EXPECTED_TOKEN); -+ TEST_EQ (pos, 9); -+ TEST_EQ (lineno, 1); -+ nih_free (err); -+ -+ - /* Check that an oom stanza with an overly large argument results - * in a syntax error. - */ -@@ -6340,6 +6544,21 @@ - TEST_EQ (lineno, 1); - nih_free (err); - -+ TEST_FEATURE ("with overly large score argument"); -+ strcpy (buf, "oom score 1200\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); -+ TEST_EQ (pos, 10); -+ TEST_EQ (lineno, 1); -+ nih_free (err); -+ - - /* Check that an oom stanza with an overly small argument results - * in a syntax error. -@@ -6359,6 +6578,21 @@ - TEST_EQ (lineno, 1); - nih_free (err); - -+ TEST_FEATURE ("with overly small score argument"); -+ strcpy (buf, "oom score -1200\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); -+ TEST_EQ (pos, 10); -+ TEST_EQ (lineno, 1); -+ nih_free (err); -+ - - /* Check that an oom stanza with a non-integer argument results - * in a syntax error. -@@ -6378,6 +6612,21 @@ - TEST_EQ (lineno, 1); - nih_free (err); - -+ TEST_FEATURE ("with non-integer score argument"); -+ strcpy (buf, "oom score foo\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); -+ TEST_EQ (pos, 10); -+ TEST_EQ (lineno, 1); -+ nih_free (err); -+ - - /* Check that an oom stanza with a partially numeric argument - * results in a syntax error. -@@ -6397,6 +6646,21 @@ - TEST_EQ (lineno, 1); - nih_free (err); - -+ TEST_FEATURE ("with alphanumeric score argument"); -+ strcpy (buf, "oom score 12foo\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, PARSE_ILLEGAL_OOM); -+ TEST_EQ (pos, 10); -+ TEST_EQ (lineno, 1); -+ nih_free (err); -+ - - /* Check that an oom stanza with a priority but with an extra - * argument afterwards results in a syntax error. -@@ -6415,6 +6679,21 @@ - TEST_EQ (pos, 7); - TEST_EQ (lineno, 1); - nih_free (err); -+ -+ TEST_FEATURE ("with extra score argument"); -+ strcpy (buf, "oom score 500 foo\n"); -+ -+ pos = 0; -+ lineno = 1; -+ job = parse_job (NULL, "test", buf, strlen (buf), &pos, &lineno); -+ -+ TEST_EQ_P (job, NULL); -+ -+ err = nih_error_get (); -+ TEST_EQ (err->number, NIH_CONFIG_UNEXPECTED_TOKEN); -+ TEST_EQ (pos, 14); -+ TEST_EQ (lineno, 1); -+ nih_free (err); - } - - void - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-silent-console.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-silent-console.patch deleted file mode 100644 index f09fa28f37..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/files/upstart-1.2-silent-console.patch +++ /dev/null @@ -1,49 +0,0 @@ -=== modified file 'init/main.c' ---- init/main.c 2011-03-16 22:54:56 +0000 -+++ init/main.c 2011-08-08 21:09:43 +0000 -@@ -173,8 +173,23 @@ - * resetting it to sane defaults unless we're inheriting from another - * init process which we know left it in a sane state. - */ -- if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0) -- nih_free (nih_error_get ()); -+ if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0) { -+ NihError *err; -+ -+ err = nih_error_get (); -+ nih_warn ("%s: %s", _("Unable to initialize console, will try /dev/null"), -+ err->message); -+ nih_free (err); -+ -+ if (system_setup_console (CONSOLE_NONE, FALSE) < 0) { -+ err = nih_error_get (); -+ nih_fatal ("%s: %s", _("Unable to initialize console as /dev/null"), -+ err->message); -+ nih_free (err); -+ -+ exit (1); -+ } -+ } - - /* Set the PATH environment variable */ - setenv ("PATH", PATH, TRUE); -@@ -316,8 +331,16 @@ - /* Now that the startup is complete, send all further logging output - * to kmsg instead of to the console. - */ -- if (system_setup_console (CONSOLE_NONE, FALSE) < 0) -- nih_free (nih_error_get ()); -+ if (system_setup_console (CONSOLE_NONE, FALSE) < 0) { -+ NihError *err; -+ -+ err = nih_error_get (); -+ nih_fatal ("%s: %s", _("Unable to setup standard file descriptors"), -+ err->message); -+ nih_free (err); -+ -+ exit (1); -+ } - - nih_log_set_logger (logger_kmsg); - #endif /* DEBUG */ - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.3.ebuild deleted file mode 100644 index bfbb715243..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools eutils - -DESCRIPTION="Upstart is an event-based replacement for the init daemon" -HOMEPAGE="http://upstart.ubuntu.com/" -SRC_URI="http://upstart.ubuntu.com/download/0.6/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 arm" -IUSE="examples nls" - -DEPEND=">=dev-libs/expat-2.0.0 - >=sys-apps/dbus-1.2.16 - nls? ( sys-devel/gettext )" - -RDEPEND=">=sys-apps/dbus-1.2.16" - -src_unpack() { - unpack $A - cd "${S}" - - epatch "${FILESDIR}"/${P}-cross-compile.patch # Already upstream - epatch "${FILESDIR}"/${P}-cross-compile2.patch # Not upstream @ 1214 - - eautoreconf -} - -src_compile() { - econf --prefix=/ --includedir='${prefix}/usr/include' $(use_enable nls) || die "econf failed" - - emake NIH_DBUS_TOOL=$(which nih-dbus-tool) \ - || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if ! use examples ; then - elog "Removing example .conf files." - rm "${D}"/etc/init/*.conf - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6-r3.ebuild deleted file mode 120000 index f8c067eea8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6-r3.ebuild +++ /dev/null @@ -1 +0,0 @@ -upstart-0.6.6.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6.ebuild deleted file mode 100644 index a8f6c9c33e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-0.6.6.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools eutils - -DESCRIPTION="Upstart is an event-based replacement for the init daemon" -HOMEPAGE="http://upstart.ubuntu.com/" -SRC_URI="http://upstart.ubuntu.com/download/0.6/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 arm" -IUSE="examples nls upstartdebug" - -DEPEND=">=dev-libs/expat-2.0.0 - >=sys-apps/dbus-1.2.16 - nls? ( sys-devel/gettext ) - >=sys-libs/libnih-1.0.2" - -RDEPEND=">=sys-apps/dbus-1.2.16 - >=sys-libs/libnih-1.0.2" - - -src_unpack() { - unpack ${A} - cd "${S}" - if use upstartdebug; then - epatch "${FILESDIR}"/upstart-0.6-logger_kmsg.patch - fi - epatch "${FILESDIR}"/upstart-0.6.6-introspection.patch -} - -src_compile() { - econf --prefix=/ --includedir='${prefix}/usr/include' \ - $(use_enable nls) || die "econf failed" - - emake NIH_DBUS_TOOL=$(which nih-dbus-tool) \ - || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if ! use examples ; then - elog "Removing example .conf files." - rm "${D}"/etc/init/*.conf - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2-r4.ebuild deleted file mode 120000 index fc587be66e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2-r4.ebuild +++ /dev/null @@ -1 +0,0 @@ -upstart-1.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2.ebuild deleted file mode 100644 index 5206883ede..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/upstart/upstart-1.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools eutils - -DESCRIPTION="Upstart is an event-based replacement for the init daemon" -HOMEPAGE="http://upstart.ubuntu.com/" -SRC_URI="http://upstart.at/download/1.x/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 arm" -IUSE="examples nls upstartdebug" - -DEPEND=">=dev-libs/expat-2.0.0 - >=sys-apps/dbus-1.2.16 - nls? ( sys-devel/gettext ) - >=sys-libs/libnih-1.0.2" - -RDEPEND=">=sys-apps/dbus-1.2.16 - >=sys-libs/libnih-1.0.2" - - -src_unpack() { - unpack ${A} - cd "${S}" - - # 1.3+ has scary user and chroot session support that we just - # don't want to adopt yet, so we're sticking with 1.2 for the - # near future. Backport some bug fixes from lp:upstart - - # -r 1326 - fix bug when /dev/console cannot be opened - # chromium-os:18739 - epatch "${FILESDIR}"/upstart-1.2-silent-console.patch - # -r 1280,1308,1309,1320,1329 - fix shell fd leak (and fix the fix) - epatch "${FILESDIR}"/upstart-1.2-fix-shell-redirect.patch - # -r 1281,1325,1327,1328 - update to use /proc/oom_score - epatch "${FILESDIR}"/upstart-1.2-oom-score.patch - # -r 1282 - add "kill signal" stanza (may be useful for us) - epatch "${FILESDIR}"/upstart-1.2-kill-signal.patch - - # chromium-os:16450, prevent OOM killer by default - epatch "${FILESDIR}"/upstart-1.2-default-oom_score_adj.patch - - # chromium-os:33165, make EXIT_STATUS!=* possible - epatch "${FILESDIR}"/upstart-1.2-negate-match.patch - - # Patch to use kmsg at higher verbosity for logging; this is - # our own patch because we can't just add --verbose to the - # kernel command-line when we need to. - if use upstartdebug; then - epatch "${FILESDIR}"/upstart-1.2-log-verbosity.patch - fi -} - -src_compile() { - econf --prefix=/ --includedir='${prefix}/usr/include' \ - $(use_enable nls) || die "econf failed" - - emake NIH_DBUS_TOOL=$(which nih-dbus-tool) \ - || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if ! use examples ; then - elog "Removing example .conf files." - rm "${D}"/etc/init/*.conf - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/Manifest deleted file mode 100644 index e5a3842a30..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX ureadahead-0.100.0-11.patch 17869 SHA256 8676da04b1d48aaae46824689b900e964809aace36aa4b07e88dc45022669b6c SHA512 40f47e34d32834c455e032e13538c57ac774b864d6682d2643ba608cc0b0798e93af4d9b161fa9ae4a36b8996b422ddb1fb00a65342422845d914722a1952228 WHIRLPOOL a761244ff59b887fa74163ffe2b95dbaaa5ae151d54b6636d2b543cd755169533b212dbca55bcf1220c57f1c32e8a3551451f35d6b10314fdb703f6b0940f0c1 -DIST ureadahead-0.100.0.tar.gz 540220 SHA256 d00cfe9051131185cd5b6a439c9f89b51f0d5f1d49cb5bb14676d961a2ecfe99 SHA512 3bf5b0976c2e9404a7ed5e17479f494c60f1bbf28e4071fa80abf45a44ee60dde2b3c6d3a998937dc5c748bea5d0c3bf6e04507b7bb22282fedcc0b26752b4da WHIRLPOOL 9f48a3e07b9ce609af7db6a940ae9f2a63ee948c2c03d12b5b036e8734f00f10e17d177b4e687c81265472cf40f847ae798622a90af4e32a7f737db6624239bc -EBUILD ureadahead-0.100.0-r2.ebuild 768 SHA256 7ccb8d8adc013ff8bb34c761d6dca4c84383b3e6bfcd0889f5eceec906540d03 SHA512 c23ee7e80fad830064bc3ffda10a5cfb9b720509c9266e1740dffc3244b77b9afe67e9a1ba8487b908ee95ad651fae6d9a7a78fba092ef2d61046044e635d6ac WHIRLPOOL a3580ddb0a46ac490518a66b4e18810169928de45c7f9d83c5213c720428997f8d0d538189d8b86b77b63ee4d0c6367e5c45a710f0503c5e8a827842cb7f9186 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/files/ureadahead-0.100.0-11.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/files/ureadahead-0.100.0-11.patch deleted file mode 100644 index f8dd0e0ca1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/files/ureadahead-0.100.0-11.patch +++ /dev/null @@ -1,586 +0,0 @@ ---- ureadahead-0.100.0.orig/conf/ureadahead-other.conf -+++ ureadahead-0.100.0/conf/ureadahead-other.conf -@@ -6,7 +6,7 @@ - - description "Read required files in advance (for other mountpoints)" - --start on mount DEVICE=[/UL]* MOUNTPOINT=/?* -+start on mounted DEVICE=[/UL]* MOUNTPOINT=/?* - - # Forks into the background both when reading from disk and when profiling - # (HDD mode won't fork, but that's ok because we'll wait for it in spawned). ---- ureadahead-0.100.0.orig/man/ureadahead.8 -+++ ureadahead-0.100.0/man/ureadahead.8 -@@ -49,7 +49,7 @@ - has been enabled. - - This is ignored when reading on rotational hard drives, since it's --important for performance reasons not to content with other processes -+important for performance reasons not to contend with other processes - for I/O. - .\" - .TP -@@ -115,7 +115,7 @@ - .\" - .SH BUGS - Report bugs at --.RB < https://launchpad.net/ureadahead/+bugs > -+.RB < https://launchpad.net/ubuntu/+source/ureadahead/+bugs > - .\" - .SH COPYRIGHT - Copyright \(co 2009 Canonical Ltd. ---- ureadahead-0.100.0.orig/src/Makefile.am -+++ ureadahead-0.100.0/src/Makefile.am -@@ -22,6 +22,7 @@ - file.c file.h \ - errors.h - ureadahead_LDADD = \ -+ -lrt \ - $(NIH_LIBS) \ - $(BLKID_LIBS) \ - $(EXT2FS_LIBS) \ ---- ureadahead-0.100.0.orig/src/trace.c -+++ ureadahead-0.100.0/src/trace.c -@@ -117,17 +117,20 @@ - int timeout) - { - int dfd; -+ FILE *fp; - int unmount = FALSE; - int old_sys_open_enabled = 0; - int old_open_exec_enabled = 0; - int old_uselib_enabled = 0; - int old_tracing_enabled = 0; -+ int old_buffer_size_kb = 0; - struct sigaction act; - struct sigaction old_sigterm; - struct sigaction old_sigint; - struct timeval tv; - nih_local PackFile *files = NULL; - size_t num_files = 0; -+ size_t num_cpus = 0; - - /* Mount debugfs if not already mounted */ - dfd = open (PATH_DEBUGFS "/tracing", O_RDONLY | O_NOATIME); -@@ -148,6 +151,28 @@ - unmount = TRUE; - } - -+ /* -+ * Count the number of CPUs, default to 1 on error. -+ */ -+ fp = fopen("/proc/cpuinfo", "r"); -+ if (fp) { -+ int line_size=1024; -+ char *processor="processor"; -+ char *line = malloc(line_size); -+ if (line) { -+ num_cpus = 0; -+ while (fgets(line,line_size,fp) != NULL) { -+ if (!strncmp(line,processor,strlen(processor))) -+ num_cpus++; -+ } -+ free(line); -+ nih_message("Counted %d CPUs\n",num_cpus); -+ } -+ fclose(fp); -+ } -+ if (!num_cpus) -+ num_cpus = 1; -+ - /* Enable tracing of open() syscalls */ - if (set_value (dfd, "events/fs/do_sys_open/enable", - TRUE, &old_sys_open_enabled) < 0) -@@ -165,7 +190,7 @@ - - old_uselib_enabled = -1; - } -- if (set_value (dfd, "buffer_size_kb", 128000, NULL) < 0) -+ if (set_value (dfd, "buffer_size_kb", 8192/num_cpus, &old_buffer_size_kb) < 0) - goto error; - if (set_value (dfd, "tracing_enabled", - TRUE, &old_tracing_enabled) < 0) -@@ -226,6 +251,13 @@ - if (read_trace (NULL, dfd, "trace", &files, &num_files) < 0) - goto error; - -+ /* -+ * Restore the trace buffer size (which has just been read) and free -+ * a bunch of memory. -+ */ -+ if (set_value (dfd, "buffer_size_kb", old_buffer_size_kb, NULL) < 0) -+ goto error; -+ - /* Unmount the temporary debugfs mount if we mounted it */ - if (close (dfd)) { - nih_error_raise_system (); ---- ureadahead-0.100.0.orig/src/Makefile.in -+++ ureadahead-0.100.0/src/Makefile.in -@@ -295,6 +295,7 @@ - errors.h - - ureadahead_LDADD = \ -+ -lrt \ - $(NIH_LIBS) \ - $(BLKID_LIBS) \ - $(EXT2FS_LIBS) \ ---- ureadahead-0.100.0.orig/src/pack.c -+++ ureadahead-0.100.0/src/pack.c -@@ -163,6 +163,7 @@ - unsigned int maj; - unsigned int min; - char * mount; -+ struct stat statbuf; - - /* mount ID */ - ptr = strtok_r (line, " \t\n", &saveptr); -@@ -185,14 +186,6 @@ - continue; - } - -- /* Check whether this is the right device */ -- if ((sscanf (device, "%d:%d", &maj, &min) < 2) -- || (maj != major (dev)) -- || (min != minor (dev))) { -- nih_free (line); -- continue; -- } -- - /* root */ - ptr = strtok_r (NULL, " \t\n", &saveptr); - if (! ptr) { -@@ -206,6 +199,12 @@ - nih_free (line); - continue; - } -+ -+ /* Check whether this is the right device */ -+ if (stat (mount, &statbuf) || statbuf.st_dev != dev) { -+ nih_free (line); -+ continue; -+ } - - /* Done, convert the mountpoint to a pack filename */ - if (fclose (fp) < 0) ---- ureadahead-0.100.0.orig/src/values.c -+++ ureadahead-0.100.0/src/values.c -@@ -57,7 +57,7 @@ - if (fd < 0) - nih_return_system_error (-1); - -- len = read (fd, buf, sizeof buf); -+ len = read (fd, buf, sizeof(buf) - 1); - if (len < 0) { - nih_error_raise_system (); - close (fd); -@@ -90,7 +90,7 @@ - nih_return_system_error (-1); - - if (oldvalue) { -- len = read (fd, buf, sizeof buf); -+ len = read (fd, buf, sizeof(buf) - 1); - if (len < 0) { - nih_error_raise_system (); - close (fd); ---- ureadahead-0.100.0.orig/debian/copyright -+++ ureadahead-0.100.0/debian/copyright -@@ -0,0 +1,17 @@ -+This is the Ubuntu package of ureadahead. -+ -+Copyright © 2009 Canonical Ltd. -+ -+Licence: -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License version 2, as -+published by the Free Software Foundation. -+ -+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. -+ -+On Ubuntu systems, the complete text of the GNU General Public License -+can be found in ‘/usr/share/common-licenses/GPL-2’. ---- ureadahead-0.100.0.orig/debian/compat -+++ ureadahead-0.100.0/debian/compat -@@ -0,0 +1 @@ -+7 ---- ureadahead-0.100.0.orig/debian/ureadahead.postrm -+++ ureadahead-0.100.0/debian/ureadahead.postrm -@@ -0,0 +1,61 @@ -+#!/bin/sh -e -+# This script can be called in the following ways: -+# -+# After the package was removed: -+# remove -+# -+# After the package was purged: -+# purge -+# -+# After the package was upgraded: -+# upgrade -+# if that fails: -+# failed-upgrade -+# -+# -+# After all of the packages files have been replaced: -+# disappear -+# -+# -+# If preinst fails during install: -+# abort-install -+# -+# If preinst fails during upgrade of removed package: -+# abort-install -+# -+# If preinst fails during upgrade: -+# abort-upgrade -+ -+ -+# Remove pack file -+purge_files() -+{ -+ if [ -f /var/lib/ureadahead/pack ]; then -+ rm -f /var/lib/ureadahead/pack /var/lib/ureadahead/*.pack || true -+ rmdir /var/lib/ureadahead || true -+ fi -+} -+ -+ -+case "$1" in -+ remove) -+ ;; -+ -+ purge) -+ purge_files -+ ;; -+ -+ upgrade|failed-upgrade|disappear) -+ ;; -+ -+ abort-install|abort-upgrade) -+ ;; -+ -+ *) -+ echo "$0 called with unknown argument \`$1'" 1>&2 -+ exit 1 -+ ;; -+esac -+ -+#DEBHELPER# -+exit 0 ---- ureadahead-0.100.0.orig/debian/ureadahead.dirs -+++ ureadahead-0.100.0/debian/ureadahead.dirs -@@ -0,0 +1,3 @@ -+usr/share/apport/package-hooks -+var/lib/ureadahead -+var/lib/ureadahead/debugfs ---- ureadahead-0.100.0.orig/debian/control -+++ ureadahead-0.100.0/debian/control -@@ -0,0 +1,24 @@ -+Source: ureadahead -+Section: admin -+Priority: required -+Maintainer: Scott James Remnant -+Standards-Version: 3.9.1 -+Build-Depends: debhelper (>= 7.3.15ubuntu3), pkg-config (>= 0.22), libnih-dev (>= 1.0.0), libblkid-dev (>= 2.16), e2fslibs-dev (>= 1.41) -+ -+Package: ureadahead -+Architecture: any -+Depends: ${shlibs:Depends}, ${misc:Depends}, upstart (>= 0.6.0) -+Conflicts: readahead -+Provides: readahead -+Replaces: readahead -+Description: Read required files in advance -+ über-readahead is used during boot to read files in advance of when -+ they are needed such that they are already in the page cache, -+ improving boot performance. -+ . -+ Its data files are regenerated on the first boot after install, and -+ either monthly thereafter or when packages with init scripts or -+ configs are installed or updated. -+ . -+ ureadahead requires a kernel patch included in the Ubuntu kernel. -+ ---- ureadahead-0.100.0.orig/debian/ureadahead.postinst -+++ ureadahead-0.100.0/debian/ureadahead.postinst -@@ -0,0 +1,44 @@ -+#!/bin/sh -e -+# This script can be called in the following ways: -+# -+# After the package was installed: -+# configure -+# -+# After a trigger is activated: -+# triggered ... -+# -+# -+# If prerm fails during upgrade or fails on failed upgrade: -+# abort-upgrade -+# -+# If prerm fails during deconfiguration of a package: -+# abort-deconfigure in-favour -+# removing -+# -+# If prerm fails during replacement due to conflict: -+# abort-remove in-favour -+ -+ -+case "$1" in -+ configure) -+ ;; -+ -+ triggered) -+ # Force a reprofile -+ if [ -f /var/lib/ureadahead/pack ]; then -+ echo "ureadahead will be reprofiled on next reboot" -+ rm -f /var/lib/ureadahead/pack /var/lib/ureadahead/*.pack -+ fi -+ ;; -+ -+ abort-upgrade|abort-deconfigure|abort-remove) -+ ;; -+ -+ *) -+ echo "$0 called with unknown argument \`$1'" 1>&2 -+ exit 1 -+ ;; -+esac -+ -+#DEBHELPER# -+exit 0 ---- ureadahead-0.100.0.orig/debian/rules -+++ ureadahead-0.100.0/debian/rules -@@ -0,0 +1,28 @@ -+#!/usr/bin/make -f -+%: -+ dh $@ -+ -+ -+CFLAGS = -Wall -g -fstack-protector -fPIE -+LDFLAGS = -Wl,-z,relro -Wl,-z,now -pie -+ -+# Disable optimisations if noopt found in $DEB_BUILD_OPTIONS -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -O0 -+ LDFLAGS += -Wl,-O0 -+else -+ CFLAGS += -Os -+ LDFLAGS += -Wl,-O1 -+endif -+ -+override_dh_auto_configure: -+ dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ --exec-prefix= -+ -+ -+override_dh_install: -+ dh_install -+ install -m 644 debian/ureadahead.apport \ -+ debian/ureadahead/usr/share/apport/package-hooks/ureadahead.py -+ -+version := $(shell sed -e '1{;s|^ureadahead (\(.*\))\ .*|\1|;q;}' debian/changelog) ---- ureadahead-0.100.0.orig/debian/ureadahead.triggers -+++ ureadahead-0.100.0/debian/ureadahead.triggers -@@ -0,0 +1,2 @@ -+interest /etc/init -+interest /etc/init.d ---- ureadahead-0.100.0.orig/debian/changelog -+++ ureadahead-0.100.0/debian/changelog -@@ -0,0 +1,177 @@ -+ureadahead (0.100.0-11) natty; urgency=low -+ -+ * src/trace.c: leave room for string termination on reads (LP: #485194). -+ * man/ureadahead.8: fix typo and update bug reporting URL (LP: #697770). -+ * debian/rules: don't bother with /var/lib/ureadahead mode. -+ -+ -- Kees Cook Wed, 16 Mar 2011 17:19:01 -0700 -+ -+ureadahead (0.100.0-10) natty; urgency=low -+ -+ * Install /var/lib/ureadahead mode 0700 so other users cannot see -+ the debugfs mount point. -+ -+ -- Kees Cook Tue, 22 Feb 2011 12:13:22 -0800 -+ -+ureadahead (0.100.0-9) natty; urgency=low -+ -+ [ Bilal Akhtar ] -+ * Removed sreadahead transitional package and its postinst, postrm, -+ preinst and install files. (LP: #545596) -+ * Passed --sourcedir argument to dh_install -+ * Removed dh_gencontrol calls for package sreadahead. -+ -+ [ Martin Pitt ] -+ * src/Makefile.{am,in}: Add missing -lrt, as pack.c uses clock_gettime. -+ Fixes building with gcc 4.5. -+ * debian/rules: Revert --sourcedir passing, it's not necessary. -+ * debian/rules: Don't install apport hook as executable. -+ * debian/copyright: Point to versioned GPL-2 file. -+ * debian/control: Bump Standards-Version to 3.9.1. -+ -+ -- Martin Pitt Fri, 26 Nov 2010 12:29:40 +0100 -+ -+ureadahead (0.100.0-8) maverick; urgency=low -+ -+ * Decrease the buffer size to just 8MB, after much testing we don't -+ need much more than this since it will be limited by the size of the -+ page cache anyway. -+ -+ This is in lieu of a new version of ureadahead for Maverick, which -+ while work is ongoing, isn't ready for shipping at this time. -+ LP: #600359. -+ -+ -- Scott James Remnant Mon, 20 Sep 2010 18:34:31 +0100 -+ -+ureadahead (0.100.0-7) maverick; urgency=low -+ -+ * Count the number of CPUs and divide buffer_size_kb by the number of CPUs. -+ Users should watch for instances of "mmiotrace has lost events" in dmesg to make -+ sure the trace buffers are not too small. The original value for -+ buffer_size_kb was chosen somewhat arbitrarily. Empirical testing -+ has shown that its large enough, so we don't actually know where the lower -+ boundary lies. -+ -LP: #491943 -+ -+ -- Tim Gardner Fri, 20 Aug 2010 12:19:31 -0600 -+ -+ureadahead (0.100.0-6) maverick; urgency=low -+ -+ * Restore buffer_size_kb upon exit, but do it _after_ -+ the trace buffer has been read. This frees the memory -+ consumed by the trace operation (which can be a lot). -+ -LP: #501715 -+ -+ -- Tim Gardner Thu, 22 Jul 2010 04:04:36 -0600 -+ -+ureadahead (0.100.0-5) maverick; urgency=low -+ -+ * src/pack.c: Amend mount point detection logic to stat the mount point -+ instead of just comparing major/minor versions with /proc/self/mountinfo -+ (LP: #570014). -+ -+ -- Chow Loong Jin Fri, 25 Jun 2010 13:14:54 +0100 -+ -+ureadahead (0.100.0-4.1) lucid; urgency=low -+ -+ * Revert previous upload; had forgotten that the sreadahead package -+ contains all the clean-up stuff so we want to keep it for the -+ release upgrade after all. -+ -+ -- Scott James Remnant Wed, 17 Feb 2010 12:57:00 +0000 -+ -+ureadahead (0.100.0-4) lucid; urgency=low -+ -+ * debian/control: drop sreadahead migration package; dist-upgrade users -+ will have ureadahead installed by the standard meta-packages. -+ -+ -- Scott James Remnant Wed, 17 Feb 2010 12:14:09 +0000 -+ -+ureadahead (0.100.0-3) lucid; urgency=low -+ -+ * conf/ureadahead-other.conf: Change from "on mount" to "on mounted", -+ the former didn't work anyway. -+ -+ -- Scott James Remnant Mon, 21 Dec 2009 23:20:02 +0000 -+ -+ureadahead (0.100.0-2) lucid; urgency=low -+ -+ * Put an all-important "--" in the dh_auto_configure invocation so that -+ ureadahead is installed into the right path (/sbin) -+ -+ -- Scott James Remnant Tue, 01 Dec 2009 02:25:50 +0000 -+ -+ureadahead (0.100.0-1) lucid; urgency=low -+ -+ * New upstream release: -+ - Use external libnih -+ -+ * debian/control: Add build-dependency on libnih-dev -+ * debian/rules: Fix installation of apport hook. -+ -+ -- Scott James Remnant Sun, 29 Nov 2009 15:24:15 +0000 -+ -+ureadahead (0.90.3-2) karmic-proposed; urgency=low -+ -+ * über-readahead is a replacement for sreadahead that should -+ significantly improve boot performance on rotational hard drives, -+ especially those that had regressed in performance from jaunty to -+ karmic. -+ -+ It does this by pre-loading such things as ext2/3/4 inodes and opening -+ files in as logical order as possible before loading all blocks in one -+ pass across the disk. -+ -+ On SSD, this behaves much as sreadahead used to, replacing that package -+ with slightly improved tracing code. -+ -+ This requires the kernel package also found in karmic-proposed. -+ -+ LP: #432089. -+ -+ -- Scott James Remnant Mon, 09 Nov 2009 18:38:51 +0000 -+ -+ureadahead (0.90.3-1) karmic; urgency=low -+ -+ * New upstream release: -+ - Move ext2fs inode group lookup into the tracing stage, storing the -+ groups to preload in the pack, rather than spending time on normal -+ boots working it out. -+ - Open files in order of inode group (or inode number on non-ext2fs), -+ which seems to give a benefit in load time and certainly produces -+ better blktrace output. -+ - Increase the "too old" check from a month to a year. -+ - Fix dump of zero-byte files to not claim a single page. -+ - Fix unhandled error output when given an unknown pack file. -+ - Don't call ureadhead for the root filesystem twice on boot (the second -+ time should only take a few ms, but that's still time) -+ - Consider exit status 4 (no pack file for given mount point) normal. -+ - Make uselib tracing optional. -+ -+ -- Scott James Remnant Thu, 05 Nov 2009 15:10:06 +0000 -+ -+ureadahead (0.90.2-1) karmic; urgency=low -+ -+ * New upstream release: -+ - improved SSD mode -+ - inode group preload threshold configurable by environment variable -+ - default inode group preload threshold changed to 16, because random -+ stabbing in the dark suggested it was a good number -+ - add a job that profiles extra mountpoints -+ -+ * Remove /etc/cron.monthly/sreadahead too. -+ * Add an apport hook to attach a dump of the packs. -+ -+ -- Scott James Remnant Thu, 29 Oct 2009 18:14:51 +0000 -+ -+ureadahead (0.90.1-1) karmic; urgency=low -+ -+ * Bug fixes. -+ -+ -- Scott James Remnant Thu, 29 Oct 2009 02:13:38 +0000 -+ -+ureadahead (0.90.0-1) karmic; urgency=low -+ -+ * Initial release to ubuntu-boot PPA. -+ -+ -- Scott James Remnant Thu, 29 Oct 2009 01:01:42 +0000 ---- ureadahead-0.100.0.orig/debian/ureadahead.apport -+++ ureadahead-0.100.0/debian/ureadahead.apport -@@ -0,0 +1,15 @@ -+'''apport package hook for ureadahead -+ -+(c) 2009 Canonical Ltd. -+Author: Scott James Remnant -+''' -+ -+import os -+import apport.hookutils -+ -+def add_info(report): -+ for f in os.listdir('/var/lib/ureadahead'): -+ if f == 'pack': -+ report['PackDump'] = apport.hookutils.command_output(['ureadahead', '--dump']) -+ elif f.endswith('.pack'): -+ report['PackDump'+f[:-5].title()] = apport.hookutils.command_output(['ureadahead', '--dump']) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/ureadahead-0.100.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/ureadahead-0.100.0-r2.ebuild deleted file mode 100644 index a270a40d96..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ureadahead/ureadahead-0.100.0-r2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 -inherit eutils - -DESCRIPTION="Ureadahead - Read files in advance during boot" -HOMEPAGE="https://launchpad.net/ureadahead" -SRC_URI="http://launchpad.net/ureadahead/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 amd64 arm" - -RDEPEND="sys-apps/util-linux - >=sys-fs/e2fsprogs-1.41 - sys-libs/libnih" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-devel/gettext" - -src_prepare() { - epatch "${FILESDIR}"/${P}-11.patch # Downloaded from upstream -} - -src_configure() { - econf --sbindir=/sbin -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - rm -r "${D}/etc/init" - keepdir /var/lib/ureadahead -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules deleted file mode 100644 index 039a7f09c2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="mali0", MODE="0660", GROUP="video" \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild deleted file mode 120000 index 59f248a330..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild +++ /dev/null @@ -1 +0,0 @@ -mali-rules-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild deleted file mode 100644 index 09f6eacb53..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild +++ /dev/null @@ -1,24 +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="Rules for setting permissions right on /dev/mali0" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="arm" -IUSE="" - -# Because this ebuild has no source package, "${S}" doesn't get -# automatically created. The compile phase depends on "${S}" to -# exist, so we make sure "${S}" refers to a real directory. -# -# The problem is apparently an undocumented feature of EAPI 4; -# earlier versions of EAPI don't require this. -S="${WORKDIR}" - -src_install() { - insinto /etc/udev/rules.d - doins "${FILESDIR}"/50-mali.rules -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog deleted file mode 100644 index f69d094d31..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog +++ /dev/null @@ -1,1512 +0,0 @@ -# ChangeLog for x11-drivers/nvidia-drivers -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.268 2011/01/24 18:13:43 cardoe Exp $ - -*nvidia-drivers-270.18 (24 Jan 2011) - - 24 Jan 2011; Doug Goldstein - +nvidia-drivers-270.18.ebuild: - Add new nvidia-drivers beta. Adds a new library and adds initial support for - X.org 1.10 - -*nvidia-drivers-260.19.36 (24 Jan 2011) - - 24 Jan 2011; Doug Goldstein - +nvidia-drivers-260.19.36.ebuild: - Version bump. Some minor fixes from upstream. - - 25 Dec 2010; Christian Faulhammer - nvidia-drivers-96.43.19.ebuild, nvidia-drivers-173.14.28.ebuild, - nvidia-drivers-260.19.29.ebuild: - stable x86, bug 348186 - - 24 Dec 2010; Samuli Suominen - nvidia-drivers-96.43.19.ebuild, nvidia-drivers-260.19.29.ebuild: - amd64 stable wrt #348186 - - 23 Dec 2010; Richard Freeman - nvidia-drivers-173.14.28.ebuild: - amd64 stable - 348186 - -*nvidia-drivers-260.19.29 (14 Dec 2010) - - 14 Dec 2010; Jeroen Roovers - +nvidia-drivers-260.19.29.ebuild: - Version bump (bug #347371). - -*nvidia-drivers-173.14.28 (06 Dec 2010) - - 06 Dec 2010; Jeroen Roovers - +nvidia-drivers-173.14.28.ebuild: - Version bump by radfoj (bug #342361). - -*nvidia-drivers-260.19.26 (01 Dec 2010) - - 01 Dec 2010; Michał Januszewski - +nvidia-drivers-260.19.26.ebuild: - Version bump. This is a beta version (and thus masked), but it is also the - first 260.x release that works with GF330M. - - 20 Nov 2010; Jeroen Roovers nvidia-drivers-96.43.19.ebuild: - Free xorg-server dependency (bug #345929). - -*nvidia-drivers-96.43.19 (19 Nov 2010) - - 19 Nov 2010; Jeroen Roovers +nvidia-drivers-96.43.19.ebuild: - Version bump by Miguel R. Caudevilla (bug #345929). - -*nvidia-drivers-260.19.21 (18 Nov 2010) - - 18 Nov 2010; Doug Goldstein - -nvidia-drivers-260.19.06.ebuild, -nvidia-drivers-260.19.12.ebuild, - +nvidia-drivers-260.19.21.ebuild: - Bump to the latest official release. Remove beta releases. - -*nvidia-drivers-260.19.12 (15 Oct 2010) - - 15 Oct 2010; Doug Goldstein - +nvidia-drivers-260.19.12.ebuild: - Version bump for new upstream release. Added a note about what USE=gtk - does when you disable it. - - 14 Oct 2010; Christian Faulhammer - nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild, - nvidia-drivers-195.36.31.ebuild: - stable x86, bug 332501 - - 21 Sep 2010; Markos Chandras - nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild, - nvidia-drivers-195.36.31.ebuild: - Stable on amd64. Bug #332501 - -*nvidia-drivers-260.19.06 (20 Sep 2010) - - 20 Sep 2010; Doug Goldstein - -nvidia-drivers-260.19.04.ebuild, +nvidia-drivers-260.19.06.ebuild: - beta version bump - - 11 Sep 2010; Tomáš Chvátal - -nvidia-drivers-185.18.36-r1.ebuild: - Remove version depending on deprecated xorg-server. - -*nvidia-drivers-260.19.04 (08 Sep 2010) - - 08 Sep 2010; Doug Goldstein - +nvidia-drivers-260.19.04.ebuild: - Version bump for latest beta release - -*nvidia-drivers-256.53 (31 Aug 2010) - - 31 Aug 2010; Doug Goldstein - +nvidia-drivers-256.53.ebuild: - version bump - - 30 Aug 2010; Doug Goldstein - nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: - fix up blocker with media-video/nvidia-settings - - 30 Aug 2010; Doug Goldstein - nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: - Implement installing nvidia-settings when USE=gtk is enabled as discussed - in bug #304255 - - 30 Aug 2010; Doug Goldstein - nvidia-drivers-256.52.ebuild: - Fix xorg-server depend to properly include the 1.9 series - - 30 Aug 2010; Doug Goldstein - -nvidia-drivers-96.43.14.ebuild, -nvidia-drivers-173.14.22.ebuild, - -nvidia-drivers-195.36.15.ebuild, -nvidia-drivers-256.35.ebuild: - Clear out some older versions that have been supplanted by newer stable - versions - - 30 Aug 2010; Doug Goldstein - -nvidia-drivers-71.86.11.ebuild: - Removee versions that rely on xorg-server-1.4 or older (which is no longer - in the tree). - -*nvidia-drivers-256.52 (30 Aug 2010) -*nvidia-drivers-256.44-r1 (30 Aug 2010) - - 30 Aug 2010; Doug Goldstein - +nvidia-drivers-256.44-r1.ebuild, +nvidia-drivers-256.52.ebuild: - version bump and several clean ups to bring the ebuild up to the state of - the current unmasked ebuilds - -*nvidia-drivers-256.44 (04 Aug 2010) - - 04 Aug 2010; Michał Januszewski - +nvidia-drivers-256.44.ebuild: - Version bump. - - 30 Jul 2010; Tomáš Chvátal - nvidia-drivers-71.86.11.ebuild, nvidia-drivers-96.43.14.ebuild, - nvidia-drivers-96.43.16.ebuild, nvidia-drivers-96.43.18.ebuild, - nvidia-drivers-173.14.22.ebuild, nvidia-drivers-173.14.25.ebuild, - nvidia-drivers-173.14.27.ebuild, nvidia-drivers-185.18.36-r1.ebuild, - nvidia-drivers-190.53-r1.ebuild, nvidia-drivers-195.36.15.ebuild, - nvidia-drivers-195.36.24.ebuild, nvidia-drivers-195.36.31.ebuild, - nvidia-drivers-256.35.ebuild: - Depend on proper emul lib to fix bug #330249. - - 27 Jul 2010; Michał Januszewski - nvidia-drivers-256.35.ebuild: - Add a dependency on x11-libs/libXvMC (bug #321061). - - 20 Jul 2010; Doug Goldstein - nvidia-drivers-173.14.27.ebuild: - Conditionally install CUDA support if it was found in the package. - Apparently 173.14.27 drops CUDA. fixes bug #328681 - - 17 Jul 2010; Christian Faulhammer - nvidia-drivers-173.14.25.ebuild: - stable x86, bug 327003 - - 16 Jul 2010; Maciej Mrozowski - nvidia-drivers-173.14.25.ebuild: - amd64 stable, bug 327003 - -*nvidia-drivers-173.14.27 (16 Jul 2010) -*nvidia-drivers-96.43.18 (16 Jul 2010) - - 16 Jul 2010; Doug Goldstein - +nvidia-drivers-96.43.18.ebuild, +nvidia-drivers-173.14.27.ebuild: - bump available legacy drivers. Added support for xorg-server-1.8 in - nvidia-drivers-173.14.27 - - 15 Jul 2010; Markos Chandras - nvidia-drivers-96.43.16.ebuild: - Stable on amd64 wrt bug #326323 - -*nvidia-drivers-195.36.31 (13 Jul 2010) - - 13 Jul 2010; Doug Goldstein - -nvidia-drivers-180.60.ebuild, -nvidia-drivers-190.42-r3.ebuild, - -nvidia-drivers-190.53.ebuild, -nvidia-drivers-195.30.ebuild, - +nvidia-drivers-195.36.31.ebuild: - Version bump to the latest 195.36.x. Remove older versions that will no - longer be supported. Fix bug #317049 while I'm at it - - 10 Jul 2010; Christian Faulhammer - nvidia-drivers-96.43.16.ebuild: - stable x86, bug 326323 - - 07 Jul 2010; Pawel Hajdan jr - nvidia-drivers-195.36.24.ebuild: - x86 stable wrt bug #325513 - - 30 Jun 2010; Jeroen Roovers metadata.xml: - Correct description. - - 26 Jun 2010; Samuli Suominen - nvidia-drivers-195.36.24.ebuild: - amd64 stable wrt #325513 - - 24 Jun 2010; Michał Januszewski - +files/256.35-unified-arch.patch, nvidia-drivers-256.35.ebuild: - Add a patch for the 'x86' unified kernel architecture. - -*nvidia-drivers-256.35 (24 Jun 2010) - - 24 Jun 2010; Michał Januszewski - +nvidia-drivers-256.35.ebuild: - Version bump. - -*nvidia-drivers-195.36.24 (25 Apr 2010) - - 25 Apr 2010; Justin Lecher - +nvidia-drivers-195.36.24.ebuild: - Version Bump on permission, #315141 - - 24 Mar 2010; Doug Goldstein - nvidia-drivers-195.36.15.ebuild: - clean up some QA warnings - - 24 Mar 2010; Doug Goldstein - nvidia-drivers-195.36.15.ebuild: - add missing nvidia.icd to fix bug #310277 - - 17 Mar 2010; Doug Goldstein - nvidia-drivers-173.14.20.ebuild: - still adding back 173.14.20, but repoman doesn't let me stable it right - away since the ebuild was stable when it was removed.. - - 17 Mar 2010; Doug Goldstein - +nvidia-drivers-173.14.20.ebuild: - add back 173.14.20 at the request of Giao Phan for bug - #294089 - -*nvidia-drivers-195.36.15 (17 Mar 2010) - - 17 Mar 2010; Doug Goldstein - +nvidia-drivers-195.36.15.ebuild: - add upstream's pre-release version of the 195.x.y series. Still needs to - be tested on further kernels and x86 before unmasking - - 10 Mar 2010; Doug Goldstein - -nvidia-drivers-71.86.09.ebuild, -nvidia-drivers-96.43.13.ebuild, - -nvidia-drivers-173.14.20.ebuild, -nvidia-drivers-173.14.20-r1.ebuild, - -nvidia-drivers-185.18.36.ebuild, -nvidia-drivers-190.29.ebuild: - spring cleaning - - 10 Mar 2010; Doug Goldstein - -nvidia-drivers-195.36.03.ebuild: - remove the broken drivers - - 28 Feb 2010; Fabio Erculiani - nvidia-drivers-190.53-r1.ebuild, - +files/nvidia-drivers-190.53-2.6.33.patch: - add 2.6.33 kernel support to 190.53 - -*nvidia-drivers-173.14.25 (27 Feb 2010) - - 27 Feb 2010; Maciej Mrozowski - +nvidia-drivers-173.14.25.ebuild: - Version bump, bug 305713 - -*nvidia-drivers-96.43.16 (15 Feb 2010) - - 15 Feb 2010; Jeroen Roovers - +nvidia-drivers-96.43.16.ebuild: - Version bump thanks to John Brendler (bug #304841). - - 09 Feb 2010; Pacho Ramos - nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild: - amd64 stable, bug 299560 - -*nvidia-drivers-195.36.03 (08 Feb 2010) - - 08 Feb 2010; Michał Januszewski - +nvidia-drivers-195.36.03.ebuild: - Beta version bump (bug #303821). - - 07 Feb 2010; Michał Januszewski - +files/195.30-unified-arch.patch, nvidia-drivers-195.30.ebuild: - Add support for the unified 'x86' kernel architecture. - -*nvidia-drivers-195.30 (07 Feb 2010) - - 07 Feb 2010; Michał Januszewski - +nvidia-drivers-195.30.ebuild: - Add the latest beta drivers with support for CUDA 3.0. - - 01 Feb 2010; Christian Faulhammer - nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild: - stable x86, bug 299560 - -*nvidia-drivers-190.53-r1 (04 Jan 2010) - - 04 Jan 2010; Doug Goldstein - +nvidia-drivers-190.53-r1.ebuild: - revert the change to install VDPAU drivers to /usr/lib/vdpau since - libvdpau's dlopen() usage is incorrect. Stop gap ebuild until the issue is - discussed further with upstream. - - 21 Dec 2009; Doug Goldstein - -nvidia-drivers-190.42-r2.ebuild: - remove old version - - 21 Dec 2009; Doug Goldstein - +nvidia-drivers-190.53.ebuild: - version bump - - 17 Dec 2009; Doug Goldstein - -nvidia-drivers-190.53.ebuild: - as stated in bug #296947, this breaks VDPAU, but apparently peper, who's - not a maintainer knows better. - -*nvidia-drivers-190.53 (16 Dec 2009) - - 16 Dec 2009; Piotr Jaroszyński - +nvidia-drivers-190.53.ebuild: - Add 190.53. - - 28 Nov 2009; Doug Goldstein - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild: - fix bug #276815 - - 28 Nov 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild: - remove defunct compat_device_check. bug #294896 and bug #294623 - - 21 Nov 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild: - stabilize for bug #290555 - - 21 Nov 2009; Doug Goldstein - nvidia-drivers-71.86.11.ebuild: - stabilize for bug #290561 - -*nvidia-drivers-96.43.14 (13 Nov 2009) - - 13 Nov 2009; Doug Goldstein - +nvidia-drivers-96.43.14.ebuild: - version bump for xorg-server 1.7 support. ebuild uses the refactored - ebuild as a base - -*nvidia-drivers-173.14.22 (13 Nov 2009) - - 13 Nov 2009; Doug Goldstein - +nvidia-drivers-173.14.22.ebuild: - version bump for xorg-server 1.7 support. ebuild uses the refactored - ebuild as a base - - 12 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r3.ebuild: - fix bash syntax error - -*nvidia-drivers-190.29 (09 Nov 2009) - - 09 Nov 2009; Doug Goldstein - +nvidia-drivers-190.29.ebuild: - add 190.29 series for OpenCL support - - 06 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r3.ebuild: - oops. fix issue where we might remove vdpau and cuda files - - 06 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r3.ebuild: - more FreeBSD fixes - -*nvidia-drivers-190.42-r3 (06 Nov 2009) - - 06 Nov 2009; Doug Goldstein - +nvidia-drivers-190.42-r3.ebuild: - remove generation of libGL.la since eselect-opengl-1.0.9 and newer no - longer uses it. refactor installation of libraries to fix FreeBSD issues - - 06 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r2.ebuild: - add NV_X11_DRV and NV_X11_EXT to deal with different location of files on - FreeBSD - - 03 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r2.ebuild: - clean up x86 QA_ settings - - 03 Nov 2009; Doug Goldstein - nvidia-drivers-185.18.36-r1.ebuild, -nvidia-drivers-190.42-r1.ebuild, - nvidia-drivers-190.42-r2.ebuild: - no longer need to block newer mesa since eselect-opengl has been updated. - remove older revision of 190.42 - - 01 Nov 2009; Michael Sterrett - nvidia-drivers-173.14.20.ebuild, nvidia-drivers-173.14.20-r1.ebuild, - nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild, - nvidia-drivers-190.42-r2.ebuild: - fix typo in elog (bug #291397) - -*nvidia-drivers-190.42-r2 (31 Oct 2009) - - 31 Oct 2009; Doug Goldstein - +nvidia-drivers-190.42-r2.ebuild: - reworked the ebuild for an overall improvement. Should fix several obscure - issues people have with different profiles. remove usage of non-TLS - libraries since Gentoo has TLS glibc's. still a work in progress for other - clean ups. - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild: - Quadro NVS 140 support fixed in 185.18.36 - -*nvidia-drivers-173.14.20-r1 (29 Oct 2009) - - 29 Oct 2009; Doug Goldstein - +nvidia-drivers-173.14.20-r1.ebuild: - install nvidia-smi application and nvidia-xconfig man page - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild, - nvidia-drivers-190.42-r1.ebuild: - fix QA_EXECSTACKS issue with libXvMCNVIDIA as reported in bug #290258 - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild, - nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild: - >=media-libs/mesa-7.6 makes changes to the libGL.la behavior with eselect - that will cause OpenGL to be broken - - 29 Oct 2009; Doug Goldstein - -nvidia-drivers-185.18.14.ebuild, -nvidia-drivers-185.18.29.ebuild, - -nvidia-drivers-185.18.31.ebuild, -nvidia-drivers-190.18.ebuild, - -nvidia-drivers-190.25.ebuild, -nvidia-drivers-190.32.ebuild, - -nvidia-drivers-190.36.ebuild, -nvidia-drivers-190.40.ebuild, - -nvidia-drivers-190.42.ebuild: - cull older version - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild: - fix xorg-server version dependency - - 27 Oct 2009; Samuli Suominen - nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild: - Remove - -nvidia-drivers-96.43.09.ebuild, -nvidia-drivers-96.43.11.ebuild, - -nvidia-drivers-173.14.15.ebuild, -nvidia-drivers-173.14.18.ebuild, - -nvidia-drivers-180.29.ebuild: - Remove old 96, 173 and 180. - - 26 Oct 2009; Samuli Suominen - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild: - amd64 stable wrt #281302 - - 22 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild: - don't install the vdpau headers since libvdpau provides those now - -*nvidia-drivers-190.42-r1 (22 Oct 2009) -*nvidia-drivers-185.18.36-r1 (22 Oct 2009) - - 22 Oct 2009; Doug Goldstein - +nvidia-drivers-185.18.36-r1.ebuild, +nvidia-drivers-190.42-r1.ebuild: - Update to new way of shipping VDPAU wrapper in its own library from - Freedesktop after discussing distro packaging with NVIDIA. - -*nvidia-drivers-190.42 (22 Oct 2009) - - 22 Oct 2009; Piotr Jaroszyński - +nvidia-drivers-190.42.ebuild: - Add 190.42. - - 22 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-185.18.36.ebuild, - nvidia-drivers-190.32.ebuild, nvidia-drivers-190.36.ebuild, - nvidia-drivers-190.40.ebuild: - add note about needing to add QA_LDFLAGS for nvidia-smi - -*nvidia-drivers-185.18.36 (21 Oct 2009) - - 21 Oct 2009; Jeroen Roovers - +nvidia-drivers-185.18.36.ebuild: - Version bump (bug #288591). - -*nvidia-drivers-190.40 (17 Oct 2009) - - 17 Oct 2009; Piotr Jaroszyński - +nvidia-drivers-190.40.ebuild: - Add 190.40. - - 06 Oct 2009; Jeroen Roovers - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, - nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild, - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, - nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, - nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild, - nvidia-drivers-190.36.ebuild: - Remove elibc_glibc dependency for now as it breaks horribly. - - 06 Oct 2009; Jeroen Roovers - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, - nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild, - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, - nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, - nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild, - nvidia-drivers-190.36.ebuild: - Replace built_with_use (bug #286961), go EAPI=2 compliant. - -*nvidia-drivers-190.36 (27 Sep 2009) - - 27 Sep 2009; Piotr Jaroszyński - +nvidia-drivers-190.36.ebuild: - Add 190.36. - - 26 Sep 2009; Michał Januszewski - nvidia-drivers-190.32.ebuild: - Fix bug #283572 (add a check for CONFIG_LOCKDEP). - - 26 Sep 2009; Michał Januszewski - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.32.ebuild: - Fix bug #281895 (install manual pages). Also install the nvidia-smi tool - and prepare support for OpenCL (note that the current drivers do NOT - support OpenCL). - -*nvidia-drivers-190.32 (21 Sep 2009) - - 21 Sep 2009; Alex Alexander - +nvidia-drivers-190.32.ebuild: - version bump, beta 190.32 - - 19 Sep 2009; Tomáš Chvátal - -nvidia-drivers-71.86.07.ebuild: - Cleanup. Removal of old xorg versions. - -*nvidia-drivers-190.25 (02 Sep 2009) - - 02 Sep 2009; Piotr Jaroszyński - +nvidia-drivers-190.25.ebuild: - Add 190.25. - - 29 Aug 2009; Jeroen Roovers - nvidia-drivers-96.43.13.ebuild: - Stable for x86 (bug #273539). - - 27 Aug 2009; Raúl Porcel - nvidia-drivers-173.14.20.ebuild: - x86 stable - -*nvidia-drivers-71.86.11 (23 Aug 2009) - - 23 Aug 2009; Jeroen Roovers - +nvidia-drivers-71.86.11.ebuild: - Version bump (bug #280244). - - 03 Aug 2009; Michał Januszewski - nvidia-drivers-185.18.29.ebuild, nvidia-drivers-185.18.31.ebuild: - Add a device compatibility check (bug #280031, #279542). Users of graphics - cards known to be incompatible with a particular version of the drivers - will now be warned about the incompatibility when installing the package. - -*nvidia-drivers-173.14.20 (03 Aug 2009) - - 03 Aug 2009; Doug Goldstein - +nvidia-drivers-173.14.20.ebuild: - bump 173.x.y series to 173.14.20 - - 03 Aug 2009; Doug Goldstein metadata.xml: - update maintainer info - - 03 Aug 2009; Doug Goldstein - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, - nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, - -files/eblits/paravirt_check.eblit: - remove paravirt check again. bug #264375 again - - 02 Aug 2009; nvidia-drivers-71.86.09.ebuild, - nvidia-drivers-96.43.11.ebuild: - Completely unable to find testers with sufficiently old hardware on AMD64 - kit; doing a Nike on this in agreement with Jeremy "darkside" Olexa & - VQuicksilver. Closes bug #275495. - -*nvidia-drivers-185.18.31 (01 Aug 2009) - - 01 Aug 2009; Michał Januszewski - +nvidia-drivers-185.18.31.ebuild: - Version bump. - - 31 Jul 2009; nvidia-drivers-173.14.18.ebuild, - nvidia-drivers-180.60.ebuild: - Marked stable as requested by Doug Goldstein in bug - #275495. Testing by Víctor "VQuicksilver" Enríquez on a Club3D GeForce - 7600GS. - -*nvidia-drivers-185.18.29 (29 Jul 2009) - - 29 Jul 2009; Michał Januszewski - +nvidia-drivers-185.18.29.ebuild: - Version bump (bug #279542). - -*nvidia-drivers-190.18 (27 Jul 2009) - - 27 Jul 2009; Michał Januszewski - +nvidia-drivers-190.18.ebuild: - Add the latest beta version of the NVIDIA drivers. This is the first - version of the drivers in the tree to support CUDA 2.3. This ebuild should - remain masked. - -*nvidia-drivers-185.18.14 (25 Jul 2009) - - 25 Jul 2009; Michał Januszewski - +nvidia-drivers-185.18.14.ebuild: - Version bump (bug #265238). - - 22 Jul 2009; Michał Januszewski metadata.xml: - Add myself as a maintainer. - -*nvidia-drivers-96.43.13 (02 Jul 2009) - - 02 Jul 2009; Jeroen Roovers - +nvidia-drivers-96.43.13.ebuild: - Version bump. - - 29 Jun 2009; Christian Faulhammer - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.60.ebuild: - stable x86, bug 275495 - - 29 Jun 2009; Jeroen Roovers metadata.xml: - Add myself as maintainer. - - 24 Jun 2009; Doug Goldstein - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-173.14.18.ebuild: - update supported xorg-server version - - 14 Jun 2009; Mike Frysinger +files/nvidia-169.07: - Restore nvidia-169.07 as it is still in use by newer ebuilds. - - 12 Jun 2009; Doug Goldstein - -files/NVIDIA_i2c-hwmon.patch, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-96.43.11.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.29.ebuild, - nvidia-drivers-180.60.ebuild: - remove NVIDIA_i2c-hwmon.patch as requested by NVIDIA as this isn't safe - with certain NVIDIA skus. - - 12 Jun 2009; Doug Goldstein - -files/nvidia-2.6.28.patch, -nvidia-drivers-71.86.06.ebuild, - -nvidia-drivers-71.86.08.ebuild, -nvidia-drivers-96.43.07.ebuild, - -nvidia-drivers-96.43.10.ebuild, -nvidia-drivers-100.14.19.ebuild, - -files/nvidia-169.07, -nvidia-drivers-173.14.09.ebuild, - -nvidia-drivers-173.14.12.ebuild, -nvidia-drivers-173.14.16.ebuild, - -nvidia-drivers-173.14.17.ebuild, -nvidia-drivers-177.80.ebuild, - -nvidia-drivers-177.82.ebuild, -nvidia-drivers-180.22.ebuild, - -nvidia-drivers-180.27.ebuild, -nvidia-drivers-180.37.ebuild, - -nvidia-drivers-180.41.ebuild, -nvidia-drivers-180.44.ebuild, - -nvidia-drivers-180.51.ebuild, -files/NVIDIA_glx-makefile.patch: - cull old versions - - 12 Jun 2009; Doug Goldstein - nvidia-drivers-180.22.ebuild, nvidia-drivers-180.27.ebuild, - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.37.ebuild, - nvidia-drivers-180.41.ebuild, nvidia-drivers-180.44.ebuild, - nvidia-drivers-180.51.ebuild, nvidia-drivers-180.60.ebuild: - fix paravirt check. bug #261696 - -*nvidia-drivers-180.60 (27 May 2009) - - 27 May 2009; Doug Goldstein - +nvidia-drivers-180.60.ebuild: - version bump. fix QA checks - - 06 May 2009; Mike Frysinger - nvidia-drivers-71.86.06.ebuild, nvidia-drivers-71.86.07.ebuild, - nvidia-drivers-71.86.08.ebuild, nvidia-drivers-71.86.09.ebuild, - nvidia-drivers-96.43.07.ebuild, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-96.43.10.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-173.14.09.ebuild, - nvidia-drivers-173.14.12.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.16.ebuild, nvidia-drivers-173.14.17.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-177.80.ebuild, - nvidia-drivers-177.82.ebuild, nvidia-drivers-180.22.ebuild, - nvidia-drivers-180.27.ebuild, nvidia-drivers-180.29.ebuild, - nvidia-drivers-180.37.ebuild, nvidia-drivers-180.41.ebuild, - nvidia-drivers-180.44.ebuild, nvidia-drivers-180.51.ebuild: - Install modprobe.d file as nvidia.conf. - -*nvidia-drivers-180.51 (19 Apr 2009) - - 19 Apr 2009; Doug Goldstein - +nvidia-drivers-180.51.ebuild: - version bump - -*nvidia-drivers-180.44 (30 Mar 2009) - - 30 Mar 2009; Doug Goldstein - +nvidia-drivers-180.44.ebuild: - add latest driver release - -*nvidia-drivers-173.14.18 (23 Mar 2009) -*nvidia-drivers-71.86.09 (23 Mar 2009) - - 23 Mar 2009; +nvidia-drivers-71.86.09.ebuild, - +nvidia-drivers-173.14.18.ebuild: - Version bumps. - -*nvidia-drivers-180.41 (23 Mar 2009) - - 23 Mar 2009; +nvidia-drivers-180.41.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?p=1963540 - -*nvidia-drivers-173.14.17 (17 Mar 2009) -*nvidia-drivers-96.43.11 (17 Mar 2009) - - 17 Mar 2009; Doug Goldstein - +nvidia-drivers-96.43.11.ebuild, +nvidia-drivers-173.14.17.ebuild: - version bumps - - 17 Mar 2009; Doug Goldstein - nvidia-drivers-180.29.ebuild: - mark 180.29 stable - -*nvidia-drivers-180.37 (09 Mar 2009) - - 09 Mar 2009; Doug Goldstein - -nvidia-drivers-180.35.ebuild, +nvidia-drivers-180.37.ebuild: - version bump for several bugs including errors with signal handling. - remove broken version - - 28 Feb 2009; Markus Meier metadata.xml: - custom-cflags is a global USE-flag - -*nvidia-drivers-180.35 (25 Feb 2009) - - 25 Feb 2009; Doug Goldstein - +nvidia-drivers-180.35.ebuild: - newer version. adds GPU support. fixes OpenGL 3.0 and VDPAU issues. - -*nvidia-drivers-180.29 (11 Feb 2009) - - 11 Feb 2009; Doug Goldstein - +nvidia-drivers-180.29.ebuild: - version bump - -*nvidia-drivers-173.14.16 (04 Feb 2009) - - 04 Feb 2009; Ricardo Mendoza - +nvidia-drivers-173.14.16.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126937 - -*nvidia-drivers-71.86.08 (03 Feb 2009) - - 03 Feb 2009; Ricardo Mendoza - +nvidia-drivers-71.86.08.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126955 - -*nvidia-drivers-96.43.10 (03 Feb 2009) - - 03 Feb 2009; Ricardo Mendoza - +nvidia-drivers-96.43.10.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126954 - - 31 Jan 2009; Alexis Ballier - nvidia-drivers-96.43.09.ebuild: - Backport the missing bits from the 100. ebuild for x86-fbsd and keyword it - since this is apparently the version I need for my GeForce2 MX 400 - -*nvidia-drivers-180.27 (30 Jan 2009) - - 30 Jan 2009; Daniel Gryniewicz - +nvidia-drivers-180.27.ebuild: - Proxy bump to nvidia-drivers-180.27 for cardoe - - 20 Jan 2009; Peter Alfredsen - nvidia-drivers-96.43.09.ebuild: - Non-maintainer commit: Changing - +nvidia-drivers-180.22.ebuild: - add new version. add vdpau support - - 25 Dec 2008; Markus Meier - nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild: - x86 stable, bug #252482 - - 25 Dec 2008; Thomas Anderson - nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild: - stable amd64, bug 252482. Stable for linux 2.6.27 stabilization - - 25 Dec 2008; Mike Frysinger - +files/nvidia-2.6.28.patch, nvidia-drivers-177.82.ebuild: - Add patch from upstream for linux 2.6.28 support. - -*nvidia-drivers-173.14.15 (19 Dec 2008) - - 19 Dec 2008; +nvidia-drivers-173.14.15.ebuild: - Version bump. Fixes compilation issues with newer kernels. - -*nvidia-drivers-96.43.09 (18 Dec 2008) - - 18 Dec 2008; Doug Goldstein - +nvidia-drivers-96.43.09.ebuild: - add beta version of 96.x.y legacy drivers for kernel 2.6.27 support. Fixes - bug #242476 - - 18 Dec 2008; Doug Goldstein - -files/NVIDIA_kernel-169.12-2286310.diff, - -files/NVIDIA_kernel-173.08-2404825.diff, - -files/NVIDIA_kernel-173.14.05-2419292.diff: - remove files that went along with removed versions - - 18 Dec 2008; Doug Goldstein - nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: - Fix incorrectly not replacing CFLAGS when requested. bug #241800 - - 18 Dec 2008; Doug Goldstein - -nvidia-drivers-100.14.09.ebuild, -nvidia-drivers-100.14.11.ebuild, - -nvidia-drivers-100.14.23.ebuild, -nvidia-drivers-169.07.ebuild, - -nvidia-drivers-169.09.ebuild, -nvidia-drivers-169.09-r1.ebuild, - -nvidia-drivers-169.12.ebuild, -nvidia-drivers-173.08.ebuild, - -nvidia-drivers-173.14.05.ebuild, -nvidia-drivers-177.13.ebuild, - -nvidia-drivers-177.67.ebuild, -nvidia-drivers-177.68.ebuild, - -nvidia-drivers-177.70.ebuild: - remove outdated releases that no longer have support - - 18 Dec 2008; Doug Goldstein - +files/eblits/donvidia.eblit, +files/eblits/mtrr_check.eblit, - +files/eblits/paravirt_check.eblit, +files/eblits/src_install-libs.eblit, - +files/eblits/want_tls.eblit: - Add eblits in the same fashion as sys-libs/glibc that contain commonly - used code between all the different versions of nvidia-drivers - -*nvidia-drivers-71.86.07 (17 Dec 2008) - - 17 Dec 2008; Doug Goldstein - +nvidia-drivers-71.86.07.ebuild: - add 71.86.07 to the tree for 2.6.27 kernel support. This ebuild is - refactored like my past refactoring of the ebuilds. More changes to come. - Please report issues if you spot them in the ebuild, or suggest - improvements. - - 13 Dec 2008; Doug Goldstein - nvidia-drivers-71.86.06.ebuild, nvidia-drivers-96.43.07.ebuild, - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild, - nvidia-drivers-169.07.ebuild, nvidia-drivers-169.09.ebuild, - nvidia-drivers-169.09-r1.ebuild, nvidia-drivers-169.12.ebuild, - nvidia-drivers-173.08.ebuild, nvidia-drivers-173.14.05.ebuild, - nvidia-drivers-173.14.09.ebuild, nvidia-drivers-173.14.12.ebuild, - nvidia-drivers-177.13.ebuild, nvidia-drivers-177.67.ebuild, - nvidia-drivers-177.68.ebuild, nvidia-drivers-177.70.ebuild, - nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: - update all versions to specify the exact xorg-server versions they're - compatible with - - 06 Dec 2008; Mike Frysinger - nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: - Use unpack_makeself rather than executing the script. - -*nvidia-drivers-177.82 (03 Dec 2008) - - 03 Dec 2008; Doug Goldstein - +nvidia-drivers-177.82.ebuild: - driver version bump. fixes known issues with firefox 3 image corruption. - mobile GPU resume from S3 issues. mobile GPU hotkey issues. - -*nvidia-drivers-177.80 (13 Oct 2008) - - 13 Oct 2008; Ricardo Mendoza - +nvidia-drivers-177.80.ebuild: - Version bump for new stable release as per bug #238969. Release notes can be - found at http://www.nvnews.net/vbulletin/showthread.php?t=120679 - -*nvidia-drivers-177.70 (28 Aug 2008) - - 28 Aug 2008; Ricardo Mendoza - +nvidia-drivers-177.70.ebuild: - Version bump for masked beta. Release highlights at - http://www.nvnews.net/vbulletin/showthread.php?p=1759793 - -*nvidia-drivers-177.68 (27 Aug 2008) - - 27 Aug 2008; Ricardo Mendoza - +nvidia-drivers-177.68.ebuild: - Version bump for masked beta per bug #235851. Also changed SRC_URI to the - generic URL due to being unable to find the file in the US mirror - -*nvidia-drivers-177.67 (20 Aug 2008) - - 20 Aug 2008; Ricardo Mendoza - +nvidia-drivers-177.67.ebuild: - Version bump for masked beta per bug #235231. Release highlights at - http://www.nvnews.net/vbulletin/showthread.php?t=118085 - - 18 Aug 2008; Ricardo Mendoza metadata.xml: - Change maintainer - - 05 Aug 2008; Doug Goldstein metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - -*nvidia-drivers-173.14.12 (31 Jul 2008) - - 31 Jul 2008; nvidia-drivers-173.14.09.ebuild, - +nvidia-drivers-173.14.12.ebuild: - Version bump as requested by Wyatt Epp in bug #233418. - Ensure SYSVIPC is enabled as per cucu ionut in bug - #213157. Patch to respect custom CFLAGS by boris64 - closes bug #230273. Paravirt exports now usable, delete unnecessary check - as per Patrizio Bassi in bug #232883. - - 22 Jul 2008; - -files/NVIDIA_kernel-71.86.04-2305230.diff, - -files/NVIDIA_kernel-96.43.05-2290218.diff, - -nvidia-drivers-71.86.01.ebuild, -nvidia-drivers-71.86.04.ebuild, - nvidia-drivers-71.86.06.ebuild, -nvidia-drivers-96.43.01.ebuild, - -nvidia-drivers-96.43.05.ebuild, nvidia-drivers-96.43.07.ebuild: - X86 following the AMD64 lead in fasttrack stable for 71 & 96 branch - drivers. Arch testing by hoffie, permission granted by tsunam. Closes bug - #232624 by Mike Hammill . Cleaned up old ebuilds. - - 17 Jul 2008; nvidia-drivers-71.86.06.ebuild, - nvidia-drivers-96.43.07.ebuild: - Fasttrack AMD64 stable for 2.6.26-capable drivers in the 71 & 96 branches - that owners of older GeForces are stuck with. Compile & QA tested by - CCIEChad. - -*nvidia-drivers-96.43.07 (17 Jul 2008) -*nvidia-drivers-71.86.06 (17 Jul 2008) - - 17 Jul 2008; +nvidia-drivers-71.86.06.ebuild, - +nvidia-drivers-96.43.07.ebuild: - New upstream releases, both fix secondary TV output sometimes being black - & white on some GPUs and are compatible with the newly released 2.6.26 - kernel. Install modprobe control file to /etc/modprobe.d instead of the - deprecated /etc/modules.d location, closes bug #213878. - - 08 Jul 2008; Christian Faulhammer - nvidia-drivers-173.14.09.ebuild: - stable x86, bug 230369, thanks to all the testers - - 01 Jul 2008; Thomas Anderson - nvidia-drivers-173.14.09.ebuild: - stable amd64, bug 230369 - -*nvidia-drivers-177.13 (19 Jun 2008) - - 19 Jun 2008; +nvidia-drivers-177.13.ebuild: - Masked beta driver 177.13; unsupported by nVidia. Adds support for GeForce - GTX 260 & 280 products. Upstream release announcement at - http://www.nvnews.net/vbulletin/showthread.php?t=114955 - -*nvidia-drivers-173.14.09 (17 Jun 2008) - - 17 Jun 2008; +nvidia-drivers-173.14.09.ebuild: - Version bump, closes bug #224109. With thanks to Ludovic F. - for drawing my attention to this bugfix release. - -*nvidia-drivers-173.14.05 (28 May 2008) - - 28 May 2008; - +files/NVIDIA_kernel-173.14.05-2419292.diff, - +nvidia-drivers-173.14.05.ebuild: - Version bump. Supported release, upstream release highlights are at - http://www.nvnews.net/vbulletin/showthread.php?t=113919. - - 21 May 2008; - +files/NVIDIA_kernel-71.86.04-2305230.diff, - nvidia-drivers-71.86.04.ebuild: - Add patch to allow building on 2.6.25 kernels; thanks to Andreas - . No revision bump, the module didnt build - for affected users. Closes bug #223047. - - 09 May 2008; Mark Loeser - nvidia-drivers-173.08.ebuild: - Works on x86 for me, marking ~x86 - - 08 May 2008; - files/NVIDIA_kernel-173.08-2404825.diff: - Upstream corrected the patch after the fact, update it. No revision bump - as the package is masked. - - 07 May 2008; - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-71.86.04.ebuild, - nvidia-drivers-96.43.01.ebuild, nvidia-drivers-96.43.05.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: - Quote variables where appropriate. - -*nvidia-drivers-173.08 (07 May 2008) - - 07 May 2008; - +files/NVIDIA_kernel-173.08-2404825.diff, +nvidia-drivers-173.08.ebuild: - Masked beta driver 173.08 with upstream patch from Zander ( - http://www.nvnews.net/vbulletin/showpost.php?p=1648357&postcount=35 ) for - >=2.6.26-rc1 compatibility. Dropped keywords as this has only been tested - on 2.6.26-rc1-00166-gc0a1811 SMP x86_64 so far. Now installs module - control file in modprobe.d where it belongs. Upstream advises to use PAT - over MTRR. Some reports of low performance and 2D corruption, tread - carefully. - - 18 Apr 2008; Mike Frysinger - +files/NVIDIA_kernel-96.43.05-2290218.diff, - nvidia-drivers-96.43.05.ebuild: - Add fix from upstream for building with linux-2.6.25 #218178. - - 18 Apr 2008; Mike Frysinger - +files/NVIDIA_kernel-169.12-2286310.diff, nvidia-drivers-169.12.ebuild: - Add fix from upstream for building with linux-2.6.25 #218178. - - 10 Apr 2008; Doug Goldstein - nvidia-drivers-169.09-r1.ebuild: - revert previous commit due to it breaking the stable tree. it also flies - in the face of nvidia-drivers maintenance policies. - - 10 Apr 2008; William L. Thomson Jr. - nvidia-drivers-169.09-r1.ebuild: - De-stablizing package, lost 3+ hours debugging why a stable machine X was - at 99% for any 2d operation, thunderbird etc. - - 19 Mar 2008; Raúl Porcel - nvidia-drivers-96.43.05.ebuild: - x86 stable - - 05 Mar 2008; Christian Faulhammer - nvidia-drivers-169.09-r1.ebuild: - stable x86, bug 212290 - - 04 Mar 2008; Olivier Crête - nvidia-drivers-169.09-r1.ebuild: - Stable on amd64, bug #212290 - -*nvidia-drivers-169.12 (28 Feb 2008) - - 28 Feb 2008; Doug Goldstein +nvidia-drivers-169.12.ebuild: - version bump - - 18 Feb 2008; Doug Goldstein - nvidia-drivers-169.09-r1.ebuild: - revert libwfb.so change requested in bug #202978 - -*nvidia-drivers-169.09-r1 (15 Feb 2008) - - 15 Feb 2008; Doug Goldstein - +nvidia-drivers-169.09-r1.ebuild: - new ebuild that should fix bug #207298, #207299, #167413, #184593, #188552, - and #187149. and #202978, depending on the results of the discussion and - added work around for bug #137000 - -*nvidia-drivers-96.43.05 (04 Feb 2008) -*nvidia-drivers-71.86.04 (04 Feb 2008) - - 04 Feb 2008; Doug Goldstein - +nvidia-drivers-71.86.04.ebuild, +nvidia-drivers-96.43.05.ebuild: - new legacy driver releases for newer kernels and X.org servers - -*nvidia-drivers-169.09 (22 Jan 2008) - - 22 Jan 2008; Doug Goldstein nvidia-drivers-169.07.ebuild, - +nvidia-drivers-169.09.ebuild: - QA_WX_LOAD addition. new nvidia-drivers version - - 22 Jan 2008; Doug Goldstein +files/nvidia-169.07, - nvidia-drivers-169.07.ebuild: - provide newer /etc/modules.d file - -*nvidia-drivers-169.07 (16 Jan 2008) - - 16 Jan 2008; Doug Goldstein +nvidia-drivers-169.07.ebuild: - starting to rewrite the ebuild a bit. commiting masked so people can tinker - - 26 Dec 2007; Doug Goldstein - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: - fix patch to nvidia-xconfig on FreeBSD. bug #199761 - - 21 Dec 2007; Doug Goldstein - -nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.9639.ebuild: - remove old versions - - 21 Dec 2007; Doug Goldstein - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: - apply patch only when linux. bug #199759 - - 20 Nov 2007; Christian Faulhammer - nvidia-drivers-71.86.01.ebuild: - stable x86, bug 186490 - - 14 Nov 2007; Steve Dibb - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild: - amd64 stable, bug 186490 - - 12 Nov 2007; Peter Weller - nvidia-drivers-100.14.19.ebuild: - Stable on amd64 wrt bug 186490 - -*nvidia-drivers-100.14.23 (01 Nov 2007) - - 01 Nov 2007; Doug Goldstein - +nvidia-drivers-100.14.23.ebuild: - adding beta NVIDIA driver for user demand. bug #196679 - - 31 Oct 2007; Raúl Porcel - nvidia-drivers-96.43.01.ebuild: - x86 stable - - 29 Oct 2007; Markus Ullmann - nvidia-drivers-100.14.19.ebuild: - Stable on x86 - - 29 Oct 2007; Doug Goldstein - nvidia-drivers-100.14.19.ebuild: - add x86-fbsd support for 100.14.19 since it's been released now - - 07 Oct 2007; Doug Goldstein - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, - nvidia-drivers-100.14.19.ebuild: - Quote some old $ROOT usage - - 07 Oct 2007; Doug Goldstein - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild, - nvidia-drivers-100.14.19.ebuild: - nvidia-driver uses ACPI if it's installed. Add USE based dep on it. - - 01 Oct 2007; Doug Goldstein - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: - mark the depends as not supporting xorg-server 1.4 - -*nvidia-drivers-96.43.01 (27 Sep 2007) -*nvidia-drivers-71.86.01 (27 Sep 2007) - - 27 Sep 2007; Doug Goldstein - +nvidia-drivers-71.86.01.ebuild, +nvidia-drivers-96.43.01.ebuild, - nvidia-drivers-100.14.19.ebuild: - bump both nvidia legacy drivers to their latest revisions. Remove hack since - it's no longer needed. - - 20 Sep 2007; Chris Gianelloni -files/nvidia-2, - -files/NVIDIA_kernel-2.6.19.patch, files/nvidia, - nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.8776-r1.ebuild, - -nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild, - -nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, - nvidia-drivers-100.14.19.ebuild: - Removing older ebuilds where newer ebuilds in the same class have the same - KEYWORDS or better, moving nvidia-2 to nvidia, since nothing uses the old - file anymore, simplified sed by changing ${PACKAGE} to PACKAGE, and changed - a newins to doins, since we were not renaming anything. - -*nvidia-drivers-100.14.19 (18 Sep 2007) - - 18 Sep 2007; Doug Goldstein - +nvidia-drivers-100.14.19.ebuild: - new drivers from nVidia. no FreeBSD support. - - 26 Aug 2007; Anant Narayanan Manifest: - Fix Manifest - - 30 Jul 2007; Donnie Berkholz ; - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.8776-r1.ebuild, - nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: - Move eselect-opengl into DEPEND only, so it can be uninstalled later. - - 28 Jul 2007; Steve Dibb - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-100.14.09.ebuild: - amd64 stable, bug 183567 - - 20 Jul 2007; Doug Goldstein - nvidia-drivers-1.0.7185.ebuild: - remove i2c-hwmon, libnvidia-cfg, nvidia-xconfig, and README.txt from 7185 - since they don't exist - - 19 Jul 2007; Raúl Porcel - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-100.14.09.ebuild - x86 stable wrt security #183567 - - 19 Jul 2007; Doug Goldstein - +nvidia-drivers-100.14.09.ebuild: - adding back 100.14.09 based off 100.14.11 ebuild - - 18 Jul 2007; Doug Goldstein - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-100.14.11.ebuild: - QA EXECSTACK handling - -*nvidia-drivers-1.0.7185 (14 Jul 2007) - - 14 Jul 2007; Doug Goldstein - +nvidia-drivers-1.0.7185.ebuild: - add 1.0.7185 drivers - -*nvidia-drivers-1.0.9639 (14 Jul 2007) - - 14 Jul 2007; Doug Goldstein - -files/nvidia-settings.desktop, -files/nvidia-settings.png, - +nvidia-drivers-1.0.9639.ebuild, -nvidia-drivers-100.14.09.ebuild, - nvidia-drivers-100.14.11.ebuild: - add ebuild for 1.0.9639 drivers. Merge in updates from 100.14.11 drivers. - Removed old 100.14.09 drivers. No longer build nvidia-settings part of the - drivers but PDEPEND on it via gtk USE flag. Other misc cleanups. - - 13 Jul 2007; Doug Goldstein - nvidia-drivers-100.14.11.ebuild: - fix bug #185171 - - 12 Jul 2007; Doug Goldstein - nvidia-drivers-100.14.11.ebuild: - Fixes #177231, #182622, #184432, #184795 - - 07 Jul 2007; Doug Goldstein +files/nvidia-2, - +files/NVIDIA_i2c-hwmon.patch, +files/nvidia-settings.desktop, - +files/nvidia-settings.png, nvidia-drivers-100.14.11.ebuild: - work in progress. fixes bug #183567, #169740, #182933, #184432. More will be - fixed before unmask - - 05 Jul 2007; Mike Frysinger - nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild, - nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: - If glibc does not have IUSE=nptl, assume it is enabled as newer versions - only support nptl. - -*nvidia-drivers-100.14.11 (04 Jul 2007) - - 04 Jul 2007; Christian Parpart - +nvidia-drivers-100.14.11.ebuild: - version bump to 100.14.11 - - 02 Jul 2007; Piotr Jaroszyński - nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild: - (QA) RESTRICT clean up. - - 01 Jul 2007; Piotr Jaroszyński - nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild, - nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild: - (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true" - -*nvidia-drivers-100.14.09 (19 Jun 2007) - - 19 Jun 2007; Christian Parpart - +nvidia-drivers-100.14.09.ebuild: - version bump. wrt bug #176135 and bug #175674 - - 13 Apr 2007; Chris Gianelloni - -nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.8776-r1.ebuild: - Stable on amd64/x86 wrt bug #114893. - -*nvidia-drivers-1.0.9755-r1 (13 Mar 2007) -*nvidia-drivers-1.0.9746-r1 (13 Mar 2007) -*nvidia-drivers-1.0.9631-r1 (13 Mar 2007) -*nvidia-drivers-1.0.8776-r1 (13 Mar 2007) - - 13 Mar 2007; Jeremy Huddleston - +nvidia-drivers-1.0.8776-r1.ebuild, -nvidia-drivers-1.0.9631.ebuild, - +nvidia-drivers-1.0.9631-r1.ebuild, -nvidia-drivers-1.0.9746.ebuild, - +nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755.ebuild, - +nvidia-drivers-1.0.9755-r1.ebuild: - Install libnvidia-cfg.so. Fixes bug #114893. - -*nvidia-drivers-1.0.9755 (07 Mar 2007) - - 07 Mar 2007; Chris Gianelloni - +nvidia-drivers-1.0.9755.ebuild: - Version bump to latest version of the drivers. - - 19 Feb 2007; Chris Gianelloni - nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, - nvidia-drivers-1.0.9746.ebuild: - Removing dlloader USE flag wrt bug #166759. - - 07 Feb 2007; Chris Gianelloni - nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, - nvidia-drivers-1.0.9746.ebuild: - Fixed the executable stack warnings with a patch from Vlastimil Babka - and closing bug #114894. - - 07 Feb 2007; Chris Gianelloni - -nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9742.ebuild: - Cleaning up some older versions. - -*nvidia-drivers-1.0.9746 (28 Dec 2006) - - 28 Dec 2006; Chris Gianelloni - +nvidia-drivers-1.0.9746.ebuild: - Added version 9746 and closing bug #158889. - - 26 Dec 2006; Mike Frysinger - nvidia-drivers-1.0.9742.ebuild: - Style touchups and create relative symlinks in /usr/lib. - - 12 Dec 2006; Chris Gianelloni - nvidia-drivers-1.0.9631.ebuild, nvidia-drivers-1.0.9742.ebuild: - Update Gentoo/FreeBSD support with a patch from Timothy Redaelli - . Closing bug #157625. - - 06 Dec 2006; Chris Gianelloni - -nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild: - Added patch from Joshua Napoli to install - libnvidia-wfb and closing bug #155532. Removing 9629, as it has problems - with NV2x cards. - - 05 Dec 2006; Chris Gianelloni - files/NVIDIA_kernel-2.6.19.patch: - Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978. - -*nvidia-drivers-1.0.9631 (05 Dec 2006) - - 05 Dec 2006; Chris Gianelloni - +nvidia-drivers-1.0.9631.ebuild: - Version bump to 1.0.9631 for bug #157194. This should also close bug - #105656, bug #150080, bug #154739, and bug #156886. - - 05 Dec 2006; Chris Gianelloni files/nvidia: - Updated the nvidia file which installs to /etc/modules.d for bug #139756. - - 04 Dec 2006; Chris Gianelloni - nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild, - nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild: - Fixing up executable stacks and closing bug #114894. - - 10 Nov 2006; Chris Gianelloni - -files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, -nvidia-drivers-1.0.9626.ebuild: - Removing the 1.0-9626 driver, since it has been known to cause a black - screen at X startup and is superceded by the 9629 driver. - -*nvidia-drivers-1.0.9742 (09 Nov 2006) -*nvidia-drivers-1.0.9629 (09 Nov 2006) - - 09 Nov 2006; Kristopher Kersey - +nvidia-drivers-1.0.9629.ebuild, +nvidia-drivers-1.0.9742.ebuild: - Added new stable driver 1.0.9629 and unstable driver 1.0.9742. - - 24 Oct 2006; Simon Stelling - nvidia-drivers-1.0.8776.ebuild: - stable on amd64 - - 24 Oct 2006; Joshua Jackson - nvidia-drivers-1.0.8776.ebuild: - Stable x86; bug #151635 - - 20 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild, - nvidia-drivers-1.0.9626.ebuild: - Added fix for bug #145968. - -*nvidia-drivers-1.0.8776 (20 Oct 2006) - - 20 Oct 2006; Chris Gianelloni - -files/1.0.8178/NVIDIA-1.0.8178-1423627.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1427453.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1435131.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1450608.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1453708.diff, - -files/1.0.8178/NVIDIA-1.0.8178-U012206.diff, - -nvidia-drivers-1.0.8178.ebuild, +nvidia-drivers-1.0.8776.ebuild: - Added 8776 for bug #151635 and removing 8178, since it is vulnerable. - - 18 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9626.ebuild: - Use pkg2 for AMD64 since the other ones don't ship the 32-bit libraries. How - lame is that? Closing bug #151759. - - 17 Oct 2006; Chris Gianelloni - -files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, - +files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, nvidia-drivers-1.0.8178.ebuild, - nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9625.ebuild, - nvidia-drivers-1.0.9626.ebuild: - Changed pkg1 and pkg2 to pkg0 for bug #146182. - - 17 Oct 2006; Olivier Crête - nvidia-drivers-1.0.9626.ebuild: - Patch version is 1.0.9625 - - 16 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.9626.ebuild: - It looks like the i2c patch is still needed. - -*nvidia-drivers-1.0.9626 (16 Oct 2006) - - 16 Oct 2006; Chris Gianelloni - +nvidia-drivers-1.0.9626.ebuild: - Updated to 1.0.9626, which adds support for NVIDIA Quadro Plex configurations. - - 13 Oct 2006; Chris Gianelloni - +files/NVIDIA_kernel-2.6.19.patch: - Added patch from Daniel Drake for compiling on 2.6.19 and - closing bug #151177. - - 12 Oct 2006; Chris Gianelloni - +files/1.0.8178/NVIDIA-1.0.8178-1423627.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1427453.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1435131.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1450608.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1453708.diff, - +files/1.0.8178/NVIDIA-1.0.8178-U012206.diff, - ,files/1.0.8762/NVIDIA-1.0.8762-U062606.diff: - Added patches from nvnews.net for 8178, removing 8762, and adding a notice - to 9625 about AddARGBGLXVisuals for compiz. - - 09 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, -nvidia-drivers-1.0.8762.ebuild, - nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9625.ebuild: - Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and - nvidia-glx, since they're no longer in the tree, changed nostrip to strip, - and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing - bug #114894. - - 04 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild, - nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9625.ebuild: - Removed PROVIDE=virtual/opengl since opengl is a new-style virtual. - - 04 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8774.ebuild: - Stable on amd64/x86 for bug #144549. - - 04 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild: - Stable on amd64/x86 for bug #143814. - - 25 Sep 2006; Chris Gianelloni - +files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, nvidia-drivers-1.0.9625.ebuild: - Added patch from Zander to remove i2c functionality from the drivers until - it is fixed upstream. - - 25 Sep 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild, - nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9625.ebuild: - Commented out the Makefile patch. - -*nvidia-drivers-1.0.9625 (25 Sep 2006) -*nvidia-drivers-1.0.8178 (25 Sep 2006) - - 25 Sep 2006; Chris Gianelloni - +files/NVIDIA_glx-makefile.patch, +nvidia-drivers-1.0.8178.ebuild, - nvidia-drivers-1.0.8762.ebuild, nvidia-drivers-1.0.8762-r1.ebuild, - nvidia-drivers-1.0.8774.ebuild, +nvidia-drivers-1.0.9625.ebuild: - Added 8178 ebuild for bug #143814. Also added a (masked) 9625 beta ebuild. - - 27 Aug 2006; Hanno Boeck files/libGL.la-r2: - Fix libdir in libGL.la (bug #140982). - - 27 Aug 2006; Donnie Berkholz - nvidia-drivers-1.0.8774.ebuild: - Remove blocker on xorg-server 1.1. - - 25 Aug 2006; Donnie Berkholz +metadata.xml: - Someone forgot to add metadata. - -*nvidia-drivers-1.0.8774 (25 Aug 2006) - - 25 Aug 2006; Kristopher Kersey - +nvidia-drivers-1.0.8774.ebuild: - Added ebuild for NVIDIA driver release 1.0-8774. - - 08 Aug 2006; Joshua Jackson - nvidia-drivers-1.0.8762-r1.ebuild: - Stable x86; bug #140922 - - 06 Aug 2006; Simon Stelling - nvidia-drivers-1.0.8762-r1.ebuild: - stable on amd64 - -*nvidia-drivers-1.0.8762-r1 (07 Jul 2006) - - 07 Jul 2006; Kristopher Kersey - +files/1.0.8762/NVIDIA-1.0.8762-U062606.diff, - +nvidia-drivers-1.0.8762-r1.ebuild: - Added Zander's patch to allow building with latest kernels (>= - 2.6.17-rc4-mm1, >= 2.6.17-git7). - - 06 Jul 2006; Kristopher Kersey - nvidia-drivers-1.0.8762.ebuild: - Quick fix to close bug #133138. - -*nvidia-drivers-1.0.8762 (06 Jul 2006) - - 06 Jul 2006; Kristopher Kersey +files/09nvidia, - +files/NVIDIA_glx-defines.patch, +files/NVIDIA_glx-glheader.patch, - +files/libGL.la-r2, +files/nvidia, +nvidia-drivers-1.0.8762.ebuild: - Initial import of x11-drivers/nvidia-drivers that will take the place of - media-video/nvidia-kernel and media-video/nvidia-glx. - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest deleted file mode 100644 index 5d3e9f8d20..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST NVIDIA-FreeBSD-x86-260.19.36.tar.gz 27282754 SHA256 03e41a19ad93668034efa8306983b57b69fcca1e328a5a70c9295096fb9675d5 SHA512 0ae75d616202bd054c820ef0dd1cfa16fe0aa7dc73e7abc502aeb2a4c28f3469dc3d089e6e6f4b27c6002c79ab6ca96f8bca52da362f5b088210869f3da60961 WHIRLPOOL 26cc49ff77ef5f324fa73c4c856bdde7f5ce8b1eadc97680adf725eb64c048da829561c481549557855f45e4c54a248fd45c69104e3c1a45a66c6b440d5a5c5a -DIST NVIDIA-Linux-x86-260.19.36.run 28558478 SHA256 6cfbb7cbfdb8ca5399303d43204e73ca3aad5bbc03c938f11ce5e154ec76cc6d SHA512 56e51ba75a0f82fb81701550a74d318f2693220327bceb551b37f90cd9f754d9f237624941ea3ce3f571c62b486df690410d1b7f211f6919a25c7a5bb73e25b4 WHIRLPOOL 698738d3b1df6b70d010f1cf57a0683ed71e28fde58da2e13a70eefbf2ce9b4fc103b8598edc0d3ae6d77eddff31a9a19079b1cb99d71a1d3035b68681309b5d -DIST NVIDIA-Linux-x86_64-260.19.36.run 48081798 SHA256 35a8769585e1f9b426c9c21b5f5898c06251a642ed73e9fb9eea9ab87ef91067 SHA512 4f008c90296f22ba944b30d40138af865c82c17721b17368f6497d9b0c7dab50a8320eff90e6da3a5a592b9b8f9741284bbd6589754ae95d80fd489be9b2d126 WHIRLPOOL e0d399f72aba94c3f242e8c1929dd3174fc8a51aa91349b6bc9694922062dbebca6e077a1f7c382caed22fd0aa8c70754792414cfd5380368be2c75ceaeb3bd1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia deleted file mode 100644 index 1fcbef41fc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia +++ /dev/null @@ -1,2 +0,0 @@ -# Has to precede X11's own libraries! -LDPATH=/opt/nvidia/lib diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch deleted file mode 100644 index eff06a50d0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh ---- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100 -+++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100 -@@ -82,7 +82,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -91,7 +91,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -102,7 +102,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch deleted file mode 100644 index da92b8f080..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh ---- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh 2010-05-19 05:38:57.000000000 +0200 -+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh 2010-05-22 02:13:56.000000000 +0200 -@@ -101,7 +101,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -110,7 +110,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -121,7 +121,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch deleted file mode 100644 index da9933f633..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h ---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100 -+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100 -@@ -39,6 +39,7 @@ - typedef XID GLXPixmap; - typedef XID GLXDrawable; - typedef XID GLXPbuffer; -+typedef XID GLXPbufferSGIX; - typedef XID GLXWindow; - typedef XID GLXFBConfigID; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch deleted file mode 100644 index e0393e1b9a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000 -+++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000 -@@ -66,6 +66,10 @@ - typedef double GLclampd; - typedef void GLvoid; - -+/* Patching for some better defines in the global system */ -+#ifndef GL_GLEXT_LEGACY -+#include -+#endif - - /*************************************************************/ - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit deleted file mode 100644 index 75b39cfbd9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ - -# Install nvidia library: -# the first parameter is the place where to install it -# the second parameter is the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully - if [ -e $2.$3 ] ; then - doexe $2.$3 - dosym ${libname}.$3 $1/${libname} - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit deleted file mode 100644 index b14df34b10..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ - -mtrr_check() { - ebegin "Checking for MTRR support" - linux_chkconfig_present MTRR - eend $? - - if [[ $? -ne 0 ]] ; then - eerror "Please enable MTRR support in your kernel config, found at:" - eerror - eerror " Processor type and features" - eerror " [*] MTRR (Memory Type Range Register) support" - eerror - eerror "and recompile your kernel ..." - die "MTRR support not detected!" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit deleted file mode 100644 index e48d11ce96..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distribnuted under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ -# -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [[ ${#} -eq 2 ]] ; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - pkglibdir=lib32 - fi - - local usrpkglibdir=usr/${pkglibdir} - local libdir=usr/X11R6/${pkglibdir} - local drvdir=${libdir}/modules/drivers - local extdir=${libdir}/modules/extensions - local incdir=usr/include/GL - local sover=${PV} - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local NO_TLS_ROOT="${NV_ROOT}/no-tls" - local TLS_ROOT="${NV_ROOT}/tls" - local X11_LIB_DIR="/usr/${inslibdir}/xorg" - - if use x86-fbsd; then - # on FreeBSD everything is on obj/ - pkglibdir=obj - usrpkglibdir=obj - x11pkglibdir=obj - drvdir=obj - extdir=obj - - # don't ask me why the headers are there.. glxext.h is missing - incdir=doc - - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} - - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} - - dodir ${NO_TLS_ROOT} - donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} - - if ! use x86-fbsd; then - donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} - fi - - if want_tls ; then - dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - else - dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - fi - - if ! use x86-fbsd; then - # Install the .la file for libtool, to prevent e.g. bug #176423 - [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" - local ver1=$(get_version_component_range 1) - local ver2=$(get_version_component_range 2) - local ver3=$(get_version_component_range 3) - sed -e "s:\${PV}:${PV}:" \ - -e "s:\${ver1}:${ver1}:" \ - -e "s:\${ver2}:${ver2}:" \ - -e "s:\${ver3}:${ver3}:" \ - -e "s:\${libdir}:${inslibdir}:" \ - "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la - fi - - exeinto ${X11_LIB_DIR}/modules/drivers - - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - - insinto /usr/${inslibdir} - [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ - doins ${libdir}/libXvMCNVIDIA.a - exeinto /usr/${inslibdir} - # fix Bug 131315 - [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ - dosym libXvMCNVIDIA.so.${PV} \ - /usr/${inslibdir}/libXvMCNVIDIA.so - - exeinto ${NV_ROOT}/extensions - [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ - newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so - [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe ${extdir}/libglx.so.${sover} libglx.so - - # Includes - insinto ${NV_ROOT}/include - doins ${incdir}/*.h - - #cuda - if [[ -f usr/include/cuda/cuda.h ]]; then - dodir /usr/include/cuda - insinto /usr/include/cuda - doins usr/include/cuda/*.h - - if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then - dolib.so usr/${pkglibdir}/libcuda.so.${PV} - dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 - dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so - fi - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit deleted file mode 100644 index 4debb85d3a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ - -want_tls() { - # For uclibc or anything non glibc, return false - has_version sys-libs/glibc || return 1 - - # Old versions of glibc were lt/no-tls only - has_version '=sys-libs/glibc-2.3.5' ; then - case ${CHOST/-*} in - i486|i586) return 1 ;; - esac - fi - - # These versions built linuxthreads version to support tls, too - has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 - - return 1 -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 deleted file mode 100644 index 863d184419..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.${PV} libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' - -# Version information for libGL. -current=${ver1} -age=${ver2} -revision=${ver3} - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/${libdir}' diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia deleted file mode 100644 index 7cf0f7c078..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia +++ /dev/null @@ -1,40 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 -# -# To enable Fast Writes: NVreg_EnableAGPFW=1 -# -# To enable both for instance, uncomment following line: -# -#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 -# If you have a mobile chip, you may need to enable this option -# if you have hard lockups when starting X. -# -# See: Appendix I. Configuring your laptop -# In /usr/share/doc/PACKAGE/README for full details -# -# Choose the appropriate value for NVreg_Mobile from the table: -# Value Meaning -# ---------- -------------------------------------------------- -# 0xFFFFFFFF let the kernel module autodetect the correct value -# 1 Dell laptops -# 2 non-Compal Toshiba laptops -# 3 all other laptops -# 4 Compal Toshiba laptops -# 5 Gateway laptops -# -#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 - - -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 deleted file mode 100644 index a96b0cd1e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch deleted file mode 100644 index 75daad33ec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch +++ /dev/null @@ -1,92 +0,0 @@ -Index: usr/src/nv/conftest.sh -=================================================================== ---- usr/src/nv/conftest.sh -+++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530 -@@ -32,14 +32,14 @@ - # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats - # the kernel as a stand-alone kernel. - # -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # - # We are looking at a configured source tree; verify - # that it's not a Xen kernel. - # -- echo "#include -+ echo "#include - #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) - #error CONFIG_XEN defined! - #endif -@@ -111,7 +111,12 @@ - fi - } - --CONFTEST_PREAMBLE="#include -+CONFTEST_PREAMBLE="#include -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+ #include -+ #else -+ #include -+ #endif - #if defined(CONFIG_XEN) && \ - defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) - #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION -@@ -1294,7 +1299,7 @@ - echo ""; - fi - fi -- exit $RET -+# exit $RET - ;; - - get_uname) -@@ -1316,11 +1321,11 @@ - # tree or at headers shipped for a specific kernel. - # Determine the kernel version using a compile check. - # -- FILE="linux/utsrelease.h" -+ FILE="generated/utsrelease.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - echo "$CONFTEST_PREAMBLE -- #include -+ #include - int main() { - printf(\"%s\", UTS_RELEASE); - return 0; -@@ -1375,7 +1380,7 @@ - # - RET=1 - VERBOSE=$6 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # -@@ -1429,7 +1434,7 @@ - # - RET=1 - VERBOSE=$6 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # -Index: usr/src/nv/nvacpi.c -=================================================================== ---- usr/src/nv/nvacpi.c -+++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530 -@@ -49,6 +49,10 @@ - }; - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) -+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL) -+#endif -+ - static struct acpi_driver *nv_acpi_driver; - static acpi_handle nvif_handle = NULL; - static acpi_handle dsm_handle = NULL; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml deleted file mode 100644 index 843e746128..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -no-herd - - cardoe@gentoo.org - General maintainer and POC with NVIDIA - - - jer@gentoo.org - - - spock@gentoo.org - Focused on CUDA and new kernel support - -NVIDIA X11 driver and GLX libraries - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild deleted file mode 100644 index 97e8a6a943..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild +++ /dev/null @@ -1,529 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild,v 1.1 2011/01/24 15:39:30 cardoe Exp $ - -EAPI="2" - -inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver - -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" - -DESCRIPTION="NVIDIA X11 driver and GLX libraries" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="acpi custom-cflags gtk multilib kernel_linux" -RESTRICT="strip" -EMULTILIB_PKG="true" - -COMMON="=sys-libs/glibc-2.6.1 ) - multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=app-admin/eselect-opengl-1.0.9 - !" - eerror " [ ] Lock debugging: detect incorrect freeing of live locks" - eerror " [ ] Lock debugging: prove locking correctness" - eerror " [ ] Lock usage statistics" - eerror "in 'menuconfig'" - die "LOCKDEP enabled" - fi -} - -pkg_setup() { - # try to turn off distcc and ccache for people that have a problem with it - export DISTCC_DISABLE=1 - export CCACHE_DISABLE=1 - - if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default abi." - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - if use kernel_linux; then - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S}/kernel)" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)" - mtrr_check - lockdep_check - fi - - # On BSD userland it wants real make command - use userland_BSD && MAKE="$(get_bmake)" - - export _POSIX2_VERSION="199209" - - # Since Nvidia ships 3 different series of drivers, we need to give the user - # some kind of guidance as to what version they should install. This tries - # to point the user in the right direction but can't be perfect. check - # nvidia-driver.eclass - nvidia-driver-check-warning - - # set variables to where files are in the package structure - if use kernel_FreeBSD; then - NV_DOC="${S}/doc" - NV_EXEC="${S}/obj" - NV_LIB="${S}/obj" - NV_SRC="${S}/src" - NV_MAN="${S}/x11/man" - NV_X11="${S}/obj" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=1 - elif use kernel_linux; then - NV_DOC="${S}" - NV_EXEC="${S}" - NV_LIB="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=${PV} - else - die "Could not determine proper NVIDIA package" - fi -} - -src_unpack() { - if use kernel_linux && kernel_is lt 2 6 7; then - echo - ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - ewarn "This is not officially supported for ${P}. It is likely you" - ewarn "will not be able to compile or use the kernel module." - ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" - echo - ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." - fi - - if ! use x86-fbsd; then - cd "${S}" - unpack_makeself - else - unpack ${A} - fi -} - -src_prepare() { - # Please add a brief description for every added patch - use x86-fbsd && cd doc - - if use kernel_linux; then - # Quiet down warnings the user does not need to see - sed -i \ - -e 's:-Wsign-compare::g' \ - "${NV_SRC}"/Makefile.kbuild - - # Add support for the 'x86' unified kernel arch in conftest.sh - epatch "${FILESDIR}"/256.35-unified-arch.patch - - # If you set this then it's your own fault when stuff breaks :) - use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* - - # If greater than 2.6.5 use M= instead of SUBDIR= - convert_to_m "${NV_SRC}"/Makefile.kbuild - fi -} - -src_compile() { - # This is already the default on Linux, as there's no toplevel Makefile, but - # on FreeBSD there's one and triggers the kernel module build, as we install - # it by itself, pass this. - - cd "${NV_SRC}" - if use x86-fbsd; then - MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ - LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die - elif use kernel_linux; then - linux-mod_src_compile - fi -} - -src_install() { - if use kernel_linux; then - linux-mod_src_install - - VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" - if [ -z "$VIDEOGROUP" ]; then - eerror "Failed to determine the video group gid." - die "Failed to determine the video group gid." - fi - - # Add the aliases - [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" - sed -e 's:PACKAGE:'${PF}':g' \ - -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ - "${WORKDIR}"/nvidia - insinto /etc/modprobe.d - newins "${WORKDIR}"/nvidia nvidia.conf || die - elif use x86-fbsd; then - insinto /boot/modules - doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die - - exeinto /boot/modules - doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die - fi - - # NVIDIA kernel <-> userspace driver config lib - dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ - die "failed to install libnvidia-cfg" - dosym /usr/$(get_libdir)/libnvidia-cfg.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-cfg.so || \ - die "failed to create libnvidia-cfg.so symlink" - - # NVIDIA video decode <-> CUDA - dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ - die "failed to install libnvcuvid.so" - dosym /usr/$(get_libdir)/libnvcuvid.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvcuvid.so || \ - die "failed to create libnvcuvid.so symlink" - - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" - - # Xorg GLX driver - insinto /usr/$(get_libdir)/opengl/nvidia/extensions - doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ - die "failed to install libglx.so" - dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ - die "failed to create libglx.so symlink" - - # XvMC driver - dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ - die "failed to install libXvMCNVIDIA.so" - dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ - die "failed to install libXvMCNVIDIA.so" - dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \ - die "failed to create libXvMCNVIDIA.so symlink" - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - dodir /etc/OpenCL/vendors - insinto /etc/OpenCL/vendors - doins nvidia.icd - fi - - # Documentation - dohtml ${NV_DOC}/html/* - if use x86-fbsd; then - dodoc "${NV_DOC}/README" - doman "${NV_MAN}/nvidia-xconfig.1" - use gtk && doman "${NV_MAN}/nvidia-settings.1" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}/nvidia-smi.1.gz" - doman "${NV_MAN}/nvidia-xconfig.1.gz" - use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" - fi - - # Helper Apps - dobin ${NV_EXEC}/nvidia-xconfig || die - if use gtk; then - dobin ${NV_EXEC}/nvidia-settings || die - fi - dobin ${NV_EXEC}/nvidia-bug-report.sh || die - if use kernel_linux; then - dobin ${NV_EXEC}/nvidia-smi || die - fi - - # Desktop entries for nvidia-settings - if use gtk; then - sed -e 's:__UTILS_PATH__:/usr/bin:' \ - -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ - -i "${NV_EXEC}/nvidia-settings.desktop" - domenu ${NV_EXEC}/nvidia-settings.desktop - - doicon ${NV_EXEC}/nvidia-settings.png - fi - - if has_multilib_profile ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second parameter is the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - doexe $2.$3 || die "failed to install $2" - dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local libdir= sover= - - if use kernel_linux; then - if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - libdir=32 - else - libdir=. - fi - sover=${PV} - else - libdir=obj - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} - if use x86-fbsd; then - donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} - else - donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} - fi - - # VDPAU - donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} - - # CUDA & OpenCL - if use kernel_linux; then - donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0 - dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so - fi -} - -pkg_preinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - # Make sure we nuke the old nvidia-glx's env.d file - if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # Switch to the nvidia implementation - eselect opengl set --use-old nvidia - - echo - elog "You must be in the video group to use the NVIDIA device" - elog "For more info, read the docs at" - elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" - elog - - elog "This ebuild installs a kernel module and X driver. Both must" - elog "match explicitly in their version. This means, if you restart" - elog "X, you must modprobe -r nvidia before starting it back up" - elog - - elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" - elog - elog "NVIDIA has requested that any bug reports submitted have the" - elog "output of /usr/bin/nvidia-bug-report.sh included." - elog - elog "To work with compiz, you must enable the AddARGBGLXVisuals option." - elog - elog "If you are having resolution problems, try disabling DynamicTwinView." - elog - - if ! use gtk; then - elog "USE=gtk controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. media-video/nvidia-settings" - elog "no longer installs nvidia-settings but only installs the" - elog "associated user space libraries." - fi -} - -pkg_postrm() { - if use kernel_linux; then - linux-mod_pkg_postrm - fi - eselect opengl set --use-old xorg-x11 -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild deleted file mode 100644 index 823713d10e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb" -CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b" -CROS_WORKON_PROJECT="chromiumos/third_party/khronos" - -inherit cros-workon - -DESCRIPTION="OpenGL|ES headers." -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="x86 arm" -IUSE="" - -RDEPEND="" -DEPEND="" - -CROS_WORKON_LOCALNAME="khronos" - -src_install() { - # headers - insinto /usr/include/EGL - doins "${S}/include/EGL/egl.h" - doins "${S}/include/EGL/eglplatform.h" - doins "${S}/include/EGL/eglext.h" - insinto /usr/include/KHR - doins "${S}/include/KHR/khrplatform.h" - insinto /usr/include/GLES - doins "${S}/include/GLES/gl.h" - doins "${S}/include/GLES/glext.h" - doins "${S}/include/GLES/glplatform.h" - insinto /usr/include/GLES2 - doins "${S}/include/GLES2/gl2.h" - doins "${S}/include/GLES2/gl2ext.h" - doins "${S}/include/GLES2/gl2platform.h" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild deleted file mode 100644 index 99a5beb18b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_PROJECT="chromiumos/third_party/khronos" - -inherit cros-workon - -DESCRIPTION="OpenGL|ES headers." -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="~x86 ~arm" -IUSE="" - -RDEPEND="" -DEPEND="" - -CROS_WORKON_LOCALNAME="khronos" - -src_install() { - # headers - insinto /usr/include/EGL - doins "${S}/include/EGL/egl.h" - doins "${S}/include/EGL/eglplatform.h" - doins "${S}/include/EGL/eglext.h" - insinto /usr/include/KHR - doins "${S}/include/KHR/khrplatform.h" - insinto /usr/include/GLES - doins "${S}/include/GLES/gl.h" - doins "${S}/include/GLES/glext.h" - doins "${S}/include/GLES/glplatform.h" - insinto /usr/include/GLES2 - doins "${S}/include/GLES2/gl2.h" - doins "${S}/include/GLES2/gl2ext.h" - doins "${S}/include/GLES2/gl2platform.h" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild deleted file mode 100644 index 51fbaf71df..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb" -CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b" -CROS_WORKON_PROJECT="chromiumos/third_party/khronos" - -inherit toolchain-funcs cros-workon - -DESCRIPTION="OpenGL|ES mock library" -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" - -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="arm x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-drivers/opengles-headers" -DEPEND="${RDEPEND}" - -CROS_WORKON_LOCALNAME="khronos" - -src_compile() { - tc-export AR CC CXX LD NM RANLIB - scons || die -} - -src_install() { - dolib libEGL.so libGLESv2.so -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild deleted file mode 100644 index e6a1b4792a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2010 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/khronos" - -inherit toolchain-funcs cros-workon - -DESCRIPTION="OpenGL|ES mock library" -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" - -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="~arm ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-drivers/opengles-headers" -DEPEND="${RDEPEND}" - -CROS_WORKON_LOCALNAME="khronos" - -src_compile() { - tc-export AR CC CXX LD NM RANLIB - scons || die -} - -src_install() { - dolib libEGL.so libGLESv2.so -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild deleted file mode 100644 index 5920fc414b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_COMMIT="d15b481e374f58ad82812b5ec9193307a937cfbe" -CROS_WORKON_TREE="7d097ae9d618817e2c9a274a07c3ec207a631583" -CROS_WORKON_PROJECT="chromiumos/platform/touchpad-tests" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch driver regression tests." -CROS_WORKON_LOCALNAME="../platform/touchpad-tests" - -KEYWORDS="arm amd64 x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - app-misc/utouch-evemu - x11-proto/inputproto" - -DEPEND=${RDEPEND} - -DOCS="" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - emake all -} - -src_install() { - # install to autotest deps directory for dependency - emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild deleted file mode 100644 index 34583147b9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_PROJECT="chromiumos/platform/touchpad-tests" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch driver regression tests." -CROS_WORKON_LOCALNAME="../platform/touchpad-tests" - -KEYWORDS="~arm amd64 ~x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - app-misc/utouch-evemu - x11-proto/inputproto" - -DEPEND=${RDEPEND} - -DOCS="" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - emake all -} - -src_install() { - # install to autotest deps directory for dependency - emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild deleted file mode 100644 index 94286cb0bf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild +++ /dev/null @@ -1,36 +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="43e047f66e76514f6ff153724482440bc45a09d2" -CROS_WORKON_TREE="3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1" -CROS_WORKON_PROJECT="chromiumos/platform/xf86-input-cmt" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch input driver for Xorg X server." -CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt" - -KEYWORDS="arm amd64 x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - x11-base/xorg-server" -DEPEND="${RDEPEND} - x11-proto/inputproto" - -DOCS="README" - -src_prepare() { - eautoreconf -} - -src_install() { - autotools-utils_src_install - remove_libtool_files all -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild deleted file mode 100644 index 08a7f1a165..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild +++ /dev/null @@ -1,34 +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/platform/xf86-input-cmt" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch input driver for Xorg X server." -CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt" - -KEYWORDS="~arm ~amd64 ~x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - x11-base/xorg-server" -DEPEND="${RDEPEND} - x11-proto/inputproto" - -DOCS="README" - -src_prepare() { - eautoreconf -} - -src_install() { - autotools-utils_src_install - remove_libtool_files all -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest deleted file mode 100644 index 1ad2d203e1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-input-evdev-2.7.3.tar.bz2 364819 SHA256 eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504 SHA512 edd5691bc6878bb491d7ffb04b35ab60cd70853ae702883c672c53c9f6cb8e81817f94cc03feaaca4e4a02a2a436f1417bd1e1e5f52a151a416fd04306159879 WHIRLPOOL 750605a0efabcb078e65d08b7ea610fdfc4cab49b73a2676247f95f50fcf7d17e80ab2186ef103830865a564dc695f035739f1b88e28f68c981fc703e26610a6 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch deleted file mode 100644 index 5c1bb2a846..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch +++ /dev/null @@ -1,374 +0,0 @@ -From: Ang Pan -Date: Thu, 15 Nov 2012 15:38:44 +0800 -Subject: [PATCH] Accelerate wheel scrolling - ---- - include/evdev-properties.h | 4 + - src/evdev.c | 198 +++++++++++++++++++++++++++++++++++++++---- - src/evdev.h | 13 +++ - 3 files changed, 196 insertions(+), 19 deletions(-) - -diff --git a/include/evdev-properties.h b/include/evdev-properties.h ---- a/include/evdev-properties.h -+++ b/include/evdev-properties.h -@@ -87,4 +87,8 @@ - */ - #define EVDEV_PROP_FUNCTION_KEYS "Evdev Function Keys" - -+/* Mouse scroll wheel axes acceleration. */ -+/* BOOL */ -+#define EVDEV_PROP_WHEEL_ACCEL_AXES "Evdev Wheel Axes Acceleration" -+ - #endif -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -99,6 +99,9 @@ - #define ABS_MT_TRACKING_ID 0x39 - #endif - -+#define AXIS_LABEL_PROP_ABS_DBL_START_TIME "Abs Dbl Start Timestamp" -+#define AXIS_LABEL_PROP_ABS_DBL_END_TIME "Abs Dbl End Timestamp" -+ - static const char *evdevDefaults[] = { - "XkbRules", "evdev", - "XkbModel", "evdev", -@@ -156,12 +159,17 @@ static Atom prop_axis_label; - static Atom prop_btn_label; - static Atom prop_device; - static Atom prop_virtual; -+static Atom prop_wheel_accel_axes; - - /* All devices the evdev driver has allocated and knows about. - * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK) - * cannot be used by evdev, leaving us with a space of 2 at the end. */ - static EvdevPtr evdev_devices[MAXDEVICES] = {NULL}; - -+static double TimevalToDouble(const struct timeval* tv) { -+ return (double)(tv->tv_sec) + (double)(tv->tv_usec) / 1000000.0; -+} -+ - static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode) - { - InputInfoPtr pInfo; -@@ -702,6 +710,103 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevQueueKbdEvent(pInfo, ev, value); - } - -+#ifndef HAVE_SMOOTH_SCROLLING -+/** -+ * Normal CDF seems like a good curve to simulate scroll wheel acceleration -+ * curve. Use following methods to generate the coefficients of a degree-4 -+ * polynomial regression for a specific normal cdf in matlab. -+ * -+ * Note: x for click_speed, y for scroll pixels. -+ * In reality, x ranges from 1 to 120+ for an Apple Mighty Mouse, use range -+ * greater than that to minimize approximation error at the end points. -+ * In our case, the range is [-50, 200]. -+ * -+ * matlab code to generate accel_params below: -+ * x=[-50:200]; -+ * y=600*normcdf(x,77,40); -+ * a=polyfit(x,y,4); -+ */ -+static const double accel_params[] = { -+ -9.528484576366295e-08, -+ -1.515738095456648e-04, -+ 3.940238948978762e-02, -+ 1.732410732791920, -+ 4.412651786252371, -+}; -+ -+/* when x is 155, the polinomial curve gives 600, the max pixels to scroll */ -+static const double max_allowed_click_speed = 155; -+ -+/** -+ * Get the number of pixels to scroll, used for axes_scroll. -+ */ -+static double -+EvdevGetPixelsToScroll(double click_speed) -+{ -+ double pixels = 0; -+ double term = 1; -+ double allowed_click_speed = fabs(click_speed); -+ if (allowed_click_speed > max_allowed_click_speed) -+ allowed_click_speed = max_allowed_click_speed; -+ int i; -+ for (i = 1; i <= ArrayLength(accel_params); i++) -+ { -+ pixels += term * accel_params[ArrayLength(accel_params) - i]; -+ term *= allowed_click_speed; -+ } -+ if (click_speed < 0) -+ pixels *= -1; -+ return pixels; -+} -+ -+/** -+ * Mouse scroll acceleration. -+ */ -+static void -+EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) -+{ -+ double pixels; -+ double dt; /* seconds */ -+ double click_speed; /* clicks / second */ -+ EvdevPtr pEvdev = pInfo->private; -+ double start_time; -+ double end_time = TimevalToDouble(&ev->time); -+ int map; -+ EvdevRelWheelPtr wheel = (ev->code == REL_WHEEL) ? &pEvdev->wheel : -+ &pEvdev->hwheel; -+ -+ /* Check if this scroll is in same direction as previous scroll event */ -+ if ((wheel->value < 0 && ev->value < 0) || -+ (wheel->value > 0 && ev->value > 0)) { -+ start_time = wheel->time; -+ } else { -+ start_time = end_time; -+ } -+ -+ /* If start_time == end_time, compute click_speed using dt = 1 second */ -+ dt = (end_time - start_time) ?: 1.0; -+ click_speed = ev->value / dt; -+ -+ wheel->value = ev->value; -+ wheel->time = end_time; -+ -+ pixels = EvdevGetPixelsToScroll(click_speed); -+ /* For historical reasons the vertical wheel (REL_WHEEL) is inverted */ -+ pixels *= (ev->code == REL_WHEEL) ? -1 : 1; -+ -+ valuator_mask_zero(pEvdev->vals); -+ map = pEvdev->axis_map[ev->code]; -+ valuator_mask_set_double(pEvdev->vals, map, pixels); -+ if (pEvdev->start_time_valuator_index >= 0) -+ valuator_mask_set_double(pEvdev->vals, -+ pEvdev->start_time_valuator_index, start_time); -+ if (pEvdev->end_time_valuator_index >= 0) -+ valuator_mask_set_double(pEvdev->vals, -+ pEvdev->end_time_valuator_index, end_time); -+ xf86PostMotionEventM(pInfo->dev, TRUE, pEvdev->vals); -+} -+#endif -+ - /** - * Take the relative motion input event and process it accordingly. - */ -@@ -712,6 +817,14 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevPtr pEvdev = pInfo->private; - int map; - -+#ifndef HAVE_SMOOTH_SCROLLING -+ if (pEvdev->scroll_axes && (ev->code == REL_WHEEL || -+ ev->code == REL_HWHEEL)) { -+ EvdevAccelWheel(pInfo, ev); -+ return; -+ } -+#endif -+ - /* Get the signed value, earlier kernels had this as unsigned */ - value = ev->value; - -@@ -1894,12 +2007,6 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - goto out; - - #ifndef HAVE_SMOOTH_SCROLLING -- /* Wheels are special, we post them as button events. So let's ignore them -- * in the axes list too */ -- if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_WHEEL)) -- num_axes--; -- if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_HWHEEL)) -- num_axes--; - if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_DIAL)) - num_axes--; - -@@ -1907,17 +2014,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - goto out; - #endif - -- if (num_axes > MAX_VALUATORS) { -- xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS); -- num_axes = MAX_VALUATORS; -+ /* -2 to leave room for start and end timestamps */ -+ if (num_axes > MAX_VALUATORS - 2) { -+ xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS - 2); -+ num_axes = MAX_VALUATORS - 2; - } - -- pEvdev->num_vals = num_axes; -- if (num_axes > 0) { -- pEvdev->vals = valuator_mask_new(num_axes); -- if (!pEvdev->vals) -- goto out; -- } -+ pEvdev->start_time_valuator_index = num_axes; -+ pEvdev->end_time_valuator_index = num_axes + 1; -+ -+ /* +2 for timestamp valuators */ -+ pEvdev->num_vals = num_axes + 2; -+ pEvdev->vals = valuator_mask_new(pEvdev->num_vals); -+ if (!pEvdev->vals) -+ goto out; - atoms = malloc(pEvdev->num_vals * sizeof(Atom)); - - for (axis = REL_X; i < MAX_VALUATORS && axis <= REL_MAX; axis++) -@@ -1925,7 +2035,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - pEvdev->axis_map[axis] = -1; - #ifndef HAVE_SMOOTH_SCROLLING - /* We don't post wheel events, so ignore them here too */ -- if (axis == REL_WHEEL || axis == REL_HWHEEL || axis == REL_DIAL) -+ if (axis == REL_DIAL) - continue; - #endif - if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis)) -@@ -1934,9 +2044,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - i++; - } - -- EvdevInitAxesLabels(pEvdev, Relative, pEvdev->num_vals, atoms); -+ /* Initialize all axis label atoms except Start & End Timestamps */ -+ EvdevInitAxesLabels(pEvdev, Relative, num_axes, atoms); -+ -+ /* Create atoms for Start & End Timestamps */ -+ atoms[pEvdev->start_time_valuator_index] = -+ MakeAtom(AXIS_LABEL_PROP_ABS_DBL_START_TIME, -+ strlen(AXIS_LABEL_PROP_ABS_DBL_START_TIME), -+ TRUE); -+ atoms[pEvdev->end_time_valuator_index] = -+ MakeAtom(AXIS_LABEL_PROP_ABS_DBL_END_TIME, -+ strlen(AXIS_LABEL_PROP_ABS_DBL_END_TIME), -+ TRUE); - -- if (!InitValuatorClassDeviceStruct(device, num_axes, atoms, -+ if (!InitValuatorClassDeviceStruct(device, pEvdev->num_vals, atoms, - GetMotionHistorySize(), Relative)) { - xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n"); - goto out; -@@ -1951,11 +2072,18 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - for (axis = REL_X; axis <= REL_MAX; axis++) - { - int axnum = pEvdev->axis_map[axis]; -+ int mode = Relative; - - if (axnum == -1) - continue; -+ -+#ifndef HAVE_SMOOTH_SCROLLING -+ if (axis == REL_WHEEL || axis == REL_HWHEEL) -+ mode = Absolute; -+#endif -+ - xf86InitValuatorAxisStruct(device, axnum, atoms[axnum], -1, -1, 1, 0, 1, -- Relative); -+ mode); - xf86InitValuatorDefaults(device, axnum); - #ifdef HAVE_SMOOTH_SCROLLING - if (axis == REL_WHEEL) -@@ -1967,6 +2095,17 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - #endif - } - -+#ifndef HAVE_SMOOTH_SCROLLING -+ /* Initialize valuators for scroll wheel Start & End Timestamps */ -+ xf86InitValuatorAxisStruct(device, pEvdev->start_time_valuator_index, -+ atoms[pEvdev->start_time_valuator_index], -+ 0, INT_MAX, 1, 0, 1, Absolute); -+ -+ xf86InitValuatorAxisStruct(device, pEvdev->end_time_valuator_index, -+ atoms[pEvdev->end_time_valuator_index], -+ 0, INT_MAX, 1, 0, 1, Absolute); -+#endif -+ - free(atoms); - - return Success; -@@ -2128,6 +2267,9 @@ EvdevInit(DeviceIntPtr device) - for(i = 0; i < max(ABS_CNT,REL_CNT); i++) - pEvdev->axis_map[i]=-1; - -+ pEvdev->start_time_valuator_index = -1; -+ pEvdev->end_time_valuator_index = -1; -+ - if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS) - EvdevAddKeyClass(device); - if (pEvdev->flags & EVDEV_BUTTON_EVENTS) -@@ -3218,6 +3360,7 @@ EvdevInitProperty(DeviceIntPtr dev) - if (pEvdev->flags & (EVDEV_RELATIVE_EVENTS | EVDEV_ABSOLUTE_EVENTS)) - { - BOOL invert[2]; -+ int axis_accel_conf_val; - invert[0] = pEvdev->invert_x; - invert[1] = pEvdev->invert_y; - -@@ -3264,6 +3407,16 @@ EvdevInitProperty(DeviceIntPtr dev) - - XISetDevicePropertyDeletable(dev, prop_swap, FALSE); - -+ prop_wheel_accel_axes = MakeAtom(EVDEV_PROP_WHEEL_ACCEL_AXES, -+ strlen(EVDEV_PROP_WHEEL_ACCEL_AXES), TRUE); -+ axis_accel_conf_val = xf86SetBoolOption(pInfo->options, EVDEV_PROP_WHEEL_ACCEL_AXES, 0); -+ pEvdev->scroll_axes = axis_accel_conf_val != 0; -+ rc = XIChangeDeviceProperty(dev, prop_wheel_accel_axes, XA_INTEGER, 8, -+ PropModeReplace, 1, &pEvdev->scroll_axes, FALSE); -+ if (rc != Success) -+ return; -+ -+ XISetDevicePropertyDeletable(dev, prop_wheel_accel_axes, FALSE); - /* Axis labelling */ - if ((pEvdev->num_vals > 0) && (prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) - { -@@ -3333,6 +3486,13 @@ EvdevSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, - - if (!checkonly) - pEvdev->swap_axes = *((BOOL*)val->data); -+ } else if (atom == prop_wheel_accel_axes) -+ { -+ if (val->format != 8 || val->type != XA_INTEGER || val->size != 1) -+ return BadMatch; -+ -+ if (!checkonly) -+ pEvdev->scroll_axes = *((BOOL*)val->data); - } else if (atom == prop_axis_label || atom == prop_btn_label || - atom == prop_product_id || atom == prop_device || - atom == prop_virtual) -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -155,6 +155,12 @@ typedef struct { - #endif - } EventQueueRec, *EventQueuePtr; - -+/* Mouse scroll wheel state for one axis (REL_WHEEL or REL_WHEEL) */ -+typedef struct { -+ int value; /* last scroll wheel value */ -+ double time; /* evdev timestamp of last scroll event */ -+} EvdevRelWheelRec, *EvdevRelWheelPtr; -+ - typedef struct { - unsigned short id_vendor; - unsigned short id_product; -@@ -252,6 +258,9 @@ typedef struct { - unsigned long led_bitmask[NLONGS(LED_CNT)]; - struct input_absinfo absinfo[ABS_CNT]; - -+ int start_time_valuator_index; -+ int end_time_valuator_index; -+ - /* minor/major number */ - dev_t min_maj; - -@@ -266,6 +275,10 @@ typedef struct { - struct timeval before_sync_time; - struct timeval after_sync_time; - int32_t cached_tid[MAX_SLOT_COUNT]; -+ -+ BOOL scroll_axes; -+ EvdevRelWheelRec wheel; /* scroll state for REL_WHEEL */ -+ EvdevRelWheelRec hwheel; /* scroll state for REL_HWHEEL */ - } EvdevRec, *EvdevPtr; - - typedef struct { --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch deleted file mode 100644 index 083a6fecef..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch +++ /dev/null @@ -1,89 +0,0 @@ -From: Yufeng Shen -Date: Mon, 20 Aug 2012 14:55:57 -0400 -Subject: [PATCH] x11-drivers/xf86-input-evdev: Use monotonic timestamps for - input events - -This patch adds the support for xf86-input-evdev to turn on monotonic -timestamps if kernel supports it. - -The clock source is set in EvdevOn() instead of EvdevCache() because the -latter is only called once when X registers the input device fd with kernel, -and if later X closes and reopens the input device fd (e.g. when the -system goes through suspend/resume cycle), the clock source setting -will be lost. EvdevOn() is the right place to set clock source since -it is called whenever X wants to open the input device and use it. - -BUG=chrome-os-partner:12187 -TEST=On Link, grep "time stamps" /var/log/Xorg.0.log - Make sure monotonic timestamp is used for evdev - Run "xinput test-xi2" and move fingers on touch device - Note that valuator 4 (Touch Timestamp) is using - monotonic timestamp. - Suspend and resume the device and make sure the timestamp - does not change back to real world timestamp. ---- - src/evdev.c | 16 ++++++++++++++++ - src/evdev.h | 1 + - 2 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -61,6 +62,11 @@ - #define XI_PROP_VIRTUAL_DEVICE "Virtual Device" - #endif - -+/* Set clockid to be used for timestamps */ -+#ifndef EVIOCSCLOCKID -+#define EVIOCSCLOCKID _IOW('E', 0xa0, int) -+#endif -+ - /* removed from server, purge when dropping support for server 1.10 */ - #define XI86_SEND_DRAG_EVENTS 0x08 - -@@ -1809,6 +1815,12 @@ EvdevInit(DeviceIntPtr device) - return Success; - } - -+static int -+EvdevEnableMonotonic(InputInfoPtr pInfo) { -+ unsigned int clk = CLOCK_MONOTONIC; -+ return (ioctl(pInfo->fd, EVIOCSCLOCKID, &clk) == 0) ? Success : !Success; -+} -+ - /** - * Init all extras (wheel emulation, etc.) and grab the device. - */ -@@ -1826,6 +1838,10 @@ EvdevOn(DeviceIntPtr device) - if (rc != Success) - return rc; - -+ pEvdev->is_monotonic = (EvdevEnableMonotonic(pInfo) == Success); -+ xf86IDrvMsg(pInfo, X_PROBED, "Using %s input event time stamps\n", -+ pEvdev->is_monotonic ? "monotonic" : "realtime"); -+ - EvdevGrabDevice(pInfo, 1, 0); - - xf86FlushInput(pInfo->fd); -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -173,6 +173,7 @@ typedef struct { - BOOL swap_axes; - BOOL invert_x; - BOOL invert_y; -+ BOOL is_monotonic; - - int delta[REL_CNT]; - unsigned int abs_queued, rel_queued, prox_queued; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch deleted file mode 100644 index 36100440c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Chung-yih Wang -Date: Thu, 6 Dec 2012 17:43:04 +0800 -Subject: [PATCH] Add block reading support - - This patch adds a new xinput property "Block Event Reading" that blocks - event reading by skipping read() calls in ReadInput() in order to - generate the SYN_DROPPED event for testing the SYN_DROPPED handling. ---- - src/debug.c | 37 +++++++++++++++++++++++++++++++++++++ - src/evdev.c | 6 +++++- - src/evdev.h | 6 ++++++ - 3 files changed, 48 insertions(+), 1 deletions(-) - -diff --git a/src/debug.c b/src/debug.c ---- a/src/debug.c -+++ b/src/debug.c -@@ -19,10 +19,12 @@ - #include - #include - -+#define XI_PROP_BLOCK_READ_INPUT "Block Event Reading" - #define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log" - - #define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat" - -+static Atom block_read_prop; - static Atom dump_debug_log_prop; - - static void -@@ -112,3 +114,38 @@ EvdevDebugInitProperty(DeviceIntPtr dev) - XIRegisterPropertyHandler(dev, EvdevDebugSetProperty, - EvdevDebugGetProperty, NULL); - } -+ -+static int -+EvdevBlockSetProperty(DeviceIntPtr dev, Atom atom, -+ XIPropertyValuePtr val, BOOL checkonly) -+{ -+ InputInfoPtr pInfo = dev->public.devicePrivate; -+ EvdevPtr pEvdev = pInfo->private; -+ -+ if (atom == block_read_prop) { -+ if (val->type != XA_INTEGER || val->format != 8 || val->size != 1) -+ return BadMatch; -+ -+ if (!checkonly) -+ pEvdev->block_input = *(BOOL *)val->data; -+ } -+ return Success; -+} -+ -+void -+EvdevBlockInitProperty(DeviceIntPtr dev) -+{ -+ InputInfoPtr pInfo = dev->public.devicePrivate; -+ EvdevPtr pEvdev = pInfo->private; -+ -+ block_read_prop = MakeAtom(XI_PROP_BLOCK_READ_INPUT, -+ strlen(XI_PROP_BLOCK_READ_INPUT), TRUE); -+ -+ pEvdev->block_input = FALSE; -+ -+ XIChangeDeviceProperty(dev, block_read_prop, XA_INTEGER, -+ /* format */ 8, PropModeReplace, /* size */ 1, -+ &pEvdev->block_input, FALSE); -+ XISetDevicePropertyDeletable(dev, block_read_prop, FALSE); -+ XIRegisterPropertyHandler(dev, EvdevBlockSetProperty, NULL, NULL); -+} -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1569,11 +1569,14 @@ EvdevReadInput(InputInfoPtr pInfo) - struct input_event ev[NUM_EVENTS]; - int i, len = sizeof(ev); - BOOL sync_evdev_state = FALSE; -+ EvdevPtr pEvdev = pInfo->private; -+ -+ if (pEvdev->block_input) -+ return; - - while (len == sizeof(ev)) - { - #ifdef MULTITOUCH -- EvdevPtr pEvdev = pInfo->private; - - if (pEvdev->mtdev) - len = mtdev_get(pEvdev->mtdev, pInfo->fd, ev, NUM_EVENTS) * -@@ -2361,6 +2364,7 @@ EvdevInit(DeviceIntPtr device) - EvdevDragLockInitProperty(device); - EvdevAppleInitProperty(device); - EvdevDebugInitProperty(device); -+ EvdevBlockInitProperty(device); - - return Success; - } -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -291,6 +291,8 @@ typedef struct { - BOOL scroll_axes; - EvdevRelWheelRec wheel; /* scroll state for REL_WHEEL */ - EvdevRelWheelRec hwheel; /* scroll state for REL_HWHEEL */ -+ -+ BOOL block_input; /* block read for SYN_DROPPED test */ - } EvdevRec, *EvdevPtr; - - typedef struct { -@@ -352,5 +354,9 @@ void Evdev3BEmuInitProperty(DeviceIntPtr); - void EvdevWheelEmuInitProperty(DeviceIntPtr); - void EvdevDragLockInitProperty(DeviceIntPtr); - void EvdevAppleInitProperty(DeviceIntPtr); -+ -+/* For debugging and testing */ - void EvdevDebugInitProperty(DeviceIntPtr); -+void EvdevBlockInitProperty(DeviceIntPtr); -+ - #endif --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch deleted file mode 100644 index cb652196c0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch +++ /dev/null @@ -1,200 +0,0 @@ -From: Yufeng Shen -Date: Wed, 7 Mar 2012 20:39:09 +1000 -Subject: [PATCH] x11-drivers/xf86-input-evdev: Add kernel timestamp to touch - events - -This CL passes kernel timestamp for touch events to X (hence Chrome) -as a valuator named "Touch Timestamp". The timestamp for all the X -touch events generated within one evdev sync report is set to be the -same as the last EV_SYN event's timestamp. - -BUG=chrome-os-partner:12187 -TEST=Run "xinput list 12" on Link and see something like - Class originated from: 12. Type: XIValuatorClass - Detail for Valuator 4: - Label: Touch Timestamp - Range: 0.000000 - 2147483647.000000 - Resolution: 1 units/m - Mode: absolute - Current value: 0.000000 -TEST=Run "xinput test-xi2" on Link and check that for each - touch event there is timestamp at the correct valuator: - EVENT type 6 (Motion) - device: 12 (12) - detail: 0 - flags: emulated - ... - valuators: - 0: 135.95 - 1: 116.93 - 2: 18.00 - 3: 100.00 - 4: 1348803480.46 <- Touch Timestamp - EVENT type 18 (TouchBegin) - device: 12 (12) - detail: 1 - valuators: - 0: 135.95 - 1: 116.93 - 2: 18.00 - 3: 100.00 - 4: 1348803480.46 <- Touch Timestamp -TEST=Run "xinput test-xi2" on Link and check that for non-touch events - (ie USB mouse) there is no Touch Timestamp: - EVENT type 6 (Motion) - device: 2 (13) - ... - valuators: - 0: 1.19 ---- - src/evdev.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- - src/evdev.h | 4 ++++ - 2 files changed, 46 insertions(+), 5 deletions(-) - -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -102,6 +102,8 @@ - #define AXIS_LABEL_PROP_ABS_DBL_START_TIME "Abs Dbl Start Timestamp" - #define AXIS_LABEL_PROP_ABS_DBL_END_TIME "Abs Dbl End Timestamp" - -+#define AXIS_LABEL_PROP_TOUCH_TIME "Touch Timestamp" -+ - static const char *evdevDefaults[] = { - "XkbRules", "evdev", - "XkbModel", "evdev", -@@ -1097,7 +1099,7 @@ EvdevPostProximityEvents(InputInfoPtr pInfo, int which, int num_v, int first_v, - * Post the queued key/button events. - */ - static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, -- int v[MAX_VALUATORS]) -+ int v[MAX_VALUATORS], struct input_event *ev) - { - int i; - EvdevPtr pEvdev = pInfo->private; -@@ -1127,6 +1129,10 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, - break; - #ifdef MULTITOUCH - case EV_QUEUE_TOUCH: -+ if (pEvdev->touch_time_valuator_index >= 0) -+ valuator_mask_set_double(pEvdev->queue[i].touchMask, -+ pEvdev->touch_time_valuator_index, -+ TimevalToDouble(&ev->time)); - xf86PostTouchEvent(pInfo->dev, pEvdev->queue[i].detail.touch, - pEvdev->queue[i].val, 0, - pEvdev->queue[i].touchMask); -@@ -1161,7 +1167,7 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevPostProximityEvents(pInfo, TRUE, num_v, first_v, v); - EvdevPostRelativeMotionEvents(pInfo, num_v, first_v, v); - EvdevPostAbsoluteMotionEvents(pInfo, num_v, first_v, v); -- EvdevPostQueuedEvents(pInfo, num_v, first_v, v); -+ EvdevPostQueuedEvents(pInfo, num_v, first_v, v, ev); - EvdevPostProximityEvents(pInfo, FALSE, num_v, first_v, v); - - memset(pEvdev->delta, 0, sizeof(pEvdev->delta)); -@@ -1723,6 +1729,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - int num_mt_axes = 0, /* number of MT-only axes */ - num_mt_axes_total = 0; /* total number of MT axes, including - double-counted ones, excluding blacklisted */ -+ int num_ts_vals = 0; /* number of Timestamp valuators */ -+ int num_valuators; - Atom *atoms; - - pInfo = device->public.devicePrivate; -@@ -1785,6 +1793,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - #ifdef MULTITOUCH - if (num_mt_axes_total > 0) { -+ /* A Touch Timestamp is only appended to Touch events */ -+ num_ts_vals = 1; -+ - pEvdev->num_mt_vals = num_mt_axes_total; - pEvdev->mt_mask = valuator_mask_new(num_mt_axes_total); - if (!pEvdev->mt_mask) { -@@ -1813,8 +1824,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - - for (i = 0; i < EVDEV_MAXQUEUE; i++) { -+ /* Touch Timestamp is appended directly to the touchMask */ - pEvdev->queue[i].touchMask = -- valuator_mask_new(num_mt_axes_total); -+ valuator_mask_new(num_mt_axes_total + 1); - if (!pEvdev->queue[i].touchMask) { - xf86Msg(X_ERROR, "%s: failed to allocate MT valuator masks for " - "evdev event queue.\n", device->name); -@@ -1823,7 +1835,10 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - } - #endif -- atoms = malloc((pEvdev->num_vals + num_mt_axes) * sizeof(Atom)); -+ -+ num_valuators = num_axes + num_mt_axes + num_ts_vals; -+ -+ atoms = malloc(num_valuators * sizeof(Atom)); - - i = 0; - for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) { -@@ -1853,9 +1868,22 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - i++; - } - -+ /* Note: touch timestamp, if present, is initialized separately */ - EvdevInitAxesLabels(pEvdev, Absolute, pEvdev->num_vals + num_mt_axes, atoms); - -- if (!InitValuatorClassDeviceStruct(device, num_axes + num_mt_axes, atoms, -+#ifdef MULTITOUCH -+ if (num_ts_vals > 0) { -+ /* Manually setup the atom for Touch Timestamp since it did not happen -+ * in EvdevInitAxesLabels(). It will always be the last valuator. */ -+ pEvdev->touch_time_valuator_index = num_valuators - 1; -+ atoms[pEvdev->touch_time_valuator_index] = -+ MakeAtom(AXIS_LABEL_PROP_TOUCH_TIME, -+ strlen(AXIS_LABEL_PROP_TOUCH_TIME), -+ TRUE); -+ } -+#endif -+ -+ if (!InitValuatorClassDeviceStruct(device, num_valuators, atoms, - GetMotionHistorySize(), Absolute)) { - xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n"); - goto out; -@@ -1945,6 +1973,14 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - resolution, 0, resolution, - Absolute); - } -+ -+ /* Manually configure touch_time axis */ -+ if (num_ts_vals > 0) { -+ xf86InitValuatorAxisStruct(device, pEvdev->touch_time_valuator_index, -+ atoms[pEvdev->touch_time_valuator_index], -+ 0, INT_MAX, 1, 0, 1, Absolute); -+ } -+ - #endif - - free(atoms); -@@ -2279,6 +2315,7 @@ EvdevInit(DeviceIntPtr device) - - pEvdev->start_time_valuator_index = -1; - pEvdev->end_time_valuator_index = -1; -+ pEvdev->touch_time_valuator_index = -1; - - if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS) - EvdevAddKeyClass(device); -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -260,6 +260,10 @@ typedef struct { - unsigned long led_bitmask[NLONGS(LED_CNT)]; - struct input_absinfo absinfo[ABS_CNT]; - -+ /* touch_time_valuator_index is the index for the "Touch Timestamp" -+ * property in the device valuator array. We will set it to be the -+ * last valuator in EvdevAddAbsValuatorClass(); */ -+ int touch_time_valuator_index; - int start_time_valuator_index; - int end_time_valuator_index; - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch deleted file mode 100644 index 0160cba5ff..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch +++ /dev/null @@ -1,222 +0,0 @@ -From: Michael Spang -Date: Mon, 13 Aug 2012 11:35:32 -0400 -Subject: [PATCH] Add events debug log support - -This adds a new xinput property "Dump Debug Logs" that dumps the last -64k input events to /var/log/evdev_input_events.dat. ---- - src/Makefile.am | 3 +- - src/debug.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/evdev.c | 13 ++++++- - src/evdev.h | 11 +++++ - 4 files changed, 139 insertions(+), 2 deletions(-) - create mode 100644 src/debug.c - -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -39,5 +39,6 @@ AM_CPPFLAGS =-I$(top_srcdir)/include - emuThird.c \ - emuWheel.c \ - draglock.c \ -- apple.c -+ apple.c \ -+ debug.c - -diff --git a/src/debug.c b/src/debug.c -new file mode 100644 ---- /dev/null -+++ b/src/debug.c -@@ -0,0 +1,114 @@ -+// 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. -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log" -+ -+#define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat" -+ -+static Atom dump_debug_log_prop; -+ -+static void -+EvdevDumpLog(InputInfoPtr pInfo) { -+ EvdevPtr pEvdev = pInfo->private; -+ int i; -+ -+ FILE *fp = fopen(INPUT_EVENTS_LOG_FILE, "w"); -+ if (!fp) { -+ xf86IDrvMsg(pInfo, X_ERROR, "fopen: %s: %s\n", -+ INPUT_EVENTS_LOG_FILE, strerror(errno)); -+ return; -+ } -+ -+ fprintf(fp, "# device: %s\n", pInfo->name); -+ -+ for (i = ABS_X; i <= ABS_MAX; i++) { -+ if (EvdevBitIsSet(pEvdev->abs_bitmask, i)) { -+ fprintf(fp, "# absinfo: %d %d %d %d %d %d\n", -+ /* event code (axis) */ i, -+ pEvdev->absinfo[i].minimum, -+ pEvdev->absinfo[i].maximum, -+ pEvdev->absinfo[i].fuzz, -+ pEvdev->absinfo[i].flat, -+ pEvdev->absinfo[i].resolution); -+ } -+ } -+ -+ for (i = 0; i < DEBUG_BUF_SIZE; ++i) { -+ struct debug_event *de = -+ &pEvdev->debug_buf[(pEvdev->debug_buf_tail + i) % DEBUG_BUF_SIZE]; -+ if (de->ev.time.tv_sec == 0 && de->ev.time.tv_usec == 0) -+ continue; -+ fprintf(fp, "E: %ld.%06ld %04x %04x %d %d\n", -+ de->ev.time.tv_sec, -+ de->ev.time.tv_usec, -+ de->ev.type, -+ de->ev.code, -+ de->ev.value, -+ de->slot); -+ } -+ -+ fclose(fp); -+} -+ -+static int -+EvdevDebugGetProperty(DeviceIntPtr dev, Atom property) -+{ -+ return Success; -+} -+ -+static int -+EvdevDebugSetProperty(DeviceIntPtr dev, Atom atom, -+ XIPropertyValuePtr val, BOOL checkonly) -+{ -+ InputInfoPtr pInfo = dev->public.devicePrivate; -+ CARD32 data; -+ -+ if (atom == dump_debug_log_prop) { -+ if (val->type != XA_INTEGER || val->format != 32 || val->size != 1) -+ return BadMatch; -+ -+ data = *(CARD32 *)val->data; -+ -+ if (data != 1) -+ return BadValue; -+ -+ if (!checkonly) -+ EvdevDumpLog(pInfo); -+ } -+ -+ return Success; -+} -+ -+void -+EvdevDebugInitProperty(DeviceIntPtr dev) -+{ -+ -+ dump_debug_log_prop = MakeAtom(XI_PROP_DUMP_DEBUG_LOG, -+ strlen(XI_PROP_DUMP_DEBUG_LOG), TRUE); -+ CARD32 prop_dump_debug_log_init = 0; -+ -+ XIChangeDeviceProperty(dev, dump_debug_log_prop, XA_INTEGER, -+ /* format */ 32, PropModeReplace, /* size */ 1, -+ &prop_dump_debug_log_init, FALSE); -+ XISetDevicePropertyDeletable(dev, dump_debug_log_prop, FALSE); -+ XIRegisterPropertyHandler(dev, EvdevDebugSetProperty, -+ EvdevDebugGetProperty, NULL); -+} -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -219,7 +219,7 @@ static size_t EvdevCountBits(unsigned long *array, size_t nlongs) - return count; - } - --static inline int EvdevBitIsSet(const unsigned long *array, int bit) -+inline int EvdevBitIsSet(const unsigned long *array, int bit) - { - return !!(array[bit / LONG_BITS] & (1LL << (bit % LONG_BITS))); - } -@@ -1208,6 +1208,16 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) - syn_dropped = EvdevProcessSyncEvent(pInfo, ev); - break; - } -+ -+ // Add touch events to the debug log. Keypresses are not included. -+ if (ev->type == EV_ABS || ev->type == EV_SYN || -+ (ev->type == EV_KEY && ev->code == BTN_TOUCH)) { -+ EvdevPtr pEvdev = pInfo->private; -+ pEvdev->debug_buf[pEvdev->debug_buf_tail].ev = *ev; -+ pEvdev->debug_buf[pEvdev->debug_buf_tail].slot = pEvdev->cur_slot; -+ pEvdev->debug_buf_tail++; -+ pEvdev->debug_buf_tail %= DEBUG_BUF_SIZE; -+ } - return syn_dropped; - } - -@@ -2308,6 +2318,7 @@ EvdevInit(DeviceIntPtr device) - EvdevWheelEmuInitProperty(device); - EvdevDragLockInitProperty(device); - EvdevAppleInitProperty(device); -+ EvdevDebugInitProperty(device); - - return Success; - } -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -101,6 +101,8 @@ - /* Number of longs needed to hold the given number of bits */ - #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) - -+#define DEBUG_BUF_SIZE 65536 -+ - #define _ABS_MT_FIRST ABS_MT_TOUCH_MAJOR - #define _ABS_MT_LAST ABS_MT_DISTANCE - #define _ABS_MT_CNT (_ABS_MT_LAST - _ABS_MT_FIRST + 1) -@@ -268,6 +270,12 @@ typedef struct { - int num_queue; - EventQueueRec queue[EVDEV_MAXQUEUE]; - -+ struct debug_event { -+ struct input_event ev; -+ int slot; -+ } debug_buf[DEBUG_BUF_SIZE]; -+ size_t debug_buf_tail; -+ - enum fkeymode fkeymode; - - /* Sync timestamps */ -@@ -329,9 +337,12 @@ BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv); - void EvdevDragLockPreInit(InputInfoPtr pInfo); - BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value); - -+int EvdevBitIsSet(const unsigned long *array, int bit); -+ - void EvdevMBEmuInitProperty(DeviceIntPtr); - void Evdev3BEmuInitProperty(DeviceIntPtr); - void EvdevWheelEmuInitProperty(DeviceIntPtr); - void EvdevDragLockInitProperty(DeviceIntPtr); - void EvdevAppleInitProperty(DeviceIntPtr); -+void EvdevDebugInitProperty(DeviceIntPtr); - #endif --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch deleted file mode 100644 index 7d0c107715..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch +++ /dev/null @@ -1,163 +0,0 @@ -From: Chung-yih Wang -Date: Wed, 14 Nov 2012 15:42:36 +0800 -Subject: [PATCH] Accelerate emulated wheel events - -Use the Chromium OS Mouse Wheel acceleration for Emulated Wheel -events. This acceleration replaces the simpler "accumulated inertia -mapped to number of button clicks" approach. - -The main motivation of this change is to send Emulated Wheel events to -Chrome using the scroll valuators instead of legacy button events. ---- - src/emuWheel.c | 48 +++++++++--------------------------------------- - src/evdev.c | 20 +++++++++++++++++++- - src/evdev.h | 4 ++++ - 3 files changed, 32 insertions(+), 40 deletions(-) - -diff --git a/src/emuWheel.c b/src/emuWheel.c ---- a/src/emuWheel.c -+++ b/src/emuWheel.c -@@ -50,9 +50,6 @@ static Atom prop_wheel_inertia = 0; - static Atom prop_wheel_timeout = 0; - static Atom prop_wheel_button = 0; - --/* Local Funciton Prototypes */ --static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value); -- - /* Filter mouse button events */ - BOOL - EvdevWheelEmuFilterButton(InputInfoPtr pInfo, unsigned int button, int value) -@@ -148,8 +145,15 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv) - */ - if (pAxis) - { -- if (EvdevWheelEmuInertia(pInfo, pAxis, value)) -- pOtherAxis->traveled_distance = 0; -+ if (pAxis->up_button) { -+ /* -+ * Try to emit an emulated wheel event. For REL_Y, up is - -+ * and down is + but, for REL_WHEEL, up is + and down is -. -+ */ -+ pEv->code = (pEv->code == REL_Y) ? REL_WHEEL : REL_HWHEEL; -+ pEv->value *= (pEv->code == REL_WHEEL) ? -1 : 1; -+ EvdevProcessRelativeMotionEvent(pInfo, pEv); -+ } - } - - /* Eat motion events while emulateWheel button pressed. */ -@@ -159,40 +163,6 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv) - return FALSE; - } - --/* Simulate inertia for our emulated mouse wheel. -- Returns the number of wheel events generated. -- */ --static int --EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value) --{ -- EvdevPtr pEvdev = (EvdevPtr)pInfo->private; -- int button; -- int inertia; -- int rc = 0; -- -- /* if this axis has not been configured, just eat the motion */ -- if (!axis->up_button) -- return rc; -- -- axis->traveled_distance += value; -- -- if (axis->traveled_distance < 0) { -- button = axis->up_button; -- inertia = -pEvdev->emulateWheel.inertia; -- } else { -- button = axis->down_button; -- inertia = pEvdev->emulateWheel.inertia; -- } -- -- /* Produce button press events for wheel motion */ -- while(abs(axis->traveled_distance) > pEvdev->emulateWheel.inertia) { -- axis->traveled_distance -= inertia; -- EvdevQueueButtonClicks(pInfo, button, 1); -- rc++; -- } -- return rc; --} -- - /* Handle button mapping here to avoid code duplication, - returns true if a button mapping was found. */ - static BOOL -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -131,6 +131,7 @@ static BOOL EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab); - static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int calibration[4]); - static int EvdevOpenDevice(InputInfoPtr pInfo); - static void EvdevCloseDevice(InputInfoPtr pInfo); -+static void EvdevForceWheel(InputInfoPtr pInfo); - - static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, - uint16_t code, int32_t value); -@@ -787,6 +788,8 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) - - /* If start_time == end_time, compute click_speed using dt = 1 second */ - dt = (end_time - start_time) ?: 1.0; -+ if (pEvdev->emulateWheel.enabled) -+ dt *= pEvdev->emulateWheel.inertia; - click_speed = ev->value / dt; - - wheel->value = ev->value; -@@ -812,7 +815,7 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) - /** - * Take the relative motion input event and process it accordingly. - */ --static void -+void - EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev) - { - int value; -@@ -2048,6 +2051,8 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - if (!EvdevBitIsSet(pEvdev->bitmask, EV_REL)) - goto out; - -+ EvdevForceWheel(pInfo); -+ - num_axes = EvdevCountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); - if (num_axes < 1) - goto out; -@@ -2583,6 +2588,19 @@ EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab) - } - - /** -+ * Some devices require REL_WHEEL and REL_HWHEEL axes to emulate wheel -+ * activities. -+ */ -+static void -+EvdevForceWheel(InputInfoPtr pInfo) -+{ -+ EvdevPtr pEvdev = pInfo->private; -+ -+ EvdevSetBit(pEvdev->rel_bitmask, REL_WHEEL); -+ EvdevSetBit(pEvdev->rel_bitmask, REL_HWHEEL); -+} -+ -+/** - * Some devices only have other axes (e.g. wheels), but we - * still need x/y for these. The server relies on devices having - * x/y as axes 0/1 and core/XI 1.x clients expect it too (#44655) -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -314,6 +314,10 @@ void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, - int v[MAX_VALUATORS]); - unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code); - -+/* Event processing functions */ -+void EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, -+ struct input_event *ev); -+ - /* Middle Button emulation */ - int EvdevMBEmuTimer(InputInfoPtr); - BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch deleted file mode 100644 index 9a4c9a408c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch +++ /dev/null @@ -1,537 +0,0 @@ -From: Chung-yih Wang -Date: Thu, 15 Nov 2012 16:17:12 +0800 -Subject: [PATCH] x11-drivers/xf86-input-evdev: Add SYN_DROPPED handling - -If an evdev client cannot consume evdev events in its queue fast enough, the -evdev kernel driver will enqueue a SYN_DROPPED event and clear the queue -once the client's queue is full. The result is that the X driver will be out -of sync with respect to the kernel driver state. The patch tries to handle the -SYN_DROPPED event by retrieving the kernel driver's state. Retrieving this -state is inherently non-atomic, since it requires a sequence of ioctls. We use -a simple before and after time stamping approach to deal with the race -condition between partially syncing state and any potentially stale events that -arrive during synchronization. ---- - src/evdev.c | 371 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/evdev.h | 17 +++ - 2 files changed, 381 insertions(+), 7 deletions(-) - -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -127,11 +127,27 @@ static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int cal - static int EvdevOpenDevice(InputInfoPtr pInfo); - static void EvdevCloseDevice(InputInfoPtr pInfo); - -+static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, -+ uint16_t code, int32_t value); - static void EvdevInitAxesLabels(EvdevPtr pEvdev, int mode, int natoms, Atom *atoms); - static void EvdevInitButtonLabels(EvdevPtr pEvdev, int natoms, Atom *atoms); - static void EvdevInitProperty(DeviceIntPtr dev); - static int EvdevSetProperty(DeviceIntPtr dev, Atom atom, - XIPropertyValuePtr val, BOOL checkonly); -+static void EvdevSyncState(InputInfoPtr pInfo); -+static void EvdevGetKernelTime(struct timeval *current_time, -+ BOOL use_monotonic); -+static int EvdevKeyStateSync(InputInfoPtr pInfo); -+static int EvdevAbsAxesSync(InputInfoPtr pInfo); -+static int EvdevAbsMtSlotSync(InputInfoPtr pInfo); -+static int EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index, -+ uint16_t code, int32_t value); -+static int EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots, -+ int *count_after_synreport); -+static int EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots); -+static int EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport); -+static int EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport); -+ - static Atom prop_product_id; - static Atom prop_invert; - static Atom prop_calibration; -@@ -205,6 +221,11 @@ static inline void EvdevSetBit(unsigned long *array, int bit) - array[bit / LONG_BITS] |= (1LL << (bit % LONG_BITS)); - } - -+static inline void EvdevClearBit(unsigned long *array, int bit) -+{ -+ array[bit / LONG_BITS] &= ~(1LL << (bit % LONG_BITS)); -+} -+ - static int - EvdevGetMajorMinor(InputInfoPtr pInfo) - { -@@ -660,6 +681,11 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev) - /* Get the signed value, earlier kernels had this as unsigned */ - value = ev->value; - -+ if (ev->value) -+ EvdevSetBit(pEvdev->key_state_bitmask, ev->code); -+ else -+ EvdevClearBit(pEvdev->key_state_bitmask, ev->code); -+ - /* Handle drag lock */ - if (EvdevDragLockFilterEvent(pInfo, button, value)) - return; -@@ -787,6 +813,7 @@ EvdevProcessTouchEvent(InputInfoPtr pInfo, struct input_event *ev) - if (pEvdev->slot_state == SLOTSTATE_EMPTY) - pEvdev->slot_state = SLOTSTATE_UPDATE; - if (ev->code == ABS_MT_TRACKING_ID) { -+ pEvdev->cached_tid[slot_index] = ev->value; - if (ev->value >= 0) { - pEvdev->slot_state = SLOTSTATE_OPEN; - -@@ -1000,7 +1027,7 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, - * Take the synchronization input event and process it accordingly; the motion - * notify events are sent first, then any button/key press/release events. - */ --static void -+static BOOL - EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - { - int i; -@@ -1008,6 +1035,11 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - int v[MAX_VALUATORS] = {}; - EvdevPtr pEvdev = pInfo->private; - -+ if (ev->code == SYN_DROPPED) { -+ xf86IDrvMsg(pInfo, X_INFO, "+++ SYN_DROPPED +++\n"); -+ return TRUE; -+ } -+ - EvdevProcessProximityState(pInfo); - - EvdevProcessValuators(pInfo); -@@ -1035,16 +1067,20 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - pEvdev->abs_queued = 0; - pEvdev->rel_queued = 0; - pEvdev->prox_queued = 0; -- -+ return FALSE; - } - - /** - * Process the events from the device; nothing is actually posted to the server -- * until an EV_SYN event is received. -+ * until an EV_SYN event is received. As the SYN_DROPPED event indicates that the -+ * state of evdev driver will be out of sync with the event queue, additional -+ * handling is required for processing the SYN_DROPPED event. The function returns -+ * TRUE if a SYN_DROPPED event is received, FALSE otherwise. - */ --static void -+static BOOL - EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) - { -+ BOOL syn_dropped = FALSE; - switch (ev->type) { - case EV_REL: - EvdevProcessRelativeMotionEvent(pInfo, ev); -@@ -1056,9 +1092,10 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevProcessKeyEvent(pInfo, ev); - break; - case EV_SYN: -- EvdevProcessSyncEvent(pInfo, ev); -+ syn_dropped = EvdevProcessSyncEvent(pInfo, ev); - break; - } -+ return syn_dropped; - } - - #undef ABS_X_VALUE -@@ -1089,6 +1126,308 @@ EvdevFreeMasks(EvdevPtr pEvdev) - #endif - } - -+static void -+EvdevGetKernelTime(struct timeval *current_time, BOOL use_monotonic) { -+ struct timespec now; -+ clockid_t clockid = (use_monotonic) ? CLOCK_MONOTONIC : CLOCK_REALTIME; -+ -+ clock_gettime(clockid, &now); -+ current_time->tv_sec = now.tv_sec; -+ current_time->tv_usec = now.tv_nsec / 1000; -+} -+ -+static int -+EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, uint16_t code, -+ int32_t value) { -+ EvdevPtr pEvdev = pInfo->private; -+ struct input_event ev; -+ -+ ev.type = type; -+ ev.code = code; -+ ev.value = value; -+ EvdevGetKernelTime(&ev.time, pEvdev->is_monotonic); -+ /* Inject the event by processing it */ -+ EvdevProcessEvent(pInfo, &ev); -+ return 1; -+} -+ -+static int -+EvdevKeyStateSync(InputInfoPtr pInfo) { -+ EvdevPtr pEvdev = pInfo->private; -+ unsigned long key_state_bitmask[NLONGS(KEY_CNT)]; -+ int i, ev_count = 0; -+ int len = sizeof(key_state_bitmask); -+ -+ if (ioctl(pInfo->fd, EVIOCGKEY(len), key_state_bitmask) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, -+ "ioctl EVIOCGKEY failed: %s\n", strerror(errno)); -+ return !Success; -+ } -+ for (i = 0; i < KEY_CNT; i++) { -+ int orig_value, current_value; -+ if (!EvdevBitIsSet(pEvdev->key_bitmask, i)) -+ continue; -+ orig_value = EvdevBitIsSet(pEvdev->key_state_bitmask, i); -+ current_value = EvdevBitIsSet(key_state_bitmask, i); -+ if (current_value == orig_value) -+ continue; -+ ev_count += EvdevInjectEvent(pInfo, EV_KEY, i, current_value); -+ } -+ return ev_count; -+} -+ -+static int -+EvdevAbsAxesSync(InputInfoPtr pInfo) { -+ EvdevPtr device = pInfo->private; -+ struct input_absinfo absinfo; -+ int i, ev_count = 0; -+ -+ /* Sync all ABS_ axes excluding ABS_MT_ axes */ -+ for (i = ABS_X; i < ABS_MAX; i++) { -+ if (i >= ABS_MT_SLOT && i <= _ABS_MT_LAST) -+ continue; -+ if (!EvdevBitIsSet(device->abs_bitmask, i)) -+ continue; -+ if (ioctl(pInfo->fd, EVIOCGABS(i), &absinfo) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(%zu) failed: %s\n", -+ i, strerror(errno)); -+ } else if (absinfo.value != device->absinfo[i].value) { -+ ev_count += EvdevInjectEvent(pInfo, EV_ABS, i, absinfo.value); -+ } -+ } -+ return ev_count; -+} -+ -+static int -+EvdevAbsMtSlotSync(InputInfoPtr pInfo) { -+ EvdevPtr device = pInfo->private; -+ struct input_absinfo absinfo; -+ int ev_count = 0; -+ -+ if (ioctl(pInfo->fd, EVIOCGABS(ABS_MT_SLOT), &absinfo) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(ABS_MT_SLOT) failed: %s\n", -+ strerror(errno)); -+ return 0; -+ } -+ if (device->cur_slot != absinfo.value) -+ ev_count = EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, absinfo.value); -+ return ev_count; -+} -+ -+static int -+EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index, -+ uint16_t code, int32_t value) { -+ EvdevPtr device = pInfo->private; -+ int ev_count = 0; -+ -+ if (device->cur_slot != slot_index) -+ ev_count += EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, slot_index); -+ ev_count += EvdevInjectEvent(pInfo, EV_ABS, code, value); -+ return ev_count; -+} -+ -+static int -+EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots, -+ int *count_after_synreport) -+{ -+ EvdevPtr device = pInfo->private; -+ int i, j, ev_count = 0; -+ int total_ev_count = 0; -+ -+ /* -+ * There will be five conditions of a slot change after SYN_DROPPED: -+ * a. Finger leaving, i.e., tracking id changes from a non-negative -+ * number to -1. -+ * b. Finger arriving, i.e., tracking id changes from -1 to a -+ * non-negative number. -+ * c. Finger changing, i.e., original finger leaving and new finger -+ * arriving, tracking id changes from a non-negative number to -+ * another one. -+ * d. Same finger, but axes change, i.e., no tracking id changes, but some -+ * axes values have changed. -+ * e. Fingers arrive and leave: tracking ID was -1, and is still -1, but -+ * some axes values have changed. -+ * f. nothing changed -+ * -+ * To have X server seamless of SYN_DROPPED event, additional event -+ * injections will be required except for conditions e and f: -+ * -+ * Finger leaving (a): all axes of the slot should be updated first, then -+ * followed with tracking id change (-1). -+ * -+ * Finger arriving (b): new tracking id should be injected first, followed -+ * with all axes updates. -+ * -+ * Finger changing (c): first, inject finger leaving with tracking id -1, -+ * followed with new tracking id event, then update all axes data. -+ * -+ * Same finger, but axes change (d): all axes updates should be injected -+ * -+ */ -+ -+ for (i = 0; i < num_slots(device); i++) { -+ int curr_tid = slots[ABS_MT_TRACKING_ID - _ABS_MT_FIRST].values[i]; -+ int orig_tid = device->cached_tid[i]; -+ -+ /* For conditions b and c, inject the tracking id change events first */ -+ if (orig_tid != curr_tid && curr_tid != -1) { -+ /* For (c), inject the leaving event for original finger */ -+ if (orig_tid != -1) { -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ ABS_MT_TRACKING_ID, -+ -1); -+ ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0); -+ /* Reset the count_after_synreport after SYN_REPORT event */ -+ total_ev_count += ev_count; -+ *count_after_synreport = ev_count = 0; -+ } -+ /* For (b) and (c), set the new tid before updating axes */ -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ ABS_MT_TRACKING_ID, -+ curr_tid); -+ } -+ -+ -+ for (j = _ABS_MT_FIRST; j <= _ABS_MT_LAST; j++) { -+ int axis = j - _ABS_MT_FIRST; -+ int map, orig_value, curr_value; -+ if ((j == ABS_MT_TRACKING_ID) || -+ ((map = device->axis_map[j]) == -1)) -+ continue; -+ if (!EvdevBitIsSet(device->abs_bitmask, j)) -+ continue; -+ -+ orig_value = valuator_mask_get(device->last_mt_vals[i], map); -+ curr_value = slots[axis].values[i]; -+ -+ if (orig_value == curr_value) -+ continue; -+ -+ /* For condition e, internal axes values should be updated */ -+ if (orig_tid == -1 && curr_tid == -1) { -+ valuator_mask_set(device->last_mt_vals[i], map, curr_value); -+ continue; -+ } -+ -+ /* In addition to condition d, all axes updates will be injected */ -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ j, -+ curr_value); -+ } -+ -+ /* For condition a, inject finger leaving event */ -+ if (orig_tid != -1 && curr_tid == -1) { -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ ABS_MT_TRACKING_ID, -+ -1); -+ } -+ } -+ /* Update current slot index if it is different from cur_slot value */ -+ ev_count += EvdevAbsMtSlotSync(pInfo); -+ *count_after_synreport += ev_count; -+ -+ return total_ev_count + ev_count; -+} -+ -+static int -+EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots) -+{ -+ EvdevPtr device = pInfo->private; -+ int i; -+ -+ /* Retrieve current ABS_MT_ axes for all slots */ -+ for (i = _ABS_MT_FIRST; i <= _ABS_MT_LAST; i++) { -+ MTSlotInfoPtr req = &slots[i - _ABS_MT_FIRST]; -+ if (!EvdevBitIsSet(device->abs_bitmask, i)) -+ continue; -+ req->code = i; -+ if (ioctl(pInfo->fd, EVIOCGMTSLOTS((sizeof(*req))), req) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, -+ "ioctl EVIOCGMTSLOTS(req.code=%d) failed: %s\n", -+ req->code, strerror(errno)); -+ return !Success; -+ } -+ } -+ -+ return Success; -+} -+ -+static int -+EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport) { -+ MTSlotInfo slots[_ABS_MT_CNT]; -+ int ev_count = 0; -+ -+ /* Get all current slots axes, then check if there is any update required */ -+ if (EvdevGetAllSlotVals(pInfo, slots) == Success) { -+ ev_count = EvdevCheckAbsMtAxesChange(pInfo, slots, -+ count_after_synreport); -+ } -+ -+ return ev_count; -+} -+ -+static int -+EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport) { -+ EvdevPtr device = pInfo->private; -+ int ev_count; -+ -+ /* Sync all ABS_ axes */ -+ ev_count = EvdevAbsAxesSync(pInfo); -+ *count_after_synreport += ev_count; -+ -+ /* Sync ABS_MT_ axes for all slots if exists */ -+ if (device->num_mt_vals) -+ ev_count += EvdevAbsMtStateSync(pInfo, count_after_synreport); -+ -+ return ev_count; -+} -+ -+/** -+ * Synchronize the current state with kernel evdev driver. -+ */ -+static void -+EvdevSyncState(InputInfoPtr pInfo) -+{ -+ int ev_count = 0; -+ int ev_count_after_synreport = 0; -+ EvdevPtr device = pInfo->private; -+ -+ EvdevGetKernelTime(&device->before_sync_time, device->is_monotonic); -+ -+ ev_count = EvdevKeyStateSync(pInfo); -+ ev_count_after_synreport += ev_count; -+ -+ /* -+ * TODO: sync all led, switch and sound states as well. We probably need -+ * to post events out actively if the new states are different from the -+ * cached ones. -+ */ -+ -+ /* sync abs and abs_mt value/limits */ -+ ev_count += EvdevAbsStateSync(pInfo, &ev_count_after_synreport); -+ -+ /* -+ * Push SYN_REPORT event out if there is any event injected -+ * during the state synchronization. -+ */ -+ if (ev_count_after_synreport) -+ ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0); -+ -+ EvdevGetKernelTime(&device->after_sync_time, device->is_monotonic); -+ -+ xf86IDrvMsg(pInfo, X_INFO, -+ "Sync_State: before %ld.%ld after %ld.%ld injected events=%d\n", -+ device->before_sync_time.tv_sec, -+ device->before_sync_time.tv_usec, -+ device->after_sync_time.tv_sec, -+ device->after_sync_time.tv_usec, -+ ev_count); -+} -+ - /* just a magic number to reduce the number of reads */ - #define NUM_EVENTS 16 - -@@ -1097,6 +1436,7 @@ EvdevReadInput(InputInfoPtr pInfo) - { - struct input_event ev[NUM_EVENTS]; - int i, len = sizeof(ev); -+ BOOL sync_evdev_state = FALSE; - - while (len == sizeof(ev)) - { -@@ -1131,9 +1471,23 @@ EvdevReadInput(InputInfoPtr pInfo) - break; - } - -- for (i = 0; i < len/sizeof(ev[0]); i++) -- EvdevProcessEvent(pInfo, &ev[i]); -+ for (i = 0; i < len/sizeof(ev[0]); i++) { -+ if (sync_evdev_state) -+ break; -+ if (timercmp(&ev[i].time, &pEvdev->before_sync_time, <)) { -+ /* Ignore events before last sync time */ -+ continue; -+ } else if (timercmp(&ev[i].time, &pEvdev->after_sync_time, >)) { -+ /* Event_Process returns TRUE if SYN_DROPPED detected */ -+ sync_evdev_state = EvdevProcessEvent(pInfo, &ev[i]); -+ } else { -+ /* If the event occurred during sync, then sync again */ -+ sync_evdev_state = TRUE; -+ } -+ } - } -+ if (sync_evdev_state) -+ EvdevSyncState(pInfo); - } - - static void -@@ -1325,6 +1679,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - - for (i = 0; i < num_slots(pEvdev); i++) { -+ pEvdev->cached_tid[i] = -1; - pEvdev->last_mt_vals[i] = valuator_mask_new(num_mt_axes_total); - if (!pEvdev->last_mt_vals[i]) { - xf86IDrvMsg(pInfo, X_ERROR, -@@ -1850,6 +2205,8 @@ EvdevOn(DeviceIntPtr device) - Evdev3BEmuOn(pInfo); - pEvdev->flags |= EVDEV_INITIALIZED; - device->public.on = TRUE; -+ pEvdev->slot_state = SLOTSTATE_EMPTY; -+ EvdevSyncState(pInfo); - - return Success; - } -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -97,6 +97,12 @@ - /* Number of longs needed to hold the given number of bits */ - #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) - -+#define _ABS_MT_FIRST ABS_MT_TOUCH_MAJOR -+#define _ABS_MT_LAST ABS_MT_DISTANCE -+#define _ABS_MT_CNT (_ABS_MT_LAST - _ABS_MT_FIRST + 1) -+ -+#define MAX_SLOT_COUNT 64 -+ - /* Function key mode */ - enum fkeymode { - FKEYMODE_UNKNOWN = 0, -@@ -250,8 +256,19 @@ typedef struct { - EventQueueRec queue[EVDEV_MAXQUEUE]; - - enum fkeymode fkeymode; -+ -+ /* Sync timestamps */ -+ unsigned long key_state_bitmask[NLONGS(KEY_CNT)]; -+ struct timeval before_sync_time; -+ struct timeval after_sync_time; -+ int32_t cached_tid[MAX_SLOT_COUNT]; - } EvdevRec, *EvdevPtr; - -+typedef struct { -+ uint32_t code; -+ int32_t values[MAX_SLOT_COUNT]; -+} MTSlotInfo, *MTSlotInfoPtr; -+ - /* Event posting functions */ - void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value); - void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch deleted file mode 100644 index e3bd81f601..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Daniel Erat -Date: Wed, 21 Mar 2012 10:44:51 -0700 -Subject: [PATCH] Disable smooth scrolling in xf86-input-evdev. - -This caused additional valuator-containing motion events to -be sent on behalf of the scrollwheel, which Chrome treated -identically to touchpad scroll events, resulting in the -scrollwheel being unusable. - -BUG=chromium:118608 -TEST=manual: we scroll 106 pixels for each scrollwheel click on stumpy ---- - src/evdev.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -67,6 +67,10 @@ - #define HAVE_SMOOTH_SCROLLING 1 - #endif - -+/* Smooth scrolling results in the mousewheel generating motion events with -+ * valuators that confuse Chrome: http://crosbug.com/118608 */ -+#undef HAVE_SMOOTH_SCROLLING -+ - #define EVDEV_MAXBUTTONS 32 - #define EVDEV_MAXQUEUE 32 - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild deleted file mode 120000 index cfca3b06c2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild +++ /dev/null @@ -1 +0,0 @@ -xf86-input-evdev-2.7.3.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild deleted file mode 100644 index 6a67e767e0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild,v 1.1 2012/08/14 01:24:15 chithanh Exp $ - -EAPI=4 -XORG_EAUTORECONF=yes - -inherit xorg-2 - -DESCRIPTION="Generic Linux input driver" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86" -IUSE="" -RDEPEND=">=x11-base/xorg-server-1.10[udev] - sys-libs/mtdev" -DEPEND="${RDEPEND} - >=x11-proto/inputproto-2.1.99.3 - >=sys-kernel/linux-headers-2.6" - -PATCHES=( - "${FILESDIR}"/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch - # crosbug.com/35291 - "${FILESDIR}"/evdev-2.7.3-Add-SYN_DROPPED-handling.patch - "${FILESDIR}/evdev-disable-smooth-scrolling.patch" - "${FILESDIR}/evdev-2.6.99-wheel-accel.patch" - "${FILESDIR}"/evdev-2.7.0-feedback-log.patch - "${FILESDIR}"/evdev-2.7.0-add-touch-event-timestamp.patch - # crosbug.com/p/13787 - "${FILESDIR}"/evdev-2.7.0-fix-emulated-wheel.patch - "${FILESDIR}"/evdev-2.7.0-add-block-reading-support.patch -) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest deleted file mode 100644 index 405cf002af..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-video-armsoc-0.0.1.tar.bz2 194556 SHA256 51dd0b7dae6a216cb3b197436e4c1d0c7dcf15049e947543d45942fbd000b314 SHA512 cf6ca259059f9f1364ce936de4ee21ecbcb3b0a839622f83a6e62abadc1176be9d0dad83c86fe3aa25ad3c2297f0e6f55d4f33f10f91eaff7897a2cfe43bb39e WHIRLPOOL 4f77e7f2c0f89f09853e5d25e376494c813a7ee4a50b5cdefc20df1c5f5b99d2202c7580fa4dd9f221a152321d7656986729aa8383390cc1354d5abd8eb6eda1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild deleted file mode 100644 index 1fab3d2371..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="9eb527e3cf926175eda9063fa0ef65504c816364" -CROS_WORKON_TREE="0d2d6cd5e23e84585ebe72df251360086c8408bf" -CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc" -CROS_WORKON_LOCALNAME="xf86-video-armsoc" - -XORG_DRI="always" -XORG_EAUTORECONF="yes" - -inherit xorg-2 cros-workon - -DESCRIPTION="X.Org driver for ARM devices" - -KEYWORDS="-* arm" - -RDEPEND=">=x11-base/xorg-server-1.9" -DEPEND="${RDEPEND}" - -src_unpack() { - cros-workon_src_unpack - mkdir -p "${S}"/m4 -} - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild deleted file mode 100644 index 894d9824f7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU Public License v2 - -EAPI="4" -CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc" -CROS_WORKON_LOCALNAME="xf86-video-armsoc" - -XORG_DRI="always" -XORG_EAUTORECONF="yes" - -inherit xorg-2 cros-workon - -DESCRIPTION="X.Org driver for ARM devices" - -KEYWORDS="-* ~arm" - -RDEPEND=">=x11-base/xorg-server-1.9" -DEPEND="${RDEPEND}" - -src_unpack() { - cros-workon_src_unpack - mkdir -p "${S}"/m4 -} - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest deleted file mode 100644 index 0d8026d6c1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-video-intel-2.16.0.tar.bz2 1249069 RMD160 9eb9aeabecfbe9f6dde6c81a59c07d9d90f2dc69 SHA1 53441ea4d4335b501d32809b6b92593cbb1f79cf SHA256 77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch deleted file mode 100644 index 60e474aacd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch +++ /dev/null @@ -1,12 +0,0 @@ -Disable gamma setting. We set this early at boot and we don't want X to mess with our settings. -diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c ---- xf86-video-intel-2.14.0.orig/src/intel_display.c 2011-01-10 15:02:16.534513000 -0800 -+++ xf86-video-intel-2.14.0.work/src/intel_display.c 2011-04-18 13:40:46.586165000 -0700 -@@ -617,6 +617,7 @@ static void - intel_crtc_gamma_set(xf86CrtcPtr crtc, - CARD16 *red, CARD16 *green, CARD16 *blue, int size) - { -+ return; - struct intel_crtc *intel_crtc = crtc->driver_private; - struct intel_mode *mode = intel_crtc->mode; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch deleted file mode 100644 index 3a703258f3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c ---- xf86-video-intel-2.14.0.orig/src/intel_display.c 2011-01-10 15:02:16.534513000 -0800 -+++ xf86-video-intel-2.14.0.work/src/intel_display.c 2011-05-19 15:06:39.732535000 -0700 -@@ -57,6 +57,8 @@ struct intel_mode { - unsigned int fe_tv_sec; - unsigned int fe_tv_usec; - -+ unsigned int last_queued_frame; -+ - struct list outputs; - struct list crtcs; - }; -@@ -1435,6 +1437,12 @@ intel_do_pageflip(intel_screen_private * - int i, old_fb_id; - - /* -+ * Discard this flip since we already have one pending for this frame. -+ */ -+ if ( flip_info->frame <= mode->last_queued_frame ) -+ return FALSE; -+ -+ /* - * Create a new handle for the back buffer - */ - old_fb_id = mode->fb_id; -@@ -1490,11 +1498,15 @@ intel_do_pageflip(intel_screen_private * - } - - mode->old_fb_id = old_fb_id; -+ mode->last_queued_frame = flip_info->frame; - return TRUE; - - error_undo: - drmModeRmFB(mode->fd, mode->fb_id); - mode->fb_id = old_fb_id; -+ for (i = 0; i < config->num_crtc; i++) -+ if (config->crtc[i]->enabled) -+ mode->flip_count--; - - error_out: - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n", diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch deleted file mode 100644 index 99c9cb9b5e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 46f97127c22ea42bc8fdae59d2a133e4b8b6c997 -Author: Chris Wilson -Date: Sun Oct 16 21:40:15 2011 +0100 - - snb,ivb: Workaround unknown blitter death - - The first workaround was a performance killing MI_FLUSH_DW after every - op. This workaround appears to be a stable compromise instead, only - requiring a redundant command after every BLT command with little - impact on throughput. - - Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=27892 - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39524 - Tested-by: Daniel Vetter - Signed-off-by: Chris Wilson - -diff --git a/src/intel_uxa.c b/src/intel_uxa.c -index 30717d0..9e58c69 100644 ---- a/src/intel_uxa.c -+++ b/src/intel_uxa.c -@@ -340,13 +340,6 @@ static void intel_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2) - } - } - --static void intel_uxa_done_solid(PixmapPtr pixmap) --{ -- ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -- -- intel_debug_flush(scrn); --} -- - /** - * TODO: - * - support planemask using FULL_BLT_CMD? -@@ -501,9 +494,19 @@ intel_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1, - } - } - --static void intel_uxa_done_copy(PixmapPtr dest) -+static void intel_uxa_done(PixmapPtr pixmap) - { -- ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum]; -+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ -+ if (IS_GEN6(intel) || IS_GEN7(intel)) { -+ /* workaround a random BLT hang */ -+ BEGIN_BATCH_BLT(3); -+ OUT_BATCH(XY_SETUP_CLIP_BLT_CMD); -+ OUT_BATCH(0); -+ OUT_BATCH(0); -+ ADVANCE_BATCH(); -+ } - - intel_debug_flush(scrn); - } -@@ -1225,13 +1228,13 @@ Bool intel_uxa_init(ScreenPtr screen) - intel->uxa_driver->check_solid = intel_uxa_check_solid; - intel->uxa_driver->prepare_solid = intel_uxa_prepare_solid; - intel->uxa_driver->solid = intel_uxa_solid; -- intel->uxa_driver->done_solid = intel_uxa_done_solid; -+ intel->uxa_driver->done_solid = intel_uxa_done; - - /* Copy */ - intel->uxa_driver->check_copy = intel_uxa_check_copy; - intel->uxa_driver->prepare_copy = intel_uxa_prepare_copy; - intel->uxa_driver->copy = intel_uxa_copy; -- intel->uxa_driver->done_copy = intel_uxa_done_copy; -+ intel->uxa_driver->done_copy = intel_uxa_done; - - /* Composite */ - if (IS_GEN2(intel)) { diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch deleted file mode 100644 index 4bebd60ab5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/src/intel.h b/src/intel.h -index 42afaf4..22527df 100644 ---- a/src/intel.h -+++ b/src/intel.h -@@ -465,6 +465,7 @@ extern void intel_mode_fini(intel_screen_private *intel); - extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); - extern int intel_crtc_id(xf86CrtcPtr crtc); - extern int intel_output_dpms_status(xf86OutputPtr output); -+extern void intel_copy_fb(ScrnInfoPtr pScrn); - - enum DRI2FrameEventType { - DRI2_SWAP, -diff --git a/src/intel_display.c b/src/intel_display.c -index 84c7c08..e52ca67 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -30,6 +30,7 @@ - #endif - - #include -+#include - #include - #include - #include -@@ -1435,6 +1436,109 @@ fail: - return FALSE; - } - -+static PixmapPtr -+intel_create_pixmap_for_fbcon(ScrnInfoPtr pScrn) -+{ -+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); -+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ drmModeFBPtr fbcon = NULL; -+ PixmapPtr pixmap = NULL; -+ struct drm_gem_flink flink; -+ drm_intel_bo *bo; -+ -+ struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private; -+ struct intel_mode *intel_mode = intel_crtc->mode; -+ intel_screen_private *intel = intel_get_screen_private(pScrn); -+ int i; -+ -+ for (i = 0; i < intel_mode->mode_res->count_crtcs; i++) { -+ intel_crtc = xf86_config->crtc[i]->driver_private; -+ -+ fbcon = drmModeGetFB(intel_mode->fd, intel_crtc->mode_crtc->buffer_id); -+ if (fbcon != NULL) break; -+ } -+ if (fbcon == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't find an fbcon\n."); -+ return NULL; -+ } -+ flink.handle = fbcon->handle; -+ if (ioctl(intel_mode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't flink fbcon handle\n"); -+ return NULL; -+ } -+ bo = drm_intel_bo_gem_create_from_name(intel->bufmgr, -+ "fbcon", flink.name); -+ -+ if (bo == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't allocate bo for fbcon handle\n"); -+ return NULL; -+ } -+ -+ pixmap = GetScratchPixmapHeader(pScreen, -+ fbcon->width, fbcon->height, -+ fbcon->depth, fbcon->bpp, -+ fbcon->pitch, NULL); -+ if (pixmap == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't allocate pixmap fbcon contents\n"); -+ return NULL; -+ } -+ -+ intel_set_pixmap_bo(pixmap, bo); -+ drm_intel_bo_unreference(bo); -+ drmModeFreeFB(fbcon); -+ -+ return pixmap; -+} -+ -+void intel_copy_fb(ScrnInfoPtr pScrn) -+{ -+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ intel_screen_private *intel = intel_get_screen_private(pScrn); -+ PixmapPtr src, dst; -+ unsigned int pitch = pScrn->displayWidth * intel->cpp; -+ int savePMSize; -+ int pixmap_size; -+ -+ /* Ugly: this runs before CreateScratchPixmap() which normally calculates -+ this number :( -+ */ -+ pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP); -+ savePMSize = pScreen->totalPixmapSize; -+ pScreen->totalPixmapSize = BitmapBytePad(pixmap_size * 8); -+ -+ src = intel_create_pixmap_for_fbcon(pScrn); -+ if (src == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't create pixmap for fbcon\n"); -+ pScreen->totalPixmapSize = savePMSize; -+ return; -+ } -+ -+ /* We dont have a screen Pixmap yet */ -+ dst = GetScratchPixmapHeader(pScreen, -+ pScrn->virtualX, pScrn->virtualY, -+ pScrn->depth, pScrn->bitsPerPixel, -+ pitch, -+ NULL); -+ pScreen->totalPixmapSize = savePMSize; -+ intel_set_pixmap_bo(dst,intel->front_buffer); -+ intel->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES); -+ -+ intel->uxa_driver->copy(dst, 0, 0, 0, 0, -+ pScrn->virtualX, pScrn->virtualY); -+ intel->uxa_driver->done_copy(dst); -+ -+ intel_batch_submit(pScrn); -+ -+ (*pScreen->DestroyPixmap)(src); -+ (*pScreen->DestroyPixmap)(dst); -+ -+} -+ - Bool - intel_do_pageflip(intel_screen_private *intel, - dri_bo *new_front, -@@ -1584,6 +1688,8 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp) - unsigned int i; - int has_flipping; - -+ scrn->canDoBGNoneRoot = TRUE; -+ - mode = calloc(1, sizeof *mode); - if (!mode) - return FALSE; -diff --git a/src/intel_driver.c b/src/intel_driver.c -index 7fc1c1a..40ff396 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -1154,6 +1154,8 @@ static Bool I830EnterVT(int scrnIndex, int flags) - - intel_set_gem_max_sizes(scrn); - -+ intel_copy_fb(scrn); -+ - if (!xf86SetDesiredModes(scrn)) - return FALSE; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch deleted file mode 100644 index 8f2a407372..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e1f718b600029d43bb2e2e4a6b50e5a990c6d08d Mon Sep 17 00:00:00 2001 -From: Chris Wolfe -Date: Mon, 5 Nov 2012 11:10:24 -0500 -Subject: [PATCH] xf86-video-intel: Avoid display corruption when unable to - flip. - -This replaces the previous patch to xorg-server for crosbug/33775. -That change avoids calling ScheduleSwap when a flip would not be -classically possible, so interferes with the upcoming per-crtc -flip feature. - -BUG=chromium-os:35796 -TEST=Rapidly minimize/restore/tile window so that the animation spans - monitors, observe that none of the preview shadow is left behind. ---- - src/intel_dri.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/intel_dri.c b/src/intel_dri.c -index 1227dbb..938a022 100644 ---- a/src/intel_dri.c -+++ b/src/intel_dri.c -@@ -1151,10 +1151,16 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - - /* Flips need to be submitted one frame before */ - if (can_exchange(draw, front, back)) { -- swap_type = DRI2_FLIP; -- flip = 1; -+ swap_type = DRI2_FLIP; -+ flip = 1; -+ } else { -+ /* Using the DRI2_SWAP path defers the back-to-front blit until -+ * the frame event handler. If another swap comes in before that -+ * event executes, our two-frame damage tracking will copy from -+ * the unfinished frame and cause corruption. To avoid this -+ * problem we force an immediate blit here. */ -+ goto blit_fallback; - } -- - swap_info->type = swap_type; - - /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP. --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch deleted file mode 100644 index 29cb999694..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/intel_display.c b/src/intel_display.c -index 84c7c08..a9dee28 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -400,7 +400,6 @@ intel_crtc_apply(xf86CrtcPtr crtc) - continue; - - intel_output = output->driver_private; -- intel_output_dpms_backlight(output, intel_output->dpms_mode, DPMSModeOn); - intel_output->dpms_mode = DPMSModeOn; - } - } -@@ -950,9 +949,6 @@ intel_output_dpms(xf86OutputPtr output, int dpms) - intel_output->output_id, - props->prop_id, - dpms); -- intel_output_dpms_backlight(output, -- intel_output->dpms_mode, -- dpms); - intel_output->dpms_mode = dpms; - drmModeFreeProperty(props); - return; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch deleted file mode 100644 index 3dd4a57e0e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/intel_driver.c b/src/intel_driver.c -index 9d1c4e8..3e4f664 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -677,6 +677,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - xf86ReturnOptValBool(intel->Options, - OPTION_TRIPLE_BUFFER, - TRUE); -+ intel->use_triple_buffer = FALSE; - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n", - intel->use_triple_buffer ? "enabled" : "disabled"); - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch deleted file mode 100644 index 5a38919e4e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch +++ /dev/null @@ -1,1490 +0,0 @@ -From 715ca0c0ccd94650948efd36a9e7b4592c306906 Mon Sep 17 00:00:00 2001 -From: Chris Wolfe -Date: Thu, 20 Dec 2012 15:27:59 -0500 -Subject: [PATCH] xf86-video-intel: Split framebuffer and flip crtcs. - -Try to allocate a separate framebuffer for each CRTC and flip those -directly with the back-buffer of updated drawables. This avoids -blitting content when the drawable size matches the crtc size. - -When CopyRegion is used top copy content into or out of the screen -buffer, it may be redirected to exactly one scanout buffer. This is -enough to support our one-drawable-per-crtc case, but not sufficient -in general. - -This change also moves page flip state that was previously centralized -in the intel_mode structure into the intel_crtc structure associated -with the reference crtc for a flip. This allows flips to pending on -multiple pipes simultaneously. - -Tested with the WebGL aquarium and space rocks demos, a Youtube -video and WebKit poster circle demo. Added and removed displays while -active and while suspended. ---- - src/intel.h | 55 ++++- - src/intel_display.c | 685 ++++++++++++++++++++++++++++++++++++++++++--------- - src/intel_dri.c | 180 ++++++++++++-- - src/intel_driver.c | 10 + - src/intel_uxa.c | 48 ++++ - src/intel_video.c | 11 +- - 6 files changed, 851 insertions(+), 138 deletions(-) - -diff --git a/src/intel.h b/src/intel.h -index 22527df..99b2cfe 100644 ---- a/src/intel.h -+++ b/src/intel.h -@@ -185,6 +185,8 @@ struct intel_pixmap { - int8_t batch_write :1; - int8_t offscreen :1; - int8_t pinned :1; -+ -+ uint32_t fb; - }; - - #if HAS_DEVPRIVATEKEYREC -@@ -429,6 +431,7 @@ typedef struct intel_screen_private { - Bool has_kernel_flush; - Bool needs_flush; - Bool use_shadow; -+ Bool use_split_framebuffer; - - struct _DRI2FrameEvent *pending_flip[2]; - -@@ -462,15 +465,43 @@ extern void intel_mode_init(struct intel_screen_private *intel); - extern void intel_mode_remove_fb(intel_screen_private *intel); - extern void intel_mode_fini(intel_screen_private *intel); - -+extern void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap); -+ - extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); - extern int intel_crtc_id(xf86CrtcPtr crtc); - extern int intel_output_dpms_status(xf86OutputPtr output); - extern void intel_copy_fb(ScrnInfoPtr pScrn); - -+struct intel_scanout { -+ PixmapPtr pixmap; -+ BoxRec area; /* area of the virtual screen provided by this scanout */ -+}; -+ -+/* Splits the screen buffer into one scanout per distinct crtc region. */ -+extern Bool intel_split_fb(intel_screen_private *intel); -+ -+/* Merges any scanouts into the screen buffer. */ -+extern void intel_merge_fb(intel_screen_private *intel); -+ -+/* Finds a scanout that exactly matches the area, and stores it in |out_scanout|. -+ * Will return FALSE if any scanout partially intersects the area. If no scanout -+ * includes the area, will return TRUE with |out_scanout| set to NULL. -+ */ -+extern Bool intel_find_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout); -+ -+/* Finds a scanout that contains the area, and stores it in |out_scanout|. -+ * Will return FALSE if any scanout partially intersects the area. If no scanout -+ * includes the area, will return TRUE with |out_scanout| set to NULL. -+ */ -+extern Bool intel_covering_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout); -+ - enum DRI2FrameEventType { - DRI2_SWAP, - DRI2_SWAP_CHAIN, -- DRI2_FLIP, -+ DRI2_FLIP_FRONT, -+ DRI2_FLIP_SPLIT, - DRI2_WAITMSC, - }; - -@@ -495,13 +526,14 @@ typedef struct _DRI2FrameEvent { - void *event_data; - DRI2BufferPtr front; - DRI2BufferPtr back; -+ BoxRec area; /* screen rectangle being flipped */ - - struct _DRI2FrameEvent *chain; - } DRI2FrameEventRec, *DRI2FrameEventPtr; - - extern Bool intel_do_pageflip(intel_screen_private *intel, -- dri_bo *new_front, -- DRI2FrameEventPtr flip_info, int ref_crtc_hw_id); -+ PixmapPtr new_front, -+ DRI2FrameEventPtr flip_info); - - static inline intel_screen_private * - intel_get_screen_private(ScrnInfoPtr scrn) -@@ -529,6 +561,11 @@ extern void I915EmitInvarientState(ScrnInfoPtr scrn); - extern void I830EmitFlush(ScrnInfoPtr scrn); - - extern void I830InitVideo(ScreenPtr pScreen); -+ -+extern void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b); -+extern void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box); -+extern void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box); -+ - extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box, - xf86CrtcPtr desired, BoxPtr crtc_box_ret); - -@@ -734,6 +771,18 @@ void intel_uxa_block_handler(intel_screen_private *intel); - Bool intel_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table, - int num_bos); - -+/* Copies a box between pixmaps using intel->uxa_driver. */ -+extern Bool intel_uxa_driver_copy_pixmap(intel_screen_private *intel, -+ PixmapPtr src, PixmapPtr dst, -+ int src_x, int src_y, -+ int dst_x, int dst_y, -+ int w, int h); -+ -+/* Fills a box of a pixmap using intel->uxa_driver. */ -+extern Bool intel_uxa_driver_fill_pixmap(intel_screen_private *intel, -+ uint32_t src, PixmapPtr dst, -+ int x, int y, int w, int h); -+ - /* intel_shadow.c */ - void intel_shadow_blt(intel_screen_private *intel); - void intel_shadow_create(struct intel_screen_private *intel); -diff --git a/src/intel_display.c b/src/intel_display.c -index bac3f8f..8908386 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -44,27 +44,33 @@ - #include "xf86drmMode.h" - #include "X11/Xatom.h" - -+#define MAX_SCANOUTS (4) -+ -+enum intel_scanout_state { -+ INTEL_SCANOUT_INVALID = 0, -+ INTEL_SCANOUT_FRONT, -+ INTEL_SCANOUT_SPLIT, -+}; -+ - struct intel_mode { - int fd; -- uint32_t fb_id; - drmModeResPtr mode_res; - int cpp; - - drmEventContext event_context; -- DRI2FrameEventPtr flip_info; -- int old_fb_id; -- int flip_count; -- unsigned int fe_frame; -- unsigned int fe_tv_sec; -- unsigned int fe_tv_usec; -+ -+ uint32_t front_fb_id; -+ -+ int scanout_state; -+ struct intel_scanout scanouts[MAX_SCANOUTS]; - - struct list outputs; - struct list crtcs; - }; - - struct intel_pageflip { -- struct intel_mode *mode; -- Bool dispatch_me; -+ struct intel_crtc *reference_crtc; -+ struct intel_crtc *flipped_crtc; - }; - - struct intel_crtc { -@@ -72,10 +78,20 @@ struct intel_crtc { - drmModeModeInfo kmode; - drmModeCrtcPtr mode_crtc; - int pipe; -+ -+ struct { -+ int pending; /* number of outstanding flip requests */ -+ unsigned int frame; -+ unsigned int tv_sec; -+ unsigned int tv_usec; -+ DRI2FrameEventPtr info; -+ } flip; -+ - dri_bo *cursor; - dri_bo *rotate_bo; - uint32_t rotate_pitch; - uint32_t rotate_fb_id; -+ - xf86CrtcPtr crtc; - struct list link; - }; -@@ -109,6 +125,9 @@ struct intel_output { - }; - - static void -+intel_crtc_merge_scanouts(intel_screen_private *intel); -+ -+static void - intel_output_dpms(xf86OutputPtr output, int mode); - - static void -@@ -330,16 +349,97 @@ intel_crtc_dpms(xf86CrtcPtr intel_crtc, int mode) - - } - -+/* Get a scratch pixmap attached to the current front buffer. This needs to be -+ * used rather than GetScreenPixmap before the screen is fully initialized, -+ * and during intel_xf86crtc_resize when the state is inconsistent. -+ */ -+static PixmapPtr intel_get_scratch_front_pixmap(intel_screen_private *intel) -+{ -+ ScrnInfoPtr scrn = intel->scrn; -+ PixmapPtr pixmap; -+ -+ pixmap = GetScratchPixmapHeader( -+ scrn->pScreen, -+ scrn->virtualX, -+ scrn->virtualY, -+ scrn->depth, -+ scrn->bitsPerPixel, -+ intel->front_pitch, -+ NULL); -+ -+ intel_set_pixmap_bo(pixmap, intel->front_buffer); -+ return pixmap; -+} -+ -+static void intel_free_scratch_front_pixmap(PixmapPtr pixmap) -+{ -+ if (pixmap == NULL) -+ return; -+ intel_set_pixmap_bo(pixmap, NULL); -+ FreeScratchPixmapHeader(pixmap); -+} -+ -+static uint32_t -+intel_pixmap_ensure_fb(intel_screen_private *intel, PixmapPtr pixmap) -+{ -+ struct intel_mode *mode = intel->modes; -+ struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap); -+ int ret; -+ -+ if (intel_pixmap->fb != 0) -+ return intel_pixmap->fb; -+ -+ ret = drmModeAddFB(mode->fd, -+ pixmap->drawable.width, -+ pixmap->drawable.height, -+ intel->scrn->depth, -+ intel->scrn->bitsPerPixel, -+ intel_pixmap_pitch(pixmap), -+ intel_get_pixmap_bo(pixmap)->handle, -+ &intel_pixmap->fb); -+ if (ret < 0) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR, -+ "failed to add fb for pixmap: %s\n", -+ strerror(-ret)); -+ return FALSE; -+ } -+ -+ return intel_pixmap->fb; -+} -+ -+void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap) -+{ -+ struct intel_mode *mode = intel->modes; -+ struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap); -+ int ret; -+ -+ if (intel_pixmap->fb == 0) -+ return; -+ -+ ret = drmModeRmFB(mode->fd, intel_pixmap->fb); -+ if (ret < 0) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR, -+ "failed to remove fb for pixmap: %s\n", -+ strerror(-ret)); -+ } -+ -+ intel_pixmap->fb = 0; -+} -+ - static Bool - intel_crtc_apply(xf86CrtcPtr crtc) - { - ScrnInfoPtr scrn = crtc->scrn; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ struct intel_mode *mode = intel->modes; - struct intel_crtc *intel_crtc = crtc->driver_private; -- struct intel_mode *mode = intel_crtc->mode; -+ BoxRec crtc_box; -+ struct intel_scanout *scanout; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); - uint32_t *output_ids; - int output_count = 0; -- int fb_id, x, y; -+ uint32_t fb_id; -+ int x, y; - int i, ret = FALSE; - - output_ids = calloc(sizeof(uint32_t), xf86_config->num_output); -@@ -372,9 +472,20 @@ intel_crtc_apply(xf86CrtcPtr crtc) - crtc->gamma_blue, crtc->gamma_size); - #endif - -+ fb_id = mode->front_fb_id; - x = crtc->x; - y = crtc->y; -- fb_id = mode->fb_id; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ if (!intel_find_scanout(intel, &crtc_box, &scanout)) { -+ /* partially intersects a scanout; merge everything */ -+ intel_crtc_merge_scanouts(intel); -+ } -+ if (scanout != NULL) { -+ fb_id = intel_pixmap_ensure_fb(intel, scanout->pixmap); -+ x -= scanout->area.x1; -+ y -= scanout->area.y1; -+ } - if (intel_crtc->rotate_fb_id) { - fb_id = intel_crtc->rotate_fb_id; - x = 0; -@@ -396,7 +507,6 @@ intel_crtc_apply(xf86CrtcPtr crtc) - for (i = 0; i < xf86_config->num_output; i++) { - xf86OutputPtr output = xf86_config->output[i]; - struct intel_output *intel_output; -- - if (output->crtc != crtc) - continue; - -@@ -421,20 +531,20 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - { - ScrnInfoPtr scrn = crtc->scrn; - intel_screen_private *intel = intel_get_screen_private(scrn); -+ struct intel_mode *intel_mode = intel->modes; - struct intel_crtc *intel_crtc = crtc->driver_private; -- struct intel_mode *intel_mode = intel_crtc->mode; - int saved_x, saved_y; - Rotation saved_rotation; - DisplayModeRec saved_mode; -- int ret = TRUE; -- unsigned int pitch = scrn->displayWidth * intel->cpp; -+ int ret; - -- if (intel_mode->fb_id == 0) { -+ if (intel_mode->front_fb_id == 0) { - ret = drmModeAddFB(intel_mode->fd, - scrn->virtualX, scrn->virtualY, - scrn->depth, scrn->bitsPerPixel, -- pitch, intel->front_buffer->handle, -- &intel_mode->fb_id); -+ scrn->displayWidth * intel->cpp, -+ intel->front_buffer->handle, -+ &intel_mode->front_fb_id); - if (ret < 0) { - ErrorF("failed to add fb\n"); - return FALSE; -@@ -454,14 +564,17 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - intel_batch_submit(crtc->scrn); - - mode_to_kmode(crtc->scrn, &intel_crtc->kmode, mode); -- ret = intel_crtc_apply(crtc); -- if (!ret) { -- crtc->x = saved_x; -- crtc->y = saved_y; -- crtc->rotation = saved_rotation; -- crtc->mode = saved_mode; -- } -- return ret; -+ if (!intel_crtc_apply(crtc)) -+ goto error_undo; -+ -+ return TRUE; -+ -+error_undo: -+ crtc->x = saved_x; -+ crtc->y = saved_y; -+ crtc->rotation = saved_rotation; -+ crtc->mode = saved_mode; -+ return FALSE; - } - - static void -@@ -1349,31 +1462,51 @@ intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num) - list_add(&intel_output->link, &mode->outputs); - } - -+static void -+intel_destroy_scanout(struct intel_scanout *scanout) -+{ -+ if (!scanout) -+ return; -+ -+ if (scanout->pixmap) { -+ intel_set_pixmap_bo(scanout->pixmap, NULL); -+ FreeScratchPixmapHeader(scanout->pixmap); -+ } -+ memset(scanout, 0, sizeof(*scanout)); -+} -+ - static Bool - intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) - { - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); -- struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private; -- struct intel_mode *mode = intel_crtc->mode; - intel_screen_private *intel = intel_get_screen_private(scrn); -+ struct intel_mode *mode = intel->modes; - drm_intel_bo *old_front = NULL; -- Bool ret; -+ int ret; - uint32_t old_fb_id; - int i, old_width, old_height, old_pitch; - unsigned long pitch; - uint32_t tiling; - -+ intel_batch_submit(scrn); -+ - if (scrn->virtualX == width && scrn->virtualY == height) - return TRUE; - -- intel_batch_submit(scrn); -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ intel_destroy_scanout(&mode->scanouts[i]); -+ } -+ mode->scanout_state = INTEL_SCANOUT_INVALID; - - old_width = scrn->virtualX; - old_height = scrn->virtualY; - old_pitch = scrn->displayWidth; -- old_fb_id = mode->fb_id; -+ old_fb_id = mode->front_fb_id; - old_front = intel->front_buffer; - -+ intel->front_buffer = NULL; -+ mode->front_fb_id = 0; -+ - if (intel->back_buffer) { - drm_intel_bo_unreference(intel->back_buffer); - intel->back_buffer = NULL; -@@ -1390,7 +1523,7 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) - ret = drmModeAddFB(mode->fd, width, height, scrn->depth, - scrn->bitsPerPixel, pitch, - intel->front_buffer->handle, -- &mode->fb_id); -+ &mode->front_fb_id); - if (ret) - goto fail; - -@@ -1426,9 +1559,9 @@ fail: - scrn->virtualX = old_width; - scrn->virtualY = old_height; - scrn->displayWidth = old_pitch; -- if (old_fb_id != mode->fb_id) -- drmModeRmFB(mode->fd, mode->fb_id); -- mode->fb_id = old_fb_id; -+ if (old_fb_id != mode->front_fb_id) -+ drmModeRmFB(mode->fd, mode->front_fb_id); -+ mode->front_fb_id = old_fb_id; - - return FALSE; - } -@@ -1536,86 +1669,408 @@ void intel_copy_fb(ScrnInfoPtr pScrn) - - } - -+static PixmapPtr intel_create_split_fb(intel_screen_private *intel, int width, int height) -+{ -+ ScrnInfoPtr scrn = intel->scrn; -+ drm_intel_bo *pixmap_bo = NULL; -+ PixmapPtr pixmap = NULL; -+ unsigned long pitch; -+ uint32_t tiling; -+ -+ pixmap_bo = intel_allocate_framebuffer(scrn, width, height, intel->cpp, -+ &pitch, &tiling); -+ if (!pixmap_bo) -+ goto fail; -+ -+ pixmap = GetScratchPixmapHeader(scrn->pScreen, -+ width, height, -+ scrn->depth, -+ scrn->bitsPerPixel, -+ pitch, -+ NULL); -+ if (!pixmap) -+ goto fail; -+ -+ intel_set_pixmap_bo(pixmap, pixmap_bo); -+ drm_intel_bo_unreference(pixmap_bo); -+ pixmap_bo = NULL; -+ -+ return pixmap; -+fail: -+ drm_intel_bo_unreference(pixmap_bo); -+ return NULL; -+} -+ - Bool --intel_do_pageflip(intel_screen_private *intel, -- dri_bo *new_front, -- DRI2FrameEventPtr flip_info, int ref_crtc_hw_id) -+intel_split_fb(intel_screen_private *intel) - { - ScrnInfoPtr scrn = intel->scrn; -+ struct intel_mode *mode = intel->modes; - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); -- struct intel_crtc *crtc = config->crtc[0]->driver_private; -- struct intel_mode *mode = crtc->mode; -- unsigned int pitch = scrn->displayWidth * intel->cpp; -- struct intel_pageflip *flip; -- int i, old_fb_id; -+ struct intel_scanout *scanout; -+ PixmapPtr screen_pixmap; -+ BoxRec crtc_box; -+ int i, j, old_state; - -- /* -- * Create a new handle for the back buffer -- */ -- old_fb_id = mode->fb_id; -- if (drmModeAddFB(mode->fd, scrn->virtualX, scrn->virtualY, -- scrn->depth, scrn->bitsPerPixel, pitch, -- new_front->handle, &mode->fb_id)) -- goto error_out; -+ if (mode->scanout_state == INTEL_SCANOUT_SPLIT) -+ return TRUE; /* nothing to do */ -+ -+ old_state = mode->scanout_state; -+ mode->scanout_state = INTEL_SCANOUT_SPLIT; -+ -+ screen_pixmap = intel_get_scratch_front_pixmap(intel); -+ -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) -+ continue; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ -+ for (j = 0; j < MAX_SCANOUTS; j++) { -+ scanout = &mode->scanouts[j]; -+ if (scanout->pixmap == NULL) -+ break; /* beyond the last valid entry */ -+ -+ if (crtc_box.x1 == scanout->area.x1 && -+ crtc_box.y1 == scanout->area.y1 && -+ crtc_box.x2 == scanout->area.x2 && -+ crtc_box.y2 == scanout->area.y2) -+ break; /* already have a scanout for this crtc */ -+ } -+ if (j == MAX_SCANOUTS) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, -+ "failed to split framebuffer: all scanouts in use\n"); -+ goto fail; -+ } -+ -+ if (scanout->pixmap) -+ continue; /* already have a complete scanout for this crtc */ -+ -+ /* need to allocate a new scanout bo for this crtc */ -+ scanout->pixmap = intel_create_split_fb(intel, -+ crtc->mode.HDisplay, crtc->mode.VDisplay); -+ if (!scanout->pixmap) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, -+ "failed to split framebuffer: allocation failure\n"); -+ goto fail; -+ } -+ -+ scanout->area.x1 = crtc_box.x1; -+ scanout->area.y1 = crtc_box.y1; -+ scanout->area.x2 = crtc_box.x2; -+ scanout->area.y2 = crtc_box.y2; -+ -+ if (old_state == INTEL_SCANOUT_FRONT) { -+ /* copy current content from the front buffer */ -+ intel_uxa_driver_copy_pixmap(intel, -+ screen_pixmap, scanout->pixmap, -+ crtc_box.x1, crtc_box.y1, 0, 0, -+ crtc_box.x2 - crtc_box.x1, -+ crtc_box.y2 - crtc_box.y1); -+ } -+ } - - intel_batch_submit(scrn); - -- /* -- * Queue flips on all enabled CRTCs -- * Note that if/when we get per-CRTC buffers, we'll have to update this. -- * Right now it assumes a single shared fb across all CRTCs, with the -- * kernel fixing up the offset of each CRTC as necessary. -- * -- * Also, flips queued on disabled or incorrectly configured displays -- * may never complete; this is a configuration error. -- */ -- mode->fe_frame = 0; -- mode->fe_tv_sec = 0; -- mode->fe_tv_usec = 0; -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) -+ continue; -+ -+ if (!intel_crtc_apply(crtc)) -+ goto fail; -+ } -+ -+ intel_free_scratch_front_pixmap(screen_pixmap); -+ -+ return TRUE; -+ -+fail: -+ mode->scanout_state = old_state; -+ intel_free_scratch_front_pixmap(screen_pixmap); -+ return FALSE; -+} -+ -+static void -+intel_crtc_merge_scanouts(intel_screen_private *intel) -+{ -+ struct intel_mode *mode = intel->modes; -+ PixmapPtr screen_pixmap; -+ int i, old_state; -+ -+ old_state = mode->scanout_state; -+ mode->scanout_state = INTEL_SCANOUT_FRONT; -+ -+ screen_pixmap = intel_get_scratch_front_pixmap(intel); -+ -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ struct intel_scanout *scanout = &mode->scanouts[i]; -+ if (scanout->pixmap == NULL) -+ continue; -+ -+ if (old_state == INTEL_SCANOUT_SPLIT) { -+ /* copy current content from the split buffer */ -+ intel_uxa_driver_copy_pixmap(intel, -+ scanout->pixmap, screen_pixmap, -+ 0, 0, -+ scanout->area.x1, scanout->area.y1, -+ scanout->area.x2 - scanout->area.x1, -+ scanout->area.y2 - scanout->area.y1); -+ } -+ -+ intel_destroy_scanout(scanout); -+ } -+ -+ intel_free_scratch_front_pixmap(screen_pixmap); -+} -+ -+void -+intel_merge_fb(intel_screen_private *intel) -+{ -+ ScrnInfoPtr scrn = intel->scrn; -+ struct intel_mode *mode = intel->modes; -+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); -+ int i; -+ -+ if (mode->scanout_state == INTEL_SCANOUT_FRONT) -+ return; /* nothing to do */ -+ -+ intel_crtc_merge_scanouts(intel); -+ intel_batch_submit(scrn); - - for (i = 0; i < config->num_crtc; i++) { -- if (!config->crtc[i]->enabled) -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) - continue; - -- mode->flip_info = flip_info; -- mode->flip_count++; -+ if (!intel_crtc_apply(crtc)) -+ continue; /* update as many crtcs as possible */ -+ } -+} -+ -+Bool -+intel_find_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout) -+{ -+ struct intel_mode *mode = intel->modes; -+ BoxRec intersect_box; -+ int i; -+ -+ *out_scanout = NULL; -+ -+ if (mode->scanout_state != INTEL_SCANOUT_SPLIT) -+ return TRUE; /* always use screen buffer */ -+ -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ struct intel_scanout *scanout = &mode->scanouts[i]; -+ if (scanout->pixmap == NULL) -+ continue; -+ -+ if (scanout->area.x1 == area->x1 && -+ scanout->area.y1 == area->y1 && -+ scanout->area.x2 == area->x2 && -+ scanout->area.y2 == area->y2) { -+ *out_scanout = scanout; -+ return TRUE; -+ } -+ -+ intel_box_intersect(&intersect_box, &scanout->area, area); -+ if (intersect_box.x1 != intersect_box.x2 || -+ intersect_box.y1 != intersect_box.y2) { -+ /* partial intersection; must merge to use area. */ -+ return FALSE; -+ } -+ } - -- crtc = config->crtc[i]->driver_private; -+ /* did not intersect any scanouts; use the screen. */ -+ return TRUE; -+} - -- flip = calloc(1, sizeof(struct intel_pageflip)); -- if (flip == NULL) { -+Bool -+intel_covering_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout) -+{ -+ struct intel_mode *mode = intel->modes; -+ BoxRec intersect_box; -+ int i; -+ -+ *out_scanout = NULL; -+ -+ if (mode->scanout_state != INTEL_SCANOUT_SPLIT) -+ return TRUE; /* always use screen buffer */ -+ -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ struct intel_scanout *scanout = &mode->scanouts[i]; -+ if (scanout->pixmap == NULL) -+ continue; -+ -+ if (scanout->area.x1 <= area->x1 && -+ scanout->area.y1 <= area->y1 && -+ scanout->area.x2 >= area->x2 && -+ scanout->area.y2 >= area->y2) { -+ *out_scanout = scanout; -+ return TRUE; -+ } -+ -+ intel_box_intersect(&intersect_box, &scanout->area, area); -+ if (intersect_box.x1 != intersect_box.x2 || -+ intersect_box.y1 != intersect_box.y2) { -+ /* partial intersection; must merge to use area. */ -+ return FALSE; -+ } -+ } -+ -+ /* did not intersect any scanouts; use the screen. */ -+ return TRUE; -+} -+ -+Bool -+intel_do_pageflip(intel_screen_private *intel, -+ PixmapPtr new_front, -+ DRI2FrameEventPtr flip_info) -+{ -+ struct intel_mode *mode = intel->modes; -+ ScrnInfoPtr scrn = intel->scrn; -+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); -+ struct intel_pageflip **flip_data = NULL; -+ uint32_t new_front_fb_id; -+ struct intel_crtc *reference_crtc; -+ BoxRec crtc_box, intersect_box; -+ int i, ret; -+ -+ if (mode->scanout_state == INTEL_SCANOUT_INVALID) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: scanout state not configured.\n"); -+ return FALSE; -+ } -+ -+ new_front_fb_id = intel_pixmap_ensure_fb(intel, new_front); -+ if (new_front_fb_id == 0) -+ goto error_undo; -+ -+ flip_data = calloc(config->num_crtc, sizeof(*flip_data)); -+ if (!flip_data) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: memory allocation error.\n"); -+ goto error_undo; -+ } -+ -+ /* Find the reference CRTC, check safety and allocate flip data. */ -+ reference_crtc = NULL; -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ struct intel_crtc *intel_crtc = crtc->driver_private; -+ if (!crtc->enabled) -+ continue; -+ -+ if (flip_info->pipe == intel_crtc->pipe) -+ reference_crtc = intel_crtc; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ intel_box_intersect(&intersect_box, &crtc_box, &flip_info->area); -+ -+ if (intersect_box.x1 == intersect_box.x2 || -+ intersect_box.y1 == intersect_box.y2) { -+ /* Skip crtcs unaffected by this update. */ -+ if (reference_crtc == intel_crtc) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: updated area does " -+ "not include the reference crtc.\n"); -+ goto error_undo; -+ } -+ continue; -+ } -+ -+ if (intersect_box.x1 != crtc_box.x1 || -+ intersect_box.y1 != crtc_box.y1 || -+ intersect_box.x2 != crtc_box.x2 || -+ intersect_box.y2 != crtc_box.y2) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, -- "flip queue: carrier alloc failed.\n"); -+ "flip queue failed: updated area partially " -+ "intersects crtc %d.\n", -+ crtc_id(intel_crtc)); - goto error_undo; - } - -- /* Only the reference crtc will finally deliver its page flip -- * completion event. All other crtc's events will be discarded. -- */ -- flip->dispatch_me = (intel_crtc_to_pipe(crtc->crtc) == ref_crtc_hw_id); -- flip->mode = mode; -+ flip_data[i] = calloc(1, sizeof(**flip_data)); -+ if (!flip_data[i]) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: memory allocation error.\n"); -+ goto error_undo; -+ } -+ } -+ if (reference_crtc == NULL) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: no reference crtc for pipe %d.\n", -+ flip_info->pipe); -+ goto error_undo; -+ } -+ if (reference_crtc->flip.info) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: reference crtc %d (for pipe %d) " -+ "already has a flip pending.\n", -+ crtc_id(reference_crtc), -+ flip_info->pipe); -+ goto error_undo; -+ } -+ -+ intel_batch_submit(scrn); -+ -+ reference_crtc->flip.pending = 0; -+ reference_crtc->flip.frame = 0; -+ reference_crtc->flip.tv_sec = 0; -+ reference_crtc->flip.tv_usec = 0; -+ -+ /* Defer storing the flip info until we have successfully queued all of -+ * the flips. If this function returns FALSE, the caller will free the -+ * flip_info structure, so any successful flips must not access it. -+ */ -+ reference_crtc->flip.info = NULL; -+ -+ /* -+ * Queue flips on all updated CRTCs. -+ * Flips queued on disabled or incorrectly-configured crtcs may never -+ * complete. This type of configuration error will result in the -+ * flip never completing, and leak some objects. -+ */ -+ for (i = 0; i < config->num_crtc; i++) { -+ struct intel_crtc *intel_crtc = config->crtc[i]->driver_private; -+ if (!flip_data[i]) -+ continue; -+ -+ flip_data[i]->reference_crtc = reference_crtc; -+ flip_data[i]->flipped_crtc = intel_crtc; - -- if (drmModePageFlip(mode->fd, -- crtc_id(crtc), -- mode->fb_id, -- DRM_MODE_PAGE_FLIP_EVENT, flip)) { -+ ret = drmModePageFlip(mode->fd, -+ crtc_id(intel_crtc), -+ new_front_fb_id, -+ DRM_MODE_PAGE_FLIP_EVENT, -+ flip_data[i]); -+ if (ret < 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, -- "flip queue failed: %s\n", strerror(errno)); -- free(flip); -+ "flip queue failed: error flipping crtc %d: %s\n", -+ crtc_id(intel_crtc), strerror(-ret)); - goto error_undo; - } -+ /* The flip_data object will be freed when the flip completes. */ -+ flip_data[i] = NULL; -+ -+ reference_crtc->flip.pending++; - } - -- mode->old_fb_id = old_fb_id; -+ reference_crtc->flip.info = flip_info; -+ free(flip_data); - return TRUE; - - error_undo: -- drmModeRmFB(mode->fd, mode->fb_id); -- mode->fb_id = old_fb_id; -- --error_out: -- xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n", -- strerror(errno)); -+ if (flip_data) { -+ /* Free any unused flip data objects. */ -+ for (i = 0; i < config->num_crtc; i++) { -+ free(flip_data[i]); -+ } -+ free(flip_data); -+ } - return FALSE; - } - -@@ -1635,31 +2090,33 @@ intel_page_flip_handler(int fd, unsigned int frame, unsigned int tv_sec, - unsigned int tv_usec, void *event_data) - { - struct intel_pageflip *flip = event_data; -- struct intel_mode *mode = flip->mode; -- -- /* Is this the event whose info shall be delivered to higher level? */ -- if (flip->dispatch_me) { -- /* Yes: Cache msc, ust for later delivery. */ -- mode->fe_frame = frame; -- mode->fe_tv_sec = tv_sec; -- mode->fe_tv_usec = tv_usec; -+ struct intel_crtc *reference_crtc = flip->reference_crtc; -+ struct intel_crtc *flipped_crtc = flip->flipped_crtc; -+ -+ if (reference_crtc == flipped_crtc) { -+ /* Cache information from the reference crtc's flip for the event handler. */ -+ reference_crtc->flip.frame = frame; -+ reference_crtc->flip.tv_sec = tv_sec; -+ reference_crtc->flip.tv_usec = tv_usec; - } -+ - free(flip); - -- /* Last crtc completed flip? */ -- mode->flip_count--; -- if (mode->flip_count > 0) -+ /* Was this the last pending flip? */ -+ reference_crtc->flip.pending--; -+ if (reference_crtc->flip.pending > 0) - return; - -- /* Release framebuffer */ -- drmModeRmFB(mode->fd, mode->old_fb_id); -- -- if (mode->flip_info == NULL) -+ if (reference_crtc->flip.info == NULL) - return; - -- /* Deliver cached msc, ust from reference crtc to flip event handler */ -- I830DRI2FlipEventHandler(mode->fe_frame, mode->fe_tv_sec, -- mode->fe_tv_usec, mode->flip_info); -+ /* Deliver cached info from reference crtc to flip event handler */ -+ I830DRI2FlipEventHandler( -+ reference_crtc->flip.frame, -+ reference_crtc->flip.tv_sec, -+ reference_crtc->flip.tv_usec, -+ reference_crtc->flip.info); -+ reference_crtc->flip.info = NULL; - } - - static void -@@ -1714,6 +2171,7 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp) - - for (i = 0; i < mode->mode_res->count_connectors; i++) - intel_output_init(scrn, mode, i); -+ intel_output_init(scrn, mode, i); - - xf86InitialConfiguration(scrn, TRUE); - -@@ -1746,7 +2204,6 @@ intel_mode_init(struct intel_screen_private *intel) - * feedback on every server generation, so perform the - * registration within ScreenInit and not PreInit. - */ -- mode->flip_count = 0; - AddGeneralSocket(mode->fd); - RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, - drm_wakeup_handler, mode); -@@ -1758,9 +2215,9 @@ intel_mode_remove_fb(intel_screen_private *intel) - { - struct intel_mode *mode = intel->modes; - -- if (mode->fb_id) { -- drmModeRmFB(mode->fd, mode->fb_id); -- mode->fb_id = 0; -+ if (mode->front_fb_id != 0) { -+ drmModeRmFB(mode->fd, mode->front_fb_id); -+ mode->front_fb_id = 0; - } - } - -@@ -1768,6 +2225,7 @@ void - intel_mode_fini(intel_screen_private *intel) - { - struct intel_mode *mode = intel->modes; -+ int i; - - while(!list_is_empty(&mode->crtcs)) { - xf86CrtcDestroy(list_first_entry(&mode->crtcs, -@@ -1781,8 +2239,9 @@ intel_mode_fini(intel_screen_private *intel) - link)->output); - } - -- if (mode->fb_id) -- drmModeRmFB(mode->fd, mode->fb_id); -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ intel_destroy_scanout(&mode->scanouts[i]); -+ } - - /* mode->rotate_fb_id should have been destroyed already */ - -diff --git a/src/intel_dri.c b/src/intel_dri.c -index 938a022..d8768a6 100644 ---- a/src/intel_dri.c -+++ b/src/intel_dri.c -@@ -457,6 +457,12 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, - ? drawable : &dstPrivate->pixmap->drawable; - RegionPtr pCopyClip; - GCPtr gc; -+ BoxRec draw_box; -+ struct intel_scanout *scanout; -+ -+ if (pRegion->extents.x1 == pRegion->extents.x2 || -+ pRegion->extents.y1 == pRegion->extents.y2) -+ return; /* nothing actually being copied */ - - gc = GetScratchGC(dst->depth, screen); - if (!gc) -@@ -542,6 +548,22 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, - } - } - -+ if (pixmap_is_scanout(get_drawable_pixmap(dst))) { -+ intel_drawable_box(drawable, &draw_box); -+ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) -+ intel_merge_fb(intel); -+ else -+ dst = &scanout->pixmap->drawable; -+ } -+ -+ if (pixmap_is_scanout(get_drawable_pixmap(src))) { -+ intel_drawable_box(drawable, &draw_box); -+ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) -+ intel_merge_fb(intel); -+ else -+ src = &scanout->pixmap->drawable; -+ } -+ - /* It's important that this copy gets submitted before the - * direct rendering client submits rendering for the next - * frame, but we don't actually need to submit right now. The -@@ -764,10 +786,11 @@ i830_dri2_del_frame_event(DrawablePtr drawable, DRI2FrameEventPtr info) - static void - I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back) - { -+ ScreenPtr pScreen = draw->pScreen; -+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); - I830DRI2BufferPrivatePtr front_priv, back_priv; - struct intel_pixmap *front_intel, *back_intel; -- ScreenPtr screen; -- intel_screen_private *intel; - int tmp; - - front_priv = front->driverPrivate; -@@ -784,14 +807,42 @@ I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr bac - intel_set_pixmap_private(front_priv->pixmap, back_intel); - intel_set_pixmap_private(back_priv->pixmap, front_intel); - -- screen = draw->pScreen; -- intel = intel_get_screen_private(xf86Screens[screen->myNum]); -- - dri_bo_unreference (intel->front_buffer); - intel->front_buffer = back_intel->bo; - dri_bo_reference (intel->front_buffer); - -- intel_set_pixmap_private(screen->GetScreenPixmap(screen), back_intel); -+ intel_set_pixmap_private(pScreen->GetScreenPixmap(pScreen), back_intel); -+ back_intel->busy = 1; -+ front_intel->busy = -1; -+} -+ -+static void -+I830DRI2ExchangeBuffersSplit(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back) -+{ -+ ScreenPtr pScreen = draw->pScreen; -+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ I830DRI2BufferPrivatePtr back_priv; -+ struct intel_pixmap *front_intel, *back_intel; -+ struct intel_scanout *scanout; -+ BoxRec draw_box; -+ -+ back_priv = back->driverPrivate; -+ -+ intel_drawable_box(draw, &draw_box); -+ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, -+ "failed to exchange with scanout"); -+ return; -+ } -+ -+ front_intel = intel_get_pixmap_private(scanout->pixmap); -+ back_intel = intel_get_pixmap_private(back_priv->pixmap); -+ intel_set_pixmap_private(scanout->pixmap, back_intel); -+ intel_set_pixmap_private(back_priv->pixmap, front_intel); -+ -+ back->name = pixmap_flink(back_priv->pixmap); -+ - back_intel->busy = 1; - front_intel->busy = -1; - } -@@ -806,16 +857,19 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel, - DRI2FrameEventPtr info) - { - I830DRI2BufferPrivatePtr priv = info->back->driverPrivate; -- drm_intel_bo *new_back, *old_back; -+ drm_intel_bo *new_back; - - if (!intel->use_triple_buffer) { -- if (!intel_do_pageflip(intel, -- intel_get_pixmap_bo(priv->pixmap), -- info, info->pipe)) -+ if (!intel_do_pageflip(intel, priv->pixmap, info)) - return FALSE; - -- info->type = DRI2_SWAP; -- I830DRI2ExchangeBuffers(draw, info->front, info->back); -+ if (info->type == DRI2_FLIP_SPLIT) { -+ info->type = DRI2_SWAP; -+ I830DRI2ExchangeBuffersSplit(draw, info->front, info->back); -+ } else { -+ info->type = DRI2_SWAP; -+ I830DRI2ExchangeBuffers(draw, info->front, info->back); -+ } - return TRUE; - } - -@@ -846,8 +900,7 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel, - intel->back_buffer = NULL; - } - -- old_back = intel_get_pixmap_bo(priv->pixmap); -- if (!intel_do_pageflip(intel, old_back, info, info->pipe)) { -+ if (!intel_do_pageflip(intel, priv->pixmap, info)) { - intel->back_buffer = new_back; - return FALSE; - } -@@ -916,6 +969,79 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back) - return TRUE; - } - -+static Bool -+can_exchange_split(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back) -+{ -+ struct intel_screen_private *intel = intel_get_screen_private(xf86Screens[drawable->pScreen->myNum]); -+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(intel->scrn); -+ I830DRI2BufferPrivatePtr front_priv = front->driverPrivate; -+ I830DRI2BufferPrivatePtr back_priv = back->driverPrivate; -+ PixmapPtr front_pixmap = front_priv->pixmap; -+ PixmapPtr back_pixmap = back_priv->pixmap; -+ struct intel_pixmap *front_intel = intel_get_pixmap_private(front_pixmap); -+ struct intel_pixmap *back_intel = intel_get_pixmap_private(back_pixmap); -+ WindowPtr draw_win; -+ Bool found_match, found_conflict; -+ BoxRec draw_box, crtc_box, intersect_box; -+ int i; -+ -+ if (drawable == NULL || -+ drawable->type != DRAWABLE_WINDOW || -+ intel->shadow_present || -+ !intel->use_pageflipping || -+ !intel->use_split_framebuffer) -+ return FALSE; -+ -+ if (!pixmap_is_scanout(front_pixmap)) -+ return FALSE; -+ -+ /* Reject cases where the drawable and backing store have different -+ * sizes. This occurs occasionally when a resize and an update happen -+ * simultaneously. */ -+ if (drawable->width != back_pixmap->drawable.width || -+ drawable->height != back_pixmap->drawable.height) -+ return FALSE; -+ -+ /* Reported depth differs because the scanout pixmap has no alpha, -+ * however the formats are still interchangeable. */ -+ if (front_pixmap->drawable.bitsPerPixel != back_pixmap->drawable.bitsPerPixel || -+ front_intel->tiling != back_intel->tiling) -+ return FALSE; -+ -+ /* Can only do a split exchange if the window is completely exposed. */ -+ draw_win = (WindowPtr)drawable; -+ if (!RegionEqual(&draw_win->clipList, &draw_win->winSize)) -+ return FALSE; -+ -+ /* Only split if the area matches at least one crtc, and does not -+ * partially intersect any crtcs. */ -+ found_match = FALSE; -+ found_conflict = FALSE; -+ intel_drawable_box(drawable, &draw_box); -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) -+ continue; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ if (crtc_box.x1 == draw_box.x1 && -+ crtc_box.y1 == draw_box.y1 && -+ crtc_box.x2 == draw_box.x2 && -+ crtc_box.y2 == draw_box.y2) { -+ /* regions are equal, so can flip with this crtc */ -+ found_match = TRUE; -+ continue; -+ } -+ -+ /* not equal, so any intersection indicates a conflict */ -+ intel_box_intersect(&intersect_box, &draw_box, &crtc_box); -+ if (intersect_box.x1 != intersect_box.x2 && -+ intersect_box.y1 != intersect_box.y2) -+ found_conflict = TRUE; -+ } -+ return found_match && !found_conflict; -+} -+ - void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, - unsigned int tv_usec, DRI2FrameEventPtr swap_info) - { -@@ -935,11 +1061,18 @@ void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, - - - switch (swap_info->type) { -- case DRI2_FLIP: -+ case DRI2_FLIP_SPLIT: -+ if (can_exchange_split(drawable, swap_info->front, swap_info->back)) { -+ if (I830DRI2ScheduleFlip(intel, drawable, swap_info)) -+ return; -+ } -+ -+ case DRI2_FLIP_FRONT: - /* If we can still flip... */ -- if (can_exchange(drawable, swap_info->front, swap_info->back) && -- I830DRI2ScheduleFlip(intel, drawable, swap_info)) -- return; -+ if (can_exchange(drawable, swap_info->front, swap_info->back)) { -+ if (I830DRI2ScheduleFlip(intel, drawable, swap_info)) -+ return; -+ } - - /* else fall through to exchange/blit */ - case DRI2_SWAP: { -@@ -1124,6 +1257,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - swap_info->front = front; - swap_info->back = back; - swap_info->pipe = I830DRI2DrawablePipe(draw); -+ intel_drawable_box(draw, &swap_info->area); - - if (!i830_dri2_add_frame_event(swap_info)) { - free(swap_info); -@@ -1151,7 +1285,13 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - - /* Flips need to be submitted one frame before */ - if (can_exchange(draw, front, back)) { -- swap_type = DRI2_FLIP; -+ intel_merge_fb(intel); -+ swap_type = DRI2_FLIP_FRONT; -+ flip = 1; -+ } else if (can_exchange_split(draw, front, back)) { -+ if (!intel_split_fb(intel)) -+ goto blit_fallback; -+ swap_type = DRI2_FLIP_SPLIT; - flip = 1; - } else { - /* Using the DRI2_SWAP path defers the back-to-front blit until -@@ -1163,7 +1303,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - } - swap_info->type = swap_type; - -- /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP. -+ /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP_*. - * Do it early, so handling of different timing constraints - * for divisor, remainder and msc vs. target_msc works. - */ -diff --git a/src/intel_driver.c b/src/intel_driver.c -index cdd7713..12ff9a1 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -101,6 +101,7 @@ typedef enum { - OPTION_DEBUG_WAIT, - OPTION_HOTPLUG, - OPTION_RELAXED_FENCING, -+ OPTION_SPLIT_FRAMEBUFFER, - } I830Opts; - - static OptionInfoRec I830Options[] = { -@@ -122,6 +123,7 @@ static OptionInfoRec I830Options[] = { - {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_RELAXED_FENCING, "RelaxedFencing", OPTV_BOOLEAN, {0}, TRUE}, -+ {OPTION_SPLIT_FRAMEBUFFER, "SplitFramebuffer", OPTV_BOOLEAN, {0}, TRUE}, - {-1, NULL, OPTV_NONE, {0}, FALSE} - }; - /* *INDENT-ON* */ -@@ -669,6 +671,14 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n", - intel->use_triple_buffer ? "enabled" : "disabled"); - -+ intel->use_split_framebuffer = -+ xf86ReturnOptValBool(intel->Options, -+ OPTION_SPLIT_FRAMEBUFFER, -+ TRUE); -+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Split framebuffer? %s\n", -+ intel->use_split_framebuffer ? "enabled" : "disabled"); -+ -+ - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n", - intel->tiling & INTEL_TILING_FB ? "tiled" : "linear"); - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n", -diff --git a/src/intel_uxa.c b/src/intel_uxa.c -index b55b285..c811fbe 100644 ---- a/src/intel_uxa.c -+++ b/src/intel_uxa.c -@@ -636,6 +636,7 @@ void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo) - if (priv->bo == bo) - return; - -+ intel_pixmap_remove_fb(intel, pixmap); - priv->dst_bound = priv->src_bound = 0; - if (list_is_empty(&priv->batch)) { - dri_bo_unreference(priv->bo); -@@ -704,6 +705,9 @@ static Bool intel_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access) - dri_bo *bo = priv->bo; - int ret; - -+ if (pixmap_is_scanout(pixmap)) -+ intel_merge_fb(intel); -+ - if (!list_is_empty(&priv->batch) && - (access == UXA_ACCESS_RW || priv->batch_write)) - intel_batch_submit(scrn); -@@ -765,8 +769,13 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap, - int w, int h, - char *src, int src_pitch) - { -+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); - struct intel_pixmap *priv; - -+ if (pixmap_is_scanout(pixmap)) -+ intel_merge_fb(intel); -+ - priv = intel_get_pixmap_private(pixmap); - if (!intel_pixmap_is_busy(priv)) { - /* bo is not busy so can be replaced without a stall, upload in-place. */ -@@ -882,6 +891,8 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, - int w, int h, - char *dst, int dst_pitch) - { -+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); - struct intel_pixmap *priv; - PixmapPtr scratch = NULL; - Bool ret; -@@ -893,6 +904,24 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, - * Also the gpu is much faster at detiling. - */ - -+ if (pixmap_is_scanout(pixmap)) { -+ struct intel_scanout *scanout; -+ BoxRec get_box; -+ -+ get_box.x1 = x; -+ get_box.x2 = x + w; -+ get_box.y1 = y; -+ get_box.y2 = y + h; -+ if (!intel_covering_scanout(intel, &get_box, &scanout) || scanout == NULL) { -+ intel_merge_fb(intel); -+ } else { -+ /* Adjust the copy to come from the scanout. */ -+ pixmap = scanout->pixmap; -+ x -= scanout->area.x1; -+ y -= scanout->area.y1; -+ } -+ } -+ - priv = intel_get_pixmap_private(pixmap); - if (intel_pixmap_is_busy(priv) || priv->tiling != I915_TILING_NONE) { - ScreenPtr screen = pixmap->drawable.pScreen; -@@ -1191,6 +1220,25 @@ intel_limits_init(intel_screen_private *intel) - } - } - -+Bool -+intel_uxa_driver_copy_pixmap(intel_screen_private *intel, -+ PixmapPtr src, PixmapPtr dst, -+ int src_x, int src_y, -+ int dst_x, int dst_y, -+ int w, int h) -+{ -+ if (!intel->uxa_driver->check_copy(src, dst, GXcopy, FB_ALLONES)) -+ return FALSE; -+ -+ if (!intel->uxa_driver->prepare_copy(src, dst, -1, -1, -+ GXcopy, FB_ALLONES)) -+ return FALSE; -+ -+ intel->uxa_driver->copy(dst, src_x, src_y, dst_x, dst_y, w, h); -+ intel->uxa_driver->done_copy(dst); -+ return TRUE; -+} -+ - Bool intel_uxa_init(ScreenPtr screen) - { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; -diff --git a/src/intel_video.c b/src/intel_video.c -index 021ca5f..17fd0d7 100644 ---- a/src/intel_video.c -+++ b/src/intel_video.c -@@ -1033,7 +1033,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, - return TRUE; - } - --static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) -+void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) - { - dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1; - dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2; -@@ -1043,7 +1043,7 @@ static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) - dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0; - } - --static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) -+void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) - { - if (crtc->enabled) { - crtc_box->x1 = crtc->x; -@@ -1056,6 +1056,13 @@ static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) - crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; - } - -+void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box) { -+ draw_box->x1 = draw->x; -+ draw_box->x2 = draw->x + draw->width; -+ draw_box->y1 = draw->y; -+ draw_box->y2 = draw->y + draw->height; -+} -+ - static int intel_box_area(BoxPtr box) - { - return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild deleted file mode 100644 index 3183eb4fae..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild,v 1.1 2011/08/11 15:51:43 chithanh Exp $ - -EAPI=4 - -XORG_DRI=dri -inherit linux-info xorg-2 - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="amd64 ~ia64 x86 -x86-fbsd" -IUSE="dri sna xvmc broken_partialswaps" - -RDEPEND="x11-libs/libXext - x11-libs/libXfixes - xvmc? ( - x11-libs/libXvMC - ) - >=x11-libs/libxcb-1.5 - >=x11-libs/libdrm-2.4.23[video_cards_intel] - sna? ( - >=x11-base/xorg-server-1.10 - )" -DEPEND="${RDEPEND} - >=x11-proto/dri2proto-2.6" - -PATCHES=( - # Copy the initial framebuffer contents when starting X so we can get - # seamless transitions. - "${FILESDIR}/2.16.0-copy-fb.patch" - # Prevent X from touching boot-time gamma settings. - "${FILESDIR}/2.14.0-no-gamma.patch" - # BLT ring hang fix. - "${FILESDIR}/2.16.0-blt-hang.patch" - # Disable backlight adjustments on DPMS mode changes. - "${FILESDIR}/2.16.0-no-backlight.patch" - # Avoid display corruption when unable to flip - "${FILESDIR}/2.16.0-fix-blt-damage.patch" - # Split framebuffer and flip crtcs indepenently. - "${FILESDIR}/2.16.0-per-crtc-flip.patch" -) - -src_prepare() { - # Disable triple buffering since we need double buffering - # to implement partial updates on top of flips - if use broken_partialswaps; then - PATCHES+=( - "${FILESDIR}/2.16.0-no-triple.patch" - ) - fi - - for patch_file in "${PATCHES[@]}"; do - epatch $patch_file - done -} - -pkg_setup() { - xorg-2_pkg_setup - CONFIGURE_OPTIONS="$(use_enable dri) --disable-xvmc --enable-kms-only" -} - -pkg_postinst() { - if linux_config_exists \ - && ! linux_chkconfig_present DRM_I915_KMS; then - echo - ewarn "This driver requires KMS support in your kernel" - ewarn " Device Drivers --->" - ewarn " Graphics support --->" - ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->" - ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->" - ewarn " i915 driver" - ewarn " [*] Enable modesetting on intel by default" - echo - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest deleted file mode 100644 index d950086f82..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-video-vesa-2.3.0.tar.bz2 264539 RMD160 7e7c11f6cc094bb898c57d26a70f6c4c0ab83d0f SHA1 4689b7c295d7a8d7326302dafecb812739617134 SHA256 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch deleted file mode 100644 index e27a355d48..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/vesa.c b/src/vesa.c -index 61d3550..1136ac3 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -1299,3 +1299,7 @@ VESAMapVidMem(ScrnInfoPtr pScrn) -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pVesa->ioBase = pScrn->domainIOBase; -+#else -+ pVesa->ioBase = 0; -+#endif - - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch deleted file mode 100644 index ea3d68a9b3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1f84310ddf49778f776a39810aa98211c812e8ab Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston -Date: Wed, 19 Oct 2011 08:33:07 +0000 -Subject: Build fix for ABI Version 12 - -ABI Version 12 removes support for multiple PCI domains. If you need to -use this driver on a system with more than one PCI domain, you should -either port this driver to using libpciaccess directly or stick with an -older server. - -Signed-off-by: Jeremy Huddleston ---- -diff --git a/src/vesa.c b/src/vesa.c -index 1136ac3..5a0120c 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn) - & pVesa->base); - } - else -- pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo, -- pScrn->memPhysBase, pVesa->mapSize); -+ (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase, -+ pVesa->mapSize, -+ PCI_DEV_MAP_FLAG_WRITABLE, -+ & pVesa->base); - - if (pVesa->base) { - if (pVesa->mapPhys != 0xa0000) -- pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0, -- pVesa->pciInfo, -- 0xa0000, 0x10000); -+ (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000, -+ PCI_DEV_MAP_FLAG_WRITABLE, -+ & pVesa->VGAbase); - else - pVesa->VGAbase = pVesa->base; - -@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn) - if (pVesa->mapPhys != 0xa0000) { - (void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base, - pVesa->mapSize); -- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000); -+ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase, -+ 0x10000); - } - else { -- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); -+ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base, -+ pVesa->mapSize); - } - #else - xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); --- -cgit v0.9.0.2-2-gbebe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch deleted file mode 100644 index 50ff3d1f2b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.c xf86-video-vesa-2.3.0.work/src/vesa.c ---- xf86-video-vesa-2.3.0.orig/src/vesa.c 2010-01-04 11:19:13.000000000 -0800 -+++ xf86-video-vesa-2.3.0.work/src/vesa.c 2011-03-08 11:06:58.264579000 -0800 -@@ -143,8 +143,6 @@ vesaUpdatePacked(ScreenPtr pScreen, shad - shadowUpdatePacked(pScreen, pBuf); - } - --static Bool VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen); -- - enum GenericTypes - { - CHIP_VESA_GENERIC -@@ -1050,8 +1048,6 @@ VESAScreenInit(int scrnIndex, ScreenPtr - return FALSE; - } - -- VESADGAInit(pScrn, pScreen); -- - xf86SetBlackWhitePixels(pScreen); - miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); -@@ -1121,11 +1117,6 @@ VESACloseScreen(int scrnIndex, ScreenPtr - shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen)); - xfree(pVesa->shadow); - } -- if (pVesa->pDGAMode) { -- xfree(pVesa->pDGAMode); -- pVesa->pDGAMode = NULL; -- pVesa->nDGAMode = 0; -- } - pScrn->vtSema = FALSE; - - pScrn->EnableDisableFBAccess = pVesa->EnableDisableFBAccess; -@@ -1652,143 +1643,3 @@ VESADisplayPowerManagementSet(ScrnInfoPt - VBEDPMSSet(pVesa->pVbe, mode); - } - --/*********************************************************************** -- * DGA stuff -- ***********************************************************************/ --static Bool VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName, -- unsigned char **ApertureBase, -- int *ApertureSize, int *ApertureOffset, -- int *flags); --static Bool VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode); --static void VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags); -- --static Bool --VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName, -- unsigned char **ApertureBase, int *ApertureSize, -- int *ApertureOffset, int *flags) --{ -- VESAPtr pVesa = VESAGetRec(pScrn); -- -- *DeviceName = NULL; /* No special device */ -- *ApertureBase = (unsigned char *)(long)(pVesa->mapPhys); -- *ApertureSize = pVesa->mapSize; -- *ApertureOffset = pVesa->mapOff; -- *flags = DGA_NEED_ROOT; -- -- return (TRUE); --} -- --static Bool --VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode) --{ -- DisplayModePtr pMode; -- int scrnIdx = pScrn->pScreen->myNum; -- int frameX0, frameY0; -- -- if (pDGAMode) { -- pMode = pDGAMode->mode; -- frameX0 = frameY0 = 0; -- } -- else { -- if (!(pMode = pScrn->currentMode)) -- return (TRUE); -- -- frameX0 = pScrn->frameX0; -- frameY0 = pScrn->frameY0; -- } -- -- if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0)) -- return (FALSE); -- (*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0); -- -- return (TRUE); --} -- --static void --VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags) --{ -- (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags); --} -- --static int --VESADGAGetViewport(ScrnInfoPtr pScrn) --{ -- return (0); --} -- --static DGAFunctionRec VESADGAFunctions = --{ -- VESADGAOpenFramebuffer, -- NULL, /* CloseFramebuffer */ -- VESADGASetMode, -- VESADGASetViewport, -- VESADGAGetViewport, -- NULL, /* Sync */ -- NULL, /* FillRect */ -- NULL, /* BlitRect */ -- NULL, /* BlitTransRect */ --}; -- --static void --VESADGAAddModes(ScrnInfoPtr pScrn) --{ -- VESAPtr pVesa = VESAGetRec(pScrn); -- DisplayModePtr pMode = pScrn->modes; -- DGAModePtr pDGAMode; -- -- do { -- pDGAMode = xrealloc(pVesa->pDGAMode, -- (pVesa->nDGAMode + 1) * sizeof(DGAModeRec)); -- if (!pDGAMode) -- break; -- -- pVesa->pDGAMode = pDGAMode; -- pDGAMode += pVesa->nDGAMode; -- (void)memset(pDGAMode, 0, sizeof(DGAModeRec)); -- -- ++pVesa->nDGAMode; -- pDGAMode->mode = pMode; -- pDGAMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE; -- pDGAMode->byteOrder = pScrn->imageByteOrder; -- pDGAMode->depth = pScrn->depth; -- pDGAMode->bitsPerPixel = pScrn->bitsPerPixel; -- pDGAMode->red_mask = pScrn->mask.red; -- pDGAMode->green_mask = pScrn->mask.green; -- pDGAMode->blue_mask = pScrn->mask.blue; -- pDGAMode->visualClass = pScrn->bitsPerPixel > 8 ? -- TrueColor : PseudoColor; -- pDGAMode->xViewportStep = 1; -- pDGAMode->yViewportStep = 1; -- pDGAMode->viewportWidth = pMode->HDisplay; -- pDGAMode->viewportHeight = pMode->VDisplay; -- -- pDGAMode->bytesPerScanline = pVesa->maxBytesPerScanline; -- pDGAMode->imageWidth = pMode->HDisplay; -- pDGAMode->imageHeight = pMode->VDisplay; -- pDGAMode->pixmapWidth = pDGAMode->imageWidth; -- pDGAMode->pixmapHeight = pDGAMode->imageHeight; -- pDGAMode->maxViewportX = pScrn->virtualX - -- pDGAMode->viewportWidth; -- pDGAMode->maxViewportY = pScrn->virtualY - -- pDGAMode->viewportHeight; -- -- pDGAMode->address = pVesa->base; -- -- pMode = pMode->next; -- } while (pMode != pScrn->modes); --} -- --static Bool --VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) --{ -- VESAPtr pVesa = VESAGetRec(pScrn); -- -- if (pScrn->depth < 8 || pVesa->mapPhys == 0xa0000L) -- return (FALSE); -- -- if (!pVesa->nDGAMode) -- VESADGAAddModes(pScrn); -- -- return (DGAInit(pScreen, &VESADGAFunctions, -- pVesa->pDGAMode, pVesa->nDGAMode)); --} -Only in xf86-video-vesa-2.3.0.work/src: vesa.c~ -diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.h xf86-video-vesa-2.3.0.work/src/vesa.h ---- xf86-video-vesa-2.3.0.orig/src/vesa.h 2010-01-04 11:19:13.000000000 -0800 -+++ xf86-video-vesa-2.3.0.work/src/vesa.h 2011-03-08 11:01:24.443622000 -0800 -@@ -64,9 +64,6 @@ - /* Int 10 support */ - #include "xf86int10.h" - --/* Dga definitions */ --#include "dgaproc.h" -- - #include "fb.h" - - #ifdef XSERVER_LIBPCIACCESS -@@ -108,9 +105,6 @@ typedef struct _VESARec - CARD32 windowAoffset; - /* Don't override the default refresh rate. */ - Bool defaultRefresh; -- /* DGA info */ -- DGAModePtr pDGAMode; -- int nDGAMode; - CloseScreenProcPtr CloseScreen; - CreateScreenResourcesProcPtr CreateScreenResources; - xf86EnableDisableFBAccessProc *EnableDisableFBAccess; -Only in xf86-video-vesa-2.3.0.work/src: vesa.h~ diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild deleted file mode 100644 index df0fe20abc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild,v 1.3 2010/02/08 15:31:28 fauli Exp $ - -inherit x-modular - -DESCRIPTION="Generic VESA video driver" -KEYWORDS="-* ~alpha amd64 ~ia64 x86 ~x86-fbsd" -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xproto" -PATCHES=( - "${FILESDIR}/no-dga.patch" - "${FILESDIR}/2.3.0-r1-domainiobase.patch" - "${FILESDIR}/2.3.0-r1-xf86MapDomainMemory.patch" -) -