compat-wireless 2.6.31-rc4 the hacked up way, can't make "the gentoo way" work

This commit is contained in:
Zero_Chaos 2009-07-30 21:12:43 +00:00
parent 7ce3445cf2
commit c8b2b8c880
3 changed files with 196 additions and 0 deletions

View file

@ -9,8 +9,11 @@ AUX failed_ipw2200_ipw2200-1.2.1-inject.patch 2207 RMD160 b7ff866af15d91bc882f8c
AUX failed_linux-wlanng-kernel-2.6.28.patch 11623 RMD160 23d11bb21ba059b7a0d7a2c597e5ae8224670dde SHA1 8d8d11912160dd8b38b805c928ea746ff9192ba8 SHA256 fd4bd200617c5f28e3a0ae58e5fa02f80279ad98aafed6c2e3d5b249a9b617c6
AUX failed_openembedded-orinoco-remove-all-which-are-in-hostap-HACK.patch 6606 RMD160 e479eb0e796aec521e2269d50e9ccc4426e1da55 SHA1 c76220bb8f3a118a224e555517b7e111603da47e SHA256 6b761693587871591fc0ce96273d37f769f61d28f637c1692d931300c4f04504
AUX rtl8187-led-blink_possibly-final.patch 11251 RMD160 0ab750cec11d4e6df33f0c101e9f0dd47185aa28 SHA1 2038890a4dacc4ea7e6b8001e7dc6dcfd88a1cef SHA256 61b99c912768a013febc7ca9c9d1280c705e4ccbab8bf4610391b4b6d68e96b3
AUX whynot-2.6.31.patch 4272 RMD160 74ec1c66cfb376cf2c83401aa3edcdbfdd019438 SHA1 18f5680625ad68ebba773c8f39a04edf6456e2f2 SHA256 a1839efde553fb6c78b7121f94a3dc5401c146f9ff3e017e61de1b0298f4b371
AUX whynot.patch 4106 RMD160 ac38e8dbbe1a59607fe16b36f327a9ba73a001e7 SHA1 2208598c9f9811d368db099c863be2a2af11681e SHA256 956cf3a0a8b8e1f0f0e3df985e351799f325a44e4cddf042d677a9e8109b7c9e
DIST compat-wireless-2.6.30-rc6.tar.bz2 1678784 RMD160 f0d69b99d37732a39ba01fdd869d150db8a55037 SHA1 1e91215069ba8cd46654836279dacc964d9dc854 SHA256 6b2beba044860624d44a0a8cc5a701b1243d9dd89f7d028daca12b4ca41d6512
DIST compat-wireless-2.6.30.tar.bz2 1677694 RMD160 814840138db96509a1e2bf35c6168227eb3a81f3 SHA1 bb2e23ce12afce2f76fdab56374f5f23ed2f0082 SHA256 318ebfc345923d8f99137923296384f1eaa6c496faf3bccbaa4dbd64155b0613
DIST compat-wireless-2.6.31-rc4.tar.bz2 1837069 RMD160 1f54bc55f06db5052dfa7a012f26066a787e4ec5 SHA1 8aef7bacf403b7eff313e7992ec07d20f9d37ac5 SHA256 9f0f58775872a950be6a0e11e6687f4a31e1566a2da568e0534de1589bbdd0ff
EBUILD compat-wireless-2.6.30.ebuild 3389 RMD160 1eea3ef67a627df083f65bc84d62439bd0c12b12 SHA1 8f143cc406d583fafad08332e02a9552f290d75c SHA256 0a08cd49f0c4a4d1fef41dcaf7906c179cbb23a7193a6708e0f3f3901b71c115
EBUILD compat-wireless-2.6.30_rc6.ebuild 3324 RMD160 d6372701d7ae635497eefb0b7ead25ea8c71fd4a SHA1 82565ba3f3a61ab7c1a17f2b159e24e5e71b708e SHA256 d3ab1be0727d5566ae1d2769874418119bf3884a217ccf03e03fa26c6786b6ce
EBUILD compat-wireless-2.6.31_rc4.ebuild 1836 RMD160 ff487a43c796c2d759ed6507372ff9153bb92699 SHA1 7cd08df4e6ddc009d11b082523e98f4244fa6a0f SHA256 75b0eda287817bd955592c154de53964bb032cd0d4e0e3f26971f904d4c69eaf

View file

@ -0,0 +1,64 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
##Stable
MY_P=${P/_rc/-rc}
SRC_URI="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.30/${MY_P}.tar.bz2"
##Dailies
#MY_P=${P//./-}
#SRC_URI="http://wireless.kernel.org/download/compat-wireless-2.6/${MY_P}.tar.bz2"
inherit linux-mod linux-info
DEPEND=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kernel_linux +injection"
S=${WORKDIR}/${MY_P}
CONFIG_CHECK="!DYNAMIC_FTRACE"
RESTRICT="strip"
pkg_setup() {
linux-mod_pkg_setup
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_compile() {
if use injection; then epatch "${FILESDIR}"/400[024]_*.patch; fi
# if use injection; then epatch "${FILESDIR}"/4012_*.patch; fi
epatch "${FILESDIR}"/whynot-2.6.31.patch
# epatch "${FILESDIR}"/rtl8187-led-blink_possibly-final.patch
addpredict "${KERNEL_DIR}"
# addpredict /lib/modules/"${KV_FULL}"
# sed -e 's/(MAKE)/(MAKE) ARCH=$(ARCH)/g' -i Makefile
use amd64 && export ARCH="x86_64"
use x86 && export ARCH="x86"
emake KVER="${KV_FULL}" || die "emake failed"
}
src_install() {
for file in `find ./ -name \*.ko`
do
MY_DIR="/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
dodir "${MY_DIR}"
insinto "${MY_DIR}"
doins "${file}"
done
# dodir /lib/modules/${KV_FULL}/updates
# emake KVER="${KV_FULL}" DESTDIR="${D}" KMODDIR_ARG="INSTALL_MOD_DIR=updates" KMODPATH_ARG="INSTALL_MOD_PATH=${D}" install || die "install failed"
dodoc README || die
}
pkg_postinst() {
update_depmod
}

View file

@ -0,0 +1,129 @@
diff -Naur compat-wireless-2.6.31-rc4-orig/Makefile compat-wireless-2.6.31-rc4/Makefile
--- compat-wireless-2.6.31-rc4-orig/Makefile 2009-07-22 17:27:26.000000000 -0400
+++ compat-wireless-2.6.31-rc4/Makefile 2009-07-30 16:35:59.000000000 -0400
@@ -3,13 +3,9 @@
ifneq ($(origin $(KLIB)), undefined)
KMODPATH_ARG:= "INSTALL_MOD_PATH=$(KLIB)"
else
-export KLIB:= /lib/modules/$(shell uname -r)
+export KLIB:= $(DESTDIR)/lib/modules/$(KVER)
endif
export KLIB_BUILD ?= $(KLIB)/build
-# Sometimes not available in the path
-MODPROBE := /sbin/modprobe
-MADWIFI=$(shell $(MODPROBE) -l ath_pci)
-OLD_IWL=$(shell $(MODPROBE) -l iwl4965)
ifneq ($(KERNELRELEASE),)
@@ -62,34 +58,19 @@
$(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \
modules_install
@# All the scripts we can use
- @mkdir -p /usr/lib/compat-wireless/
- @install scripts/modlib.sh /usr/lib/compat-wireless/
- @install scripts/madwifi-unload /usr/sbin/
+ @mkdir -p $(DESTDIR)/usr/lib/compat-wireless/
+ @install scripts/modlib.sh $(DESTDIR)/usr/lib/compat-wireless/
+ @mkdir -p $(DESTDIR)/usr/sbin/
+ @install scripts/madwifi-unload $(DESTDIR)/usr/sbin/
+
@# This is to allow switching between drivers without blacklisting
- @install scripts/athenable /usr/sbin/
- @install scripts/b43enable /usr/sbin/
- @install scripts/iwl-enable /usr/sbin/
- @install scripts/athload /usr/sbin/
- @install scripts/b43load /usr/sbin/
- @install scripts/iwl-load /usr/sbin/
- @if [ ! -z $(MADWIFI) ]; then \
- echo ;\
- echo -n "Note: madwifi detected, we're going to disable it. " ;\
- echo "If you would like to enable it later you can run:" ;\
- echo " sudo athenable madwifi" ;\
- echo ;\
- echo Running athenable ath5k...;\
- /usr/sbin/athenable ath5k ;\
- fi
- @if [ ! -z $(OLD_IWL) ]; then \
- echo ;\
- echo -n "Note: iwl4965 detected, we're going to disable it. " ;\
- echo "If you would like to enable it later you can run:" ;\
- echo " sudo iwl-load iwl4965" ;\
- echo ;\
- echo Running iwl-enable iwlagn...;\
- /usr/sbin/iwl-enable iwlagn ;\
- fi
+ @install scripts/athenable ${DESTDIR}/usr/sbin/
+ @install scripts/b43enable ${DESTDIR}/usr/sbin/
+ @install scripts/iwl-enable ${DESTDIR}/usr/sbin/
+ @install scripts/athload ${DESTDIR}/usr/sbin/
+ @install scripts/b43load ${DESTDIR}/usr/sbin/
+ @install scripts/iwl-load ${DESTDIR}/usr/sbin/
+
@# If on distributions like Mandriva which like to
@# compress their modules this will find out and do
@# it for you. Reason is some old version of modutils
@@ -100,62 +81,7 @@
@# the updates/ dir which is what we use so we add one for it
@# (or any other distribution that doens't have this).
@./scripts/check_depmod
- @/sbin/depmod -ae
- @echo
- @echo "Currently detected wireless subsystem modules:"
- @echo
- @$(MODPROBE) -l mac80211
- @$(MODPROBE) -l cfg80211
- @$(MODPROBE) -l lib80211
- @$(MODPROBE) -l adm8211
- @$(MODPROBE) -l ar9170usb
- @$(MODPROBE) -l at76c50x-usb
- @$(MODPROBE) -l ath
- @$(MODPROBE) -l ath5k
- @$(MODPROBE) -l ath9k
- @$(MODPROBE) -l b43
- @$(MODPROBE) -l b43legacy
- @$(MODPROBE) -l b44
- @$(MODPROBE) -l cdc_ether
- @$(MODPROBE) -l eeprom_93cx6
- @$(MODPROBE) -l ipw2100
- @$(MODPROBE) -l ipw2200
- @$(MODPROBE) -l iwl3945
- @$(MODPROBE) -l iwlagn
- @$(MODPROBE) -l iwlcore
- @$(MODPROBE) -l lib80211_crypt_ccmp
- @$(MODPROBE) -l lib80211_crypt_tkip
- @$(MODPROBE) -l lib80211_crypt_wep
- @$(MODPROBE) -l libertas
- @$(MODPROBE) -l libertas_cs
- @$(MODPROBE) -l libertas_sdio
- @$(MODPROBE) -l libertas_spi
- @$(MODPROBE) -l libertas_tf
- @$(MODPROBE) -l libertas_tf_usb
- @$(MODPROBE) -l libipw
- @$(MODPROBE) -l mac80211_hwsim
- @$(MODPROBE) -l mwl8k
- @$(MODPROBE) -l p54common
- @$(MODPROBE) -l p54pci
- @$(MODPROBE) -l p54spi
- @$(MODPROBE) -l p54usb
- @$(MODPROBE) -l rndis_host
- @$(MODPROBE) -l rndis_wlan
- @$(MODPROBE) -l rt2400pci
- @$(MODPROBE) -l rt2500pci
- @$(MODPROBE) -l rt2500usb
- @$(MODPROBE) -l rt2x00lib
- @$(MODPROBE) -l rt2x00pci
- @$(MODPROBE) -l rt2x00usb
- @$(MODPROBE) -l rt61pci
- @$(MODPROBE) -l rt73usb
- @$(MODPROBE) -l rtl8180
- @$(MODPROBE) -l rtl8187
- @$(MODPROBE) -l ssb
- @$(MODPROBE) -l usb8xxx
- @$(MODPROBE) -l usbnet
- @$(MODPROBE) -l zd1211rw
- @echo
+
@echo Now run:
@echo
@echo make unload