From 3f05dbfdff925f2f0fab30887ea20eee7309f08d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 1 Mar 2016 07:49:27 +0100
Subject: [PATCH] NOOBS: add support for NOOBS-1.8

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

diff --git a/config/noobs/os.json b/config/noobs/os.json
index 5f085aaccb..321969778e 100644
--- a/config/noobs/os.json
+++ b/config/noobs/os.json
@@ -6,5 +6,6 @@
   "description": "@DESCRIPTION@",
   "username": "root",
   "password": "@ROOT_PASSWORD@",
+  "supported_models": [@NOOBS_SUPPORTED_MODELS@],
   "supported_hex_revisions": "@NOOBS_HEX@"
 }
diff --git a/projects/RPi/options b/projects/RPi/options
index b5a925ea59..51e39bc933 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -59,9 +59,12 @@
   # default:  default mainline kernel
     LINUX="default"
 
-  # NOOBS supported hex versions
+  # NOOBS supported hex versions (legacy)
     NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19"
 
+  # NOOBS supported model versions
+    NOOBS_SUPPORTED_MODELS="'Pi Model','Pi Zero'"
+
 ################################################################################
 # setup build defaults
 ################################################################################
diff --git a/projects/RPi2/options b/projects/RPi2/options
index 14804ce725..d43e33eaec 100644
--- a/projects/RPi2/options
+++ b/projects/RPi2/options
@@ -59,9 +59,12 @@
   # default:  default mainline kernel
     LINUX="default"
 
-  # NOOBS supported hex versions
+  # NOOBS supported hex versions (legacy)
     NOOBS_HEX="1040,1041,2082"
 
+  # NOOBS supported model versions
+    NOOBS_SUPPORTED_MODELS="'Pi 2','Pi 3'"
+
 ################################################################################
 # setup build defaults
 ################################################################################
diff --git a/scripts/image b/scripts/image
index 08256f4572..2615074cfc 100755
--- a/scripts/image
+++ b/scripts/image
@@ -445,6 +445,7 @@ fi
           -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
           -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
           -e "s%@ROOT_PASSWORD@%$ROOT_PASSWORD%g" \
+          -e "s%@NOOBS_SUPPORTED_MODELS@%$NOOBS_SUPPORTED_MODELS%g" \
           -e "s%@NOOBS_HEX@%$NOOBS_HEX%g" \
           -i $RELEASE_DIR/${DISTRONAME}_${PROJECT}/os.json