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 68a2044a47..1a5a5680ba 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 aa68b89558..e26dbdd3d2 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 59505e3555..5d1d185f42 100755 --- a/scripts/image +++ b/scripts/image @@ -447,6 +447,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