From 7e83801d169512477a5dcc628a7400926f9b8d97 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Feb 2015 16:33:21 +0100
Subject: [PATCH] noobs: add support for noobs 'supported_hex_versions'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/noobs/os.json  | 5 ++++-
 projects/RPi/options  | 2 ++
 projects/RPi2/options | 2 ++
 scripts/image         | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/noobs/os.json b/config/noobs/os.json
index 0e47c8e09e..5f085aaccb 100644
--- a/config/noobs/os.json
+++ b/config/noobs/os.json
@@ -3,5 +3,8 @@
   "version": "@OPENELEC_VERSION@",
   "release_date": "@RELEASE_DATE@",
   "kernel": "@KERNEL_VERSION@",
-  "description": "@DESCRIPTION@"
+  "description": "@DESCRIPTION@",
+  "username": "root",
+  "password": "@ROOT_PASSWORD@",
+  "supported_hex_revisions": "@NOOBS_HEX@"
 }
diff --git a/projects/RPi/options b/projects/RPi/options
index 2381bab79c..4c34a82366 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -59,6 +59,8 @@
   # default:  default mainline kernel
     LINUX="default"
 
+  # NOOBS supported hex versions
+    NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19"
 
 ################################################################################
 # setup build defaults
diff --git a/projects/RPi2/options b/projects/RPi2/options
index f3b038f12e..3f9a9c3921 100644
--- a/projects/RPi2/options
+++ b/projects/RPi2/options
@@ -59,6 +59,8 @@
   # default:  default mainline kernel
     LINUX="default"
 
+  # NOOBS supported hex versions
+    NOOBS_HEX="1040,1041"
 
 ################################################################################
 # setup build defaults
diff --git a/scripts/image b/scripts/image
index 6fc6915138..8a4c6c6949 100755
--- a/scripts/image
+++ b/scripts/image
@@ -350,6 +350,8 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
           -e "s%@RELEASE_DATE@%$(date +%F)%g" \
           -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
           -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
+          -e "s%@ROOT_PASSWORD@%$ROOT_PASSWORD%g" \
+          -e "s%@NOOBS_HEX@%$NOOBS_HEX%g" \
           -i $RELEASE_DIR/${DISTRONAME}_${PROJECT}/os.json
 
       sed -e "s%@DISTRONAME@%$DISTRONAME%g" \