From c3f556486eae3eaffb868ab8b65191026149b4e7 Mon Sep 17 00:00:00 2001
From: James Belchamber <james@belchamber.com>
Date: Sat, 17 Aug 2013 23:22:42 +0100
Subject: [PATCH 1/5] Added wildcard to mmcblk/loop if statement

This wound me up no end until I realised it was only checking for mmcblk0. My chromebook has mmcblk0 in use so the sd card was showing up as mmcblk1. It's also not inconceivable for people to have more than one SD card plugged in at once.
---
 packages/tools/bcm2835-bootloader/files/create_sdcard | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index a66a3cc5d7..3bd4f850dd 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
@@ -50,10 +50,10 @@ if [ -z "$1" ]; then
 fi
 
 DISK="$1"
-if [ "$DISK" = "/dev/mmcblk0" ]; then
+if [[ "$DISK" = "/dev/mmcblk"* ]]; then
   PART1="${DISK}p1"
   PART2="${DISK}p2"
-elif [ "$DISK" = "/dev/loop0" ]; then
+elif [[ "$DISK" = "/dev/loop"* ]]; then
   PART1="${DISK}p1"
   PART2="${DISK}p2"
   IMGFILE="$2"

From 76cc52961701f8632cc2d8735460ab650a87a27b Mon Sep 17 00:00:00 2001
From: James Belchamber <james@belchamber.com>
Date: Sun, 1 Sep 2013 12:41:19 +0100
Subject: [PATCH 2/5] Replaced if with case

Because bash is the devil ;)
---
 .../bcm2835-bootloader/files/create_sdcard    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index 3bd4f850dd..b0757618a1 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
@@ -50,18 +50,19 @@ if [ -z "$1" ]; then
 fi
 
 DISK="$1"
-if [[ "$DISK" = "/dev/mmcblk"* ]]; then
-  PART1="${DISK}p1"
-  PART2="${DISK}p2"
-elif [[ "$DISK" = "/dev/loop"* ]]; then
-  PART1="${DISK}p1"
-  PART2="${DISK}p2"
-  IMGFILE="$2"
-  losetup $DISK $IMGFILE
-else
-  PART1="${DISK}1"
-  PART2="${DISK}2"
-fi
+case $DISK in
+  "/dev/mmcblk1"*)
+    PART1="${DISK}p1";
+    PART2="${DISK}p2";;
+  "/dev/loop"*)
+    PART1="${DISK}p1";
+    PART2="${DISK}p2";
+    IMGFILE="$2";
+    losetup $DISK $IMGFILE;;
+  *)
+    PART1="${DISK}1";
+    PART2="${DISK}2";;
+esac
 
 clear
 echo "#########################################################"

From ca097d9222b855dd8c51b093f7f1e0f61557883c Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 1 Sep 2013 19:30:07 +0300
Subject: [PATCH 3/5] create_sdcard: cosmetics

---
 .../bcm2835-bootloader/files/create_sdcard    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index b0757618a1..8b6246f1f7 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -52,16 +52,19 @@ fi
 DISK="$1"
 case $DISK in
   "/dev/mmcblk1"*)
-    PART1="${DISK}p1";
-    PART2="${DISK}p2";;
+    PART1="${DISK}p1"
+    PART2="${DISK}p2"
+    ;;
   "/dev/loop"*)
-    PART1="${DISK}p1";
-    PART2="${DISK}p2";
-    IMGFILE="$2";
-    losetup $DISK $IMGFILE;;
+    PART1="${DISK}p1"
+    PART2="${DISK}p2"
+    IMGFILE="$2"
+    losetup $DISK $IMGFILE
+    ;;
   *)
-    PART1="${DISK}1";
-    PART2="${DISK}2";;
+    PART1="${DISK}1"
+    PART2="${DISK}2"
+    ;;
 esac
 
 clear

From 930cc191285b72bf745dff8ba38ed767d8341abc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 1 Sep 2013 18:31:44 +0200
Subject: [PATCH 4/5] bcm2835-bootloader: cosmetics

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../bcm2835-bootloader/files/create_sdcard    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index b0757618a1..8b6246f1f7 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -52,16 +52,19 @@ fi
 DISK="$1"
 case $DISK in
   "/dev/mmcblk1"*)
-    PART1="${DISK}p1";
-    PART2="${DISK}p2";;
+    PART1="${DISK}p1"
+    PART2="${DISK}p2"
+    ;;
   "/dev/loop"*)
-    PART1="${DISK}p1";
-    PART2="${DISK}p2";
-    IMGFILE="$2";
-    losetup $DISK $IMGFILE;;
+    PART1="${DISK}p1"
+    PART2="${DISK}p2"
+    IMGFILE="$2"
+    losetup $DISK $IMGFILE
+    ;;
   *)
-    PART1="${DISK}1";
-    PART2="${DISK}2";;
+    PART1="${DISK}1"
+    PART2="${DISK}2"
+    ;;
 esac
 
 clear

From 5556cf031ba1d15a94bb68b958d8a0e107b4cb43 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 1 Sep 2013 19:03:39 +0200
Subject: [PATCH 5/5] connman: update to connman-1.18

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index 11f3d875d3..d50df86684 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.17"
+PKG_VERSION="1.18"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"