update uap_hack install script to build from qemu

5 files changed, 21 insertions, 36 deletions

diff --git a/freedom-maker/bin/packages-chroot b/freedom-maker/bin/packages-chroot
index c70249d..3617331 100755
--- a/freedom-maker/bin/packages-chroot
+++ b/freedom-maker/bin/packages-chroot
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# try to install locally-sourced torouter .deb files
+echo "Installing extra/local override .deb files..."
 dpkg -i /tmp/dpkg/*.deb
 
-# try to install libertas_uap hack
-cd /tmp/uap_hack/dreamplug_libertas && ./install_$kernelversion.sh
+echo "Installing libertas_uap hack..."
+cd /tmp/uap_hack/dreamplug_libertas && ./install.sh $kernelversion
 
diff --git a/freedom-maker/multistrap-configs/torouter-base.conf b/freedom-maker/multistrap-configs/torouter-base.conf
index 45945a7..cda5bba 100644
--- a/freedom-maker/multistrap-configs/torouter-base.conf
+++ b/freedom-maker/multistrap-configs/torouter-base.conf
@@ -6,7 +6,7 @@ debootstrap=Debian torproject torouter
 aptsources=Debian torproject torouter
 
 [Debian]
-packages=base-files netbase openssh-server zile wget iproute net-tools hostname module-init-tools wget resolvconf udev isc-dhcp-client ifupdown devio initramfs-tools uboot-mkimage parted dosfstools apt iputils-ping haveged python pandoc python-simplejson make isc-dhcp-server dialog locales-all uaputl uapevent dnsmasq iptables vim-nox less screen lsof tcptraceroute traceroute mtr-tiny openntpd dnsmasq unbound python-augeas python-flask python-daemon cron iw
+packages=base-files netbase openssh-server zile wget iproute net-tools hostname module-init-tools wget resolvconf udev isc-dhcp-client ifupdown devio initramfs-tools uboot-mkimage parted dosfstools apt iputils-ping haveged python pandoc python-simplejson make isc-dhcp-server dialog locales-all uaputl uapevent dnsmasq iptables vim-nox less screen lsof tcptraceroute traceroute mtr-tiny openntpd dnsmasq unbound python-augeas python-flask python-daemon cron iw python-setuptools  apt-util python-distribute
 source=http://http.debian.net/debian/
 keyring=debian-archive-keyring
 suite=wheezy
diff --git a/uap_hack/dreamplug_libertas/install.sh b/uap_hack/dreamplug_libertas/install.sh
new file mode 100755
index 0000000..0046a5a
--- /dev/null
+++ b/uap_hack/dreamplug_libertas/install.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+if [ -n "$1" ]
+then
+    kernelversion=$1
+else
+    echo "Need to specify a kernel version!" > /dev/stderr
+    exit 1
+fi
+
+mkdir -p /lib/modules/$kernelversion/kernel/drivers/net/wireless/libertas_uap
+cp uap8xxx.ko-$kernerlversion /lib/modules/$kernelversion/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
+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/install_3.2.0-3-kirkwood.sh b/uap_hack/dreamplug_libertas/install_3.2.0-3-kirkwood.sh
deleted file mode 100755
index 2078d1a..0000000
--- a/uap_hack/dreamplug_libertas/install_3.2.0-3-kirkwood.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if ! [ `uname -r` = "3.2.0-3-kirkwood" ]
-then
-    echo "Got: `uname -r`, need 3.2.0-3-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/install_3.2.9-kirkwood.sh b/uap_hack/dreamplug_libertas/install_3.2.9-kirkwood.sh
deleted file mode 100755
index 47d6902..0000000
--- a/uap_hack/dreamplug_libertas/install_3.2.9-kirkwood.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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