From 47a836ddab3256dada752f1149a8c86d23f1da96 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Fri, 11 Jun 2010 17:59:41 +0000 Subject: [PATCH] net-wireless/compat-wireless: added a patch for swc|666 to disable leds so he doesn't have a stroke --- net-wireless/compat-wireless/Manifest | 2 + .../compat-wireless-2.6.35_rc2-r1.ebuild | 111 ++++++++++++++++++ .../compat-wireless/files/leds-disable.patch | 56 +++++++++ 3 files changed, 169 insertions(+) create mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.35_rc2-r1.ebuild create mode 100644 net-wireless/compat-wireless/files/leds-disable.patch diff --git a/net-wireless/compat-wireless/Manifest b/net-wireless/compat-wireless/Manifest index 8dfd29cf4..1b6edc149 100644 --- a/net-wireless/compat-wireless/Manifest +++ b/net-wireless/compat-wireless/Manifest @@ -17,6 +17,7 @@ AUX failed_openembedded-orinoco-remove-all-which-are-in-hostap-HACK.patch 6606 R AUX force-enable-new-ralink-pci.patch 371 RMD160 33206cfd78ff0c1e2694c7236915f4d74fd2875f SHA1 b6dd5ad0802c6186eca2b3da2e4afe3baea79456 SHA256 5ca2668bd930d2bba7eedbd78f2d538bf1a2ba3c8e1deb60af77580e66078a47 AUX force-enable-new-ralink.patch 558 RMD160 4cc8c5d09d49fcc831b4895d05ec6a14d5e16e22 SHA1 d3cc6b53ac5ef6644702d0ae227ac67a4832d075 SHA256 b6a411562c8c0964d36817f4d276a8db2c3169d6044b648650eb8b742c2dc898 AUX led-oops.patch 733 RMD160 50dc59a8893e7d77cf41653d8d39e5255dae8273 SHA1 9875b139e4111eb137cd1b43e3b68c85eb8915f5 SHA256 381f52b08f1b4c268fcc4ad88b0059d27b438bdab6acd4d54c882cc2505c99b9 +AUX leds-disable.patch 1232 RMD160 5d82d47828e01462312ba3dd9cdc71564dc05f9a SHA1 1ca99516a1a6d92c7c45de6e5c5afefdacaa8c27 SHA256 55080ec9838b3eac1c06bb0b360374fa8170266ba0d85ceb1a88c7caef97ace0 AUX mac80211.compat08082009.wl_frag+ack_v1.patch 1049 RMD160 e864ee2e0c70ce344000baa8ee5fca3b23c3305a SHA1 85f7a1b141549b774f5631fba259bc414aeeffb8 SHA256 e04ed9997e1578cc1becd4ef9d9f2f6f606590aa91a56e42835963913e1b0f52 AUX orinoco-remove-all-which-are-in-hostap-OFFICIAL.patch 12945 RMD160 a9453bfccd20520dc592275b4dd90fe681f272fa SHA1 f032aa4c51360ba793d2a8bf5a393bbfe33b94fa SHA256 38705e63f5034052d48c50a29d5a8bf114a692ce6e76a53b73371180d0e0f14b AUX rtl8187-mac80211-injection-speed-2.6.30-rc3.patch 1179 RMD160 e06fc37c08ce457ebeef7a7eaae8a05fb8aa7513 SHA1 77281c04d0e451860f27d0f621955a77b5e133d6 SHA256 bf6846089eb3d8cf7ebe119b4ffd1c32f7075a98d403fc8f96a5b49017c385b6 @@ -57,5 +58,6 @@ EBUILD compat-wireless-2.6.34.ebuild 2793 RMD160 d68f2fc3a55d4929e3902f36fb4261d EBUILD compat-wireless-2.6.34_rc4.ebuild 2793 RMD160 d68f2fc3a55d4929e3902f36fb4261d4ac987972 SHA1 5f7d95f00c9497b296e5f43e79fe006ca846d5d7 SHA256 9f16bc96c70b7e8a7e3284a83b58d86f41eb7dfef5e3c415c2f93b8f9a1eed85 EBUILD compat-wireless-2.6.35_rc1-r1.ebuild 4077 RMD160 ea6fcc2e2b999db2fac3a4a4499e7930e4229fa5 SHA1 1812c13fdb0fc3ffe328edeceb9703b33e3d0264 SHA256 a04ac617dd7277e75eac497bbcd44e3f61dbc200919b4b621bd7d9dd348db560 EBUILD compat-wireless-2.6.35_rc1.ebuild 3919 RMD160 380650a0684f84a2224fd52b6785a3dece6ba194 SHA1 89664f29f45f011c4e9f4601430b44a701987e4b SHA256 9297538dfc8b5453fbcd585b86eb8c714cd779074b0815668271e0434d64103d +EBUILD compat-wireless-2.6.35_rc2-r1.ebuild 4233 RMD160 4375ab9a967d25115ee242fab3ed569151bcc9e6 SHA1 6c76de2792d02c63f3af0e31d0b0a9a2ea53ec82 SHA256 8d191166fd6152b8f8616ffa348a55cf6c43bd07827ba7017b59f0c7153d1463 EBUILD compat-wireless-2.6.35_rc2.ebuild 4171 RMD160 9f8506a4323e2ebb98aa19097c3e1fabdd8ddd59 SHA1 d63d5ee7b18f4f7d12eb85114a687db88ec5157c SHA256 391b2399765f37e1421c30a3f6171072a338d39ec891a7fe9ff472dc1af10b0b MISC metadata.xml 228 RMD160 cd3fb26b5d8049ab5dba38f21d7654ec033aa0eb SHA1 3148dfbdced7a623a311d21c6f728ab9c7135dae SHA256 8715828d1bff71d5d96b991ba600bae9376c1c80c96f0f102260fc335ca22487 diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.35_rc2-r1.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.35_rc2-r1.ebuild new file mode 100644 index 000000000..c14eba264 --- /dev/null +++ b/net-wireless/compat-wireless/compat-wireless-2.6.35_rc2-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +inherit linux-mod linux-info versionator + +##Stable +MY_P=${P/_rc/-rc} +MY_PV=v$(get_version_component_range 1-3) +DESCRIPTION="Stable kernel pre-release wifi subsystem backport" +HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable" +#SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}.tar.bz2" +SRC_URI="http://bombadil.infradead.org/~mcgrof/tmp/compat-wireless-2.6.35-rc2.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="injection noleds tinyversionoverride" + +DEPEND="" +RDEPEND="=sys-kernel/linux-firmware-99999999" + +S=${WORKDIR}/${MY_P} +RESTRICT="strip" + +CONFIG_CHECK="!DYNAMIC_FTRACE" + +pkg_setup() { + linux-mod_pkg_setup + kernel_is -lt 2 6 27 && die "kernel 2.6.27 or higher is required for compat wireless to be installed" + kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system." + if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then + if use tinyversionoverride; then + ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your" + ewarn "kernel is older than the compat-wireless you are installing." + ewarn "Most likely you have no clue what you are doing and should hit control-C now" + ewarn "before you downgrade your system. Ten seconds to think about it." + epause 10 + else + ewarn "Your kernel version is most likely newer than the compat-wireless release you are" + ewarn "trying to install. If you are certain that your kernel is older then you can set" + ewarn "the tinyversionoverride use flag to override this safety check." + epause 5 + die "Your kernel version is too close to the compat-wireless version to risk installation." + fi + fi + linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !" + linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !" +} + +src_prepare() { + #whynot patch is against the makefile to fix general brokeness + epatch "${FILESDIR}"/whynot-2.6.32.patch + + #this patch is needed to forcibly enable new ralink chips because the shipped config.mk seems very bad + epatch "${FILESDIR}"/force-enable-new-ralink-pci.patch + + #0001 is a patch to fix monitor mode promisc for ath5k, a bug present for a very long time. + #this patch should be merged soon and no longer needed. + epatch "${FILESDIR}"/0001-ath5k-retain-promiscuous-setting.patch + + if use injection; then + epatch "${FILESDIR}"/400[24]_*.patch + epatch "${FILESDIR}"/mac80211.compat08082009.wl_frag+ack_v1.patch + epatch "${FILESDIR}"/4013-runtime-enable-disable-of-mac80211-packet-injection.patch + epatch "${FILESDIR}"/compat-chaos.patch + epatch "${FILESDIR}"/rtl8187-mac80211-injection-speed-2.6.30-rc3.patch +# epatch "${FILESDIR}"/super_secret_patch.diff + fi + use noleds && epatch "${FILESDIR}"/leds-disable.patch +} + +src_compile() { + addpredict "${KERNEL_DIR}" + set_arch_to_kernel + emake KVER="${KV_FULL}" || die "emake failed" +} + +src_install() { + for file in $(find -name \*.ko); do + insinto "/lib/modules/${KV_FULL}/updates/$(dirname ${file})" + doins "${file}" || die "failed to install module ${file}" + done + dosbin scripts/athenable scripts/b43load scripts/iwl-enable \ + scripts/madwifi-unload scripts/athload scripts/iwl-load \ + scripts/b43enable scripts/load.sh \ + scripts/unload.sh || die "script installation failed" + + dodir /usr/lib/compat-wireless + exeinto /usr/lib/compat-wireless + doexe scripts/modlib.sh || die + + dodoc README || die + dodir /$(get_libdir)/udev/rules.d/ + insinto /$(get_libdir)/udev/rules.d/ + doins udev/50-compat_firmware.rules + exeinto /$(get_libdir)/udev/ + doexe udev/compat_firmware.sh +} + +pkg_postinst() { + update_depmod + update_moduledb + einfo 'You may have problem if you do not run "depmod -ae" after this installation' + einfo 'To switch to the new drivers without reboot run unload.sh then load.sh' +} + +pkg_postrm() { + remove_moduledb +} diff --git a/net-wireless/compat-wireless/files/leds-disable.patch b/net-wireless/compat-wireless/files/leds-disable.patch new file mode 100644 index 000000000..521246c04 --- /dev/null +++ b/net-wireless/compat-wireless/files/leds-disable.patch @@ -0,0 +1,56 @@ +diff -Naur compat-wireless-2.6.35-rc2/config.mk /usr/src/patch_create/config.mk +--- compat-wireless-2.6.35-rc2/config.mk 2010-06-11 13:42:35.000000000 -0400 ++++ /usr/src/patch_create/config.mk 2010-06-11 13:41:23.000000000 -0400 +@@ -198,7 +198,7 @@ + ifneq ($(CONFIG_PCMCIA),) + CONFIG_B43_PCMCIA=y + endif +-CONFIG_B43_LEDS=y ++CONFIG_B43_LEDS=n + CONFIG_B43_PHY_LP=y + CONFIG_B43_NPHY=y + # CONFIG_B43_FORCE_PIO=y +@@ -207,7 +207,7 @@ + CONFIG_B43LEGACY=m + CONFIG_B43LEGACY_HWRNG=y + CONFIG_B43LEGACY_PCI_AUTOSELECT=y +-CONFIG_B43LEGACY_LEDS=y ++CONFIG_B43LEGACY_LEDS=n + # CONFIG_B43LEGACY_DEBUG=y + CONFIG_B43LEGACY_DMA=y + CONFIG_B43LEGACY_PIO=y +@@ -351,13 +351,13 @@ + + CONFIG_P54_USB=m + CONFIG_RTL8187=m +-CONFIG_RTL8187_LEDS=y ++CONFIG_RTL8187_LEDS=n + + CONFIG_AT76C50X_USB=m + + ifndef CONFIG_COMPAT_KERNEL_28 + CONFIG_AR9170_USB=m +-CONFIG_AR9170_LEDS=y ++CONFIG_AR9170_LEDS=n + endif + + CONFIG_ATH9K_HTC=m +@@ -446,7 +446,7 @@ + CONFIG_RT2X00_LIB_HT=y + CONFIG_RT2X00_LIB_FIRMWARE=y + CONFIG_RT2X00_LIB_CRYPTO=y +-CONFIG_RT2X00_LIB_LEDS=y ++CONFIG_RT2X00_LIB_LEDS=n + # CONFIG_RT2X00_DEBUG=y + # CONFIG_RT2X00_LIB_DEBUGFS + endif +@@ -457,7 +457,7 @@ + + # p54 + CONFIG_P54_COMMON=m +-CONFIG_P54_LEDS=y ++CONFIG_P54_LEDS=n + + # Atheros + CONFIG_ATH_COMMON=m +