From c8008b9253cd1971cf40ad0acbb7972f07508f4f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 20 Aug 2016 20:58:18 +0000
Subject: [PATCH] alarm/uboot-odroid-xu3 to 2016.07-2

---
 alarm/uboot-odroid-xu3/PKGBUILD                 | 2 +-
 alarm/uboot-odroid-xu3/uboot-odroid-xu3.install | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/alarm/uboot-odroid-xu3/PKGBUILD b/alarm/uboot-odroid-xu3/PKGBUILD
index 58ada6a22..1b9afff6b 100644
--- a/alarm/uboot-odroid-xu3/PKGBUILD
+++ b/alarm/uboot-odroid-xu3/PKGBUILD
@@ -5,7 +5,7 @@ buildarch=4
 
 pkgname=uboot-odroid-xu3
 pkgver=2016.07
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot for ODROID-XU3"
 arch=('armv7h')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
diff --git a/alarm/uboot-odroid-xu3/uboot-odroid-xu3.install b/alarm/uboot-odroid-xu3/uboot-odroid-xu3.install
index f443d283d..b65c2ac81 100644
--- a/alarm/uboot-odroid-xu3/uboot-odroid-xu3.install
+++ b/alarm/uboot-odroid-xu3/uboot-odroid-xu3.install
@@ -36,8 +36,13 @@ sd_fuse() {
 }
 
 flash_uboot() {
-  major=$(mountpoint -d / | cut -f 1 -d ':')
-  minor=$(expr $(mountpoint -d / | cut -f 2 -d ':') - 1)
+  if mountpoint -d /boot > /dev/null 2>&1; then
+    base=/boot
+  else
+    base=/
+  fi
+  major=$(mountpoint -d $base | cut -f 1 -d ':')
+  minor=$(expr $(mountpoint -d $base | cut -f 2 -d ':') - 1)
   device=$(cat /proc/partitions | awk {'if ($1 == "'${major}'" && $2 == "'${minor}'") print $4 '})
 
   echo "A new U-Boot version needs to be flashed onto /dev/${device}."