From c612fe559603494a01965a172b8d6d08ae9dba6b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 28 Nov 2011 09:19:44 -0600
Subject: [PATCH] add --arch to accomondate rcn-ee.net dir changes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index ae20cf7..5e695fe 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -42,6 +42,7 @@ DI_BROKEN_USE_CROSS=1
 
 MIRROR="http://rcn-ee.net/deb/"
 DIST=squeeze
+ARCH=armel
 
 BOOT_LABEL=boot
 PARTITION_PREFIX=""
@@ -185,14 +186,14 @@ function dl_kernel_image {
  fi
 
  if [ ! "${KERNEL_DEB}" ] ; then
-  wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ http://rcn-ee.net/deb/${DIST}/LATEST-${SUBARCH}
+  wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ http://rcn-ee.net/deb/${DIST}-${ARCH}/LATEST-${SUBARCH}
   FTP_DIR=$(cat ${TEMPDIR}/dl/LATEST-${SUBARCH} | grep "ABI:1 ${KERNEL_SEL}" | awk '{print $3}')
   FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $6}')
   KERNEL=$(echo ${FTP_DIR} | sed 's/v//')
 
-  wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ http://rcn-ee.net/deb/${DIST}/${FTP_DIR}/
+  wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ http://rcn-ee.net/deb/${DIST}-${ARCH}/${FTP_DIR}/
   ACTUAL_DEB_FILE=$(cat ${TEMPDIR}/dl/index.html | grep linux-image | awk -F "\"" '{print $2}')
-  wget -c --directory-prefix=${DIR}/dl/${DIST} ${MIRROR}${DIST}/v${KERNEL}/${ACTUAL_DEB_FILE}
+  wget -c --directory-prefix=${DIR}/dl/${DIST} ${MIRROR}${DIST}-${ARCH}/v${KERNEL}/${ACTUAL_DEB_FILE}
   if [ "${DI_BROKEN_USE_CROSS}" ] ; then
    CROSS_DEB_FILE=$(echo ${ACTUAL_DEB_FILE} | sed 's:'${DIST}':cross:g')
    wget -c --directory-prefix=${DIR}/dl/${DIST} ${MIRROR}cross/v${KERNEL}/${CROSS_DEB_FILE}
@@ -1311,12 +1312,14 @@ function check_distro {
  if test "-$DISTRO_TYPE-" = "-squeeze-"
  then
  DIST=squeeze
+ ARCH=armel
  unset IN_VALID_DISTRO
  fi
 
  if test "-$DISTRO_TYPE-" = "-maverick-"
  then
  DIST=maverick
+ ARCH=armel
  unset DI_BROKEN_USE_CROSS
  unset IN_VALID_DISTRO
  fi
@@ -1324,6 +1327,7 @@ function check_distro {
  if test "-$DISTRO_TYPE-" = "-oneiric-"
  then
  DIST=oneiric
+ ARCH=armel
  unset DI_BROKEN_USE_CROSS
  unset IN_VALID_DISTRO
  fi
@@ -1331,6 +1335,7 @@ function check_distro {
  if test "-$DISTRO_TYPE-" = "-natty-"
  then
  DIST=natty
+ ARCH=armel
  unset DI_BROKEN_USE_CROSS
  unset IN_VALID_DISTRO
  fi
@@ -1346,6 +1351,26 @@ function check_distro {
  fi
 }
 
+function check_arch {
+ IN_VALID_ARCH=1
+
+ if test "-$ARCH_TYPE-" = "-armel-"
+ then
+ ARCH=armel
+ unset IN_VALID_ARCH
+ fi
+
+ if test "-$ARCH_TYPE-" = "-armhf-"
+ then
+ ARCH=armhf
+ unset IN_VALID_ARCH
+ fi
+
+ if [ "$IN_VALID_ARCH" ] ; then
+   usage
+ fi
+}
+
 function usage {
     echo "usage: sudo $(basename $0) --mmc /dev/sdX --uboot <dev board>"
 cat <<EOF
@@ -1376,6 +1401,10 @@ Optional:
       natty
       oneiric
 
+--arch
+    armel <default>
+    armhf <disabled, should be available in Debian Wheezy/Ubuntu Precise>
+
 --addon <device>
     pico
     ulcd <beagle xm>
@@ -1436,7 +1465,7 @@ while [ ! -z "$1" ]; do
 	        PARTITION_PREFIX="p"
             fi
             find_issue
-            check_mmc 
+            check_mmc
             ;;
         --uboot)
             checkparm $2
@@ -1448,6 +1477,11 @@ while [ ! -z "$1" ]; do
             DISTRO_TYPE="$2"
             check_distro
             ;;
+        --arch)
+            checkparm $2
+            ARCH_TYPE="$2"
+            check_arch
+            ;;
         --firmware)
             FIRMWARE=1
             ;;