From 786656bb5a415da0b64a3b4110a1f4797a768570 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Dec 2012 00:43:32 +0000
Subject: [PATCH 1/6] Avoid error with missing git repo when using rpi-update
 <hash> for first time

---
 rpi-update | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rpi-update b/rpi-update
index c087c72..aa35ab7 100755
--- a/rpi-update
+++ b/rpi-update
@@ -94,7 +94,9 @@ function finalise {
 		cp "${FW_PATH}/arm192_start.elf" "${FW_PATH}/start.elf"
 	fi
 	ldconfig -r "${ROOT_PATH}"
-	eval ${GITCMD} rev-parse master > "${FW_PATH}/.firmware_revision"
+	if [[ ${FW_REV} == "" ]]; then
+		eval ${GITCMD} rev-parse master > "${FW_PATH}/.firmware_revision"
+	fi
 	sync
 }
 

From 3a3fa3b6211371a990b1ef676cbb349dda3ee950 Mon Sep 17 00:00:00 2001
From: Sam Nazarko <samnazarko@stmteam.com>
Date: Tue, 25 Dec 2012 16:09:09 +0000
Subject: [PATCH 2/6] Ensure that rpi-update will not update unsupported
 distributions

---
 rpi-update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rpi-update b/rpi-update
index aa35ab7..e8c3f85 100755
--- a/rpi-update
+++ b/rpi-update
@@ -11,13 +11,14 @@ UPDATE_URI="https://github.com/Hexxeh/rpi-update/raw/master/rpi-update"
 ROOT_PATH=${ROOT_PATH:-"/"}
 BOOT_PATH=${BOOT_PATH:-"/boot"}
 SKIP_KERNEL=${SKIP_KERNEL:-0}
+RPI_UPDATE_UNSUPPORTED=${RPI_UPDATE_UNSUPPORTED:-0}
 FW_REPO="${REPO_URI}.git"
 FW_REPOLOCAL="${ROOT_PATH}/root/.rpi-firmware"
 FW_PATH="${BOOT_PATH}"
 FW_MODPATH="${ROOT_PATH}/lib/modules"
 FW_REV=${1:-""}
 GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\""
-
+[ "$RPI_UPDATE_UNSUPPORTED" -eq 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run\nRPI_UPDATE_UNSUPPORTED=1 sudo ./rpi-update; exit 1
 function update_self() {
 	echo "Performing self-update"
 	_tempFileName="$0.tmp"

From 91ef0f2b390b9e28ebfecdc94d48b4e850f24e1f Mon Sep 17 00:00:00 2001
From: Liam McLoughlin <hexxeh@hexxeh.net>
Date: Tue, 25 Dec 2012 23:47:30 +0000
Subject: [PATCH 3/6] Fix missing quote

---
 rpi-update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rpi-update b/rpi-update
index dfa63fa..e73e103 100755
--- a/rpi-update
+++ b/rpi-update
@@ -24,7 +24,8 @@ FW_PATH="${BOOT_PATH}"
 FW_MODPATH="${ROOT_PATH}/lib/modules"
 FW_REV=${1:-""}
 GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\""
-[ "$RPI_UPDATE_UNSUPPORTED" -eq 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run\nRPI_UPDATE_UNSUPPORTED=1 sudo ./rpi-update; exit 1
+[ "${RPI_UPDATE_UNSUPPORTED}" -eq 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nRPI_UPDATE_UNSUPPORTED=1 sudo ./rpi-update"; exit 1
+
 function update_self() {
 	echo "Performing self-update"
 	_tempFileName="$0.tmp"

From e3dea3de5cb077c77d0630b625a28c9f5a5b63ca Mon Sep 17 00:00:00 2001
From: Liam McLoughlin <hexxeh@hexxeh.net>
Date: Wed, 26 Dec 2012 04:09:43 +0000
Subject: [PATCH 4/6] Fix more breakage

---
 rpi-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpi-update b/rpi-update
index e73e103..796f4f2 100755
--- a/rpi-update
+++ b/rpi-update
@@ -24,7 +24,7 @@ FW_PATH="${BOOT_PATH}"
 FW_MODPATH="${ROOT_PATH}/lib/modules"
 FW_REV=${1:-""}
 GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\""
-[ "${RPI_UPDATE_UNSUPPORTED}" -eq 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nRPI_UPDATE_UNSUPPORTED=1 sudo ./rpi-update"; exit 1
+[ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=1 ./rpi-update" && exit 1
 
 function update_self() {
 	echo "Performing self-update"

From 785ef68a1121a180db51f93d4ba6634df1fc109c Mon Sep 17 00:00:00 2001
From: Liam McLoughlin <hexxeh@hexxeh.net>
Date: Wed, 26 Dec 2012 22:25:27 +0000
Subject: [PATCH 5/6] Fix message outputted on unsupported distros

---
 rpi-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpi-update b/rpi-update
index 796f4f2..a56450e 100755
--- a/rpi-update
+++ b/rpi-update
@@ -24,7 +24,7 @@ FW_PATH="${BOOT_PATH}"
 FW_MODPATH="${ROOT_PATH}/lib/modules"
 FW_REV=${1:-""}
 GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\""
-[ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=1 ./rpi-update" && exit 1
+[ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=0 ./rpi-update" && exit 1
 
 function update_self() {
 	echo "Performing self-update"

From 46e33f1793fe678aee6dbc1c8ad6e23b88c60e4c Mon Sep 17 00:00:00 2001
From: Tom Parker <palfrey@tevp.net>
Date: Fri, 28 Dec 2012 16:01:24 +0000
Subject: [PATCH 6/6] "<" and ">" need escaping in markdown

The "<git hash>" bit doesn't display in github
---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a624047..8884864 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,7 @@ sudo rpi-update
 
 To upgrade/downgrade to a specific firmware revision, specify it's Git hash as follows:
 
-<pre>
-rpi-update <git hash>
-</pre>
+    rpi-update <git hash>
 
 If you'd like to set a different GPU/ARM memory split, then define gpu_mem in /boot/config.txt.