From 97987d61abed87a649fb5506e5093a4384534c3c Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Fri, 28 Dec 2012 18:31:08 +0000
Subject: hack in progress

---
 freedom-maker/Makefile                               |  6 +++---
 freedom-maker/buildrootfs.sh                         |  4 ++--
 freedom-maker/copy2card.sh                           |  4 ++--
 freedom-maker/multistrap-configs/torouter-armhf.conf | 14 ++++++++++++++
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 freedom-maker/multistrap-configs/torouter-armhf.conf

diff --git a/freedom-maker/Makefile b/freedom-maker/Makefile
index 4b5a7f7..6627228 100644
--- a/freedom-maker/Makefile
+++ b/freedom-maker/Makefile
@@ -1,7 +1,7 @@
 # /usr/bin/make
 
 # armel amd64 i386
-ARCHITECTURE = armel
+ARCHITECTURE = armhf
 # dreamplug guruplug
 MACHINE = dreamplug
 # card usb
@@ -67,8 +67,8 @@ virtualbox-image: stamp-vbox-predepend
 
 # build the weekly test image
 weekly-image: image
-# if we aren't installing to an armel system, assume we need a bootloader.
-ifneq ($(ARCHITECTURE),armel)
+# if we aren't installing to an armhf system, assume we need a bootloader.
+ifneq ($(ARCHITECTURE),armhf)
 # also, try my best to protect users from themselves:
 ifneq ($(DEVICE),/dev/sda)
 	sudo grub-install $(DEVICE)
diff --git a/freedom-maker/buildrootfs.sh b/freedom-maker/buildrootfs.sh
index 7ac69ad..ac50c84 100755
--- a/freedom-maker/buildrootfs.sh
+++ b/freedom-maker/buildrootfs.sh
@@ -35,8 +35,8 @@
 # We don't tolerate errors.
 set -e
 
-architecture='armel'
-kernelversion='3.2.0-3-kirkwood'
+architecture='armhf'
+kernelversion='3.2.0-4-mx5'
 if [ -n "$1" ]
 then
     architecture=$1
diff --git a/freedom-maker/copy2card.sh b/freedom-maker/copy2card.sh
index 0a5208d..807502f 100755
--- a/freedom-maker/copy2card.sh
+++ b/freedom-maker/copy2card.sh
@@ -27,7 +27,7 @@ fi
 echo "mounting rootdev..."
 mount $ROOTDEV /mnt
 echo "rsyncing over rootfs"
-rsync -atv --progress --delete --exclude=boot build/armel/ /mnt/
+rsync -atv --progress --delete --exclude=boot build/armhf/ /mnt/
 echo "sync filesystems..."
 sync
 echo "un-mounting rootdev..."
@@ -36,7 +36,7 @@ umount /mnt
 echo "mounting bootdev..."
 mount $BOOTDEV /mnt
 echo "copying boot files..."
-cp -v build/armel/boot/* /mnt
+cp -v build/armhf/boot/* /mnt
 echo "sync filesystems..."
 sync
 echo "un-mounting bootdev..."
diff --git a/freedom-maker/multistrap-configs/torouter-armhf.conf b/freedom-maker/multistrap-configs/torouter-armhf.conf
new file mode 100644
index 0000000..2a1f6b6
--- /dev/null
+++ b/freedom-maker/multistrap-configs/torouter-armhf.conf
@@ -0,0 +1,14 @@
+[General]
+include=torouter-base.conf
+arch=armel
+aptsources=Debian torproject torouter armhf 
+debootstrap=Debian torproject torouter armhf
+
+[armel]
+packages=linux-image-3.2.0-4-mx5 flash-kernel u-boot-tools u-boot wireless-tools
+source=http://http.debian.net/debian/
+keyring=debian-archive-keyring
+suite=wheezy
+components=main
+omitdebsrc=false
+
-- 
cgit v1.2.3