11 files changed, 77 insertions, 1 deletions
diff --git a/freedom-maker/bin/packages b/freedom-maker/bin/packages
index 15d17a4..263e0db 100755
--- a/freedom-maker/bin/packages
+++ b/freedom-maker/bin/packages
@@ -25,8 +25,10 @@
 set -e
 
 echo "Adding extra torouter stuff..."
+mkdir -p $target/tmp/uap_hack
 mkdir -p $homedir/uap_hack
-cp -v $basedir/../../uap_hack/* $homedir/uap_hack
+cp -r $basedir/../../uap_hack/* $target/tmp/uap_hack
+cp -r $basedir/../../uap_hack/* $homedir/uap_hack
 mkdir -p $homedir/src
 git clone $basedir/../.. $homedir/src/torouter
 mkdir -p $target/tmp/dpkg
diff --git a/freedom-maker/bin/packages-chroot b/freedom-maker/bin/packages-chroot
index 42020c4..f2f0e4c 100755
--- a/freedom-maker/bin/packages-chroot
+++ b/freedom-maker/bin/packages-chroot
@@ -1,4 +1,8 @@
 #! /bin/sh
 
+# try to install locally-sourced torouter .deb files
 dpkg -i /tmp/dpkg/*.deb
 
+# try to install libertas_uap hack
+cd /tmp/uap_hack/dreamplug_libertas_$(uname -r) && ./install.sh
+
diff --git a/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/helper_sd.bin b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/helper_sd.bin
new file mode 100755
index 0000000..746ae0b
--- /dev/null
+++ b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/helper_sd.bin
diff --git a/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688.bin b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688.bin
new file mode 100755
index 0000000..507b9c1
--- /dev/null
+++ b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688.bin
diff --git a/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688_ap.bin b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688_ap.bin
new file mode 100755
index 0000000..d3b042b
--- /dev/null
+++ b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688_ap.bin
diff --git a/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688_helper.bin b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688_helper.bin
new file mode 100644
index 0000000..746ae0b
--- /dev/null
+++ b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/firmware/mrvl/sd8688_helper.bin
diff --git a/uap_hack/dreamplug_libertas_3.2.9-kirkwood/install.sh b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/install.sh
new file mode 100755
index 0000000..47d6902
--- /dev/null
+++ b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/install.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if ! [ `uname -r` = "3.2.9-kirkwood" ]
+then
+    echo "Got: `uname -r`, need 3.2.9-kirkwood"
+    echo "Wrong kernel version, binary module won't work. Try a source install?"
+    exit 1
+fi
+
+mkdir /lib/modules/$(uname -r)/kernel/drivers/net/wireless/libertas_uap
+cp uap8xxx.ko-$(uname -r) /lib/modules/$(uname -r)/kernel/drivers/net/wireless/libertas_uap
+depmod -a
+cp -r firmware/mrvl /lib/firmware/mrvl
+cp modprobe_libertas_uap.conf /etc/modprobe.d/libertas_uap
diff --git a/uap_hack/dreamplug_libertas_3.2.9-kirkwood/modprobe_libertas_uap.conf b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/modprobe_libertas_uap.conf
new file mode 100644
index 0000000..0339023
--- /dev/null
+++ b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/modprobe_libertas_uap.conf
@@ -0,0 +1,5 @@
+# blacklist competing modules for the same hardware
+# used by libertas_uap (uap8xxx.ko)
+blacklist libertas_sdio
+blacklist libertas
+
diff --git a/uap_hack/dreamplug_libertas_3.2.9-kirkwood/uap8xxx.ko-3.2.9-kirkwood b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/uap8xxx.ko-3.2.9-kirkwood
new file mode 100644
index 0000000..540f74f
--- /dev/null
+++ b/uap_hack/dreamplug_libertas_3.2.9-kirkwood/uap8xxx.ko-3.2.9-kirkwood
diff --git a/uap_hack/install_binary.sh b/uap_hack/install_binary.sh
new file mode 100755
index 0000000..fcc0348
--- /dev/null
+++ b/uap_hack/install_binary.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+if ! [ `uname -r` = "3.2.9-kirkwood" ]
+then
+    echo "Got: `uname -r`, need 3.2.9-kirkwood"
+    echo "Wrong kernel version, binary module won't work. Try a source install?"
+    exit 1
+fi
+
+echo "git fetching kernel module binaries..."
+rm -rf /tmp/dpla
+git clone --depth 1 http://github.com/bnewbold/dreamplug-libertas_uap dreamplug-libertas_uap
+cd dreamplug-libertas_uap
+
+echo "installing..."
+mkdir -v /lib/modules/$(uname -r)/kernel/drivers/net/wireless/libertas_uap
+cp -v uap8xxx.ko-3.2.9-kirkwood /lib/modules/$(uname -r)/kernel/drivers/net/wireless/libertas_uap
+depmod -a
+cp -vr firmware/mrvl /lib/firmware/mrvl
+cp -v modprobe_libertas_uap.conf /etc/modprobe.d/libertas_uap
+
+echo "installed, probably need to reboot now?"
diff --git a/uap_hack/install_src.sh b/uap_hack/install_src.sh
new file mode 100755
index 0000000..b7673d7
--- /dev/null
+++ b/uap_hack/install_src.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+echo "installing required packages..."
+apt-get update
+apt-get install module-assistant linux-headers-kirkwood build-essentials
+
+echo "git fetching kernel module src..."
+rm -rf /tmp/dpla
+git clone --depth 1 http://github.com/bnewbold/dreamplug-libertas_uap /tmp/dpla
+
+echo "building..."
+cd /tmp/dpla/libertas_uap
+make CONFIG_LIBERTAS_UAP=m -C /lib/modules/$(uname -r)/build M=$(pwd)
+
+echo "installing..."
+mkdir -v /lib/modules/$(uname -r)/kernel/drivers/net/wireless/libertas_uap
+cp -v uap8xxx.ko-3.2.9-kirkwood /lib/modules/$(uname -r)/kernel/drivers/net/wireless/libertas_uap
+depmod -a
+cd ..
+cp -vr firmware/mrvl /lib/firmware/mrvl
+cp -v modprobe_libertas_uap.conf /etc/modprobe.d/libertas_uap
+
+echo "installed, probably need to reboot now?"