From 1f1ddb5f13ee460db2318b72e50a429c0f43d726 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 13 Mar 2017 17:39:58 +0000 Subject: [PATCH] Specify additional variables in EXPORT_* files --- build.sh | 5 ++++- export-noobs/00-release/00-run.sh | 5 ++++- export-noobs/00-release/files/os.json | 4 ++-- stage2/EXPORT_IMAGE | 2 +- stage2/EXPORT_NOOBS | 2 ++ stage4/EXPORT_IMAGE | 1 + stage4/EXPORT_NOOBS | 2 ++ 7 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 2656be8..0b7f3c0 100755 --- a/build.sh +++ b/build.sh @@ -148,6 +148,8 @@ export PREV_STAGE_DIR export ROOTFS_DIR export PREV_ROOTFS_DIR export IMG_SUFFIX +export NOOBS_NAME +export NOOBS_DESCRIPTION export EXPORT_DIR export EXPORT_ROOTFS_DIR @@ -172,10 +174,11 @@ done CLEAN=1 for EXPORT_DIR in ${EXPORT_DIRS}; do STAGE_DIR=${BASE_DIR}/export-image - IMG_SUFFIX=$(cat ${EXPORT_DIR}/EXPORT_IMAGE) + source "${EXPORT_DIR}/EXPORT_IMAGE" EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename ${EXPORT_DIR})/rootfs run_stage if [ -e ${EXPORT_DIR}/EXPORT_NOOBS ]; then + source ${EXPORT_DIR}/EXPORT_NOOBS STAGE_DIR=${BASE_DIR}/export-noobs run_stage fi diff --git a/export-noobs/00-release/00-run.sh b/export-noobs/00-release/00-run.sh index dab3d8c..446733d 100755 --- a/export-noobs/00-release/00-run.sh +++ b/export-noobs/00-release/00-run.sh @@ -25,7 +25,10 @@ sed ${NOOBS_DIR}/partitions.json -i -e "s|ROOT_SIZE|${ROOT_SIZE}|" sed ${NOOBS_DIR}/partitions.json -i -e "s|BOOT_NOM|${BOOT_NOM}|" sed ${NOOBS_DIR}/partitions.json -i -e "s|ROOT_NOM|${ROOT_NOM}|" -sed ${NOOBS_DIR}/release_notes.txt -i -e "s|UNRELEASED|${IMG_DATE}|" sed ${NOOBS_DIR}/os.json -i -e "s|UNRELEASED|${IMG_DATE}|" +sed ${NOOBS_DIR}/os.json -i -e "s|NOOBS_NAME|${NOOBS_NAME}|" +sed ${NOOBS_DIR}/os.json -i -e "s|NOOBS_DESCRIPTION|${NOOBS_DESCRIPTION}|" + +sed ${NOOBS_DIR}/release_notes.txt -i -e "s|UNRELEASED|${IMG_DATE}|" cp -a ${NOOBS_DIR} ${DEPLOY_DIR}/ diff --git a/export-noobs/00-release/files/os.json b/export-noobs/00-release/files/os.json index 9f88da1..a667a09 100644 --- a/export-noobs/00-release/files/os.json +++ b/export-noobs/00-release/files/os.json @@ -1,8 +1,8 @@ { - "description": "A community-created port of Debian jessie for the Raspberry Pi", + "description": "NOOBS_DESCRIPTION", "feature_level": 35120124, "kernel": "4.4", - "name": "Raspbian", + "name": "NOOBS_NAME", "password": "raspberry", "release_date": "UNRELEASED", "supported_hex_revisions": "2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,1040,1041,0092,0093,2082", diff --git a/stage2/EXPORT_IMAGE b/stage2/EXPORT_IMAGE index dc65cd0..8ef6ebe 100644 --- a/stage2/EXPORT_IMAGE +++ b/stage2/EXPORT_IMAGE @@ -1 +1 @@ --lite +IMG_SUFFIX="-lite" diff --git a/stage2/EXPORT_NOOBS b/stage2/EXPORT_NOOBS index e69de29..cc925cd 100644 --- a/stage2/EXPORT_NOOBS +++ b/stage2/EXPORT_NOOBS @@ -0,0 +1,2 @@ +NOOBS_NAME="Raspbian Lite" +NOOBS_DESCRIPTION="A port of Debian jessie for the Raspberry Pi (minimal version)" diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE index e69de29..2b0f09d 100644 --- a/stage4/EXPORT_IMAGE +++ b/stage4/EXPORT_IMAGE @@ -0,0 +1 @@ +IMG_SUFFIX="" diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS index e69de29..a7e95af 100644 --- a/stage4/EXPORT_NOOBS +++ b/stage4/EXPORT_NOOBS @@ -0,0 +1,2 @@ +NOOBS_NAME="Raspbian with PIXEL" +NOOBS_DESCRIPTION="A port of Debian jessie for the Raspberry Pi (full desktop version)"