Browse Source

Specify additional variables in EXPORT_* files

pull/56/head
Serge Schneider 4 years ago
parent
commit
1f1ddb5f13
7 changed files with 16 additions and 5 deletions
  1. +4
    -1
      build.sh
  2. +4
    -1
      export-noobs/00-release/00-run.sh
  3. +2
    -2
      export-noobs/00-release/files/os.json
  4. +1
    -1
      stage2/EXPORT_IMAGE
  5. +2
    -0
      stage2/EXPORT_NOOBS
  6. +1
    -0
      stage4/EXPORT_IMAGE
  7. +2
    -0
      stage4/EXPORT_NOOBS

+ 4
- 1
build.sh View File

@ -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

+ 4
- 1
export-noobs/00-release/00-run.sh View File

@ -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}/

+ 2
- 2
export-noobs/00-release/files/os.json View File

@ -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",

+ 1
- 1
stage2/EXPORT_IMAGE View File

@ -1 +1 @@
-lite
IMG_SUFFIX="-lite"

+ 2
- 0
stage2/EXPORT_NOOBS View File

@ -0,0 +1,2 @@
NOOBS_NAME="Raspbian Lite"
NOOBS_DESCRIPTION="A port of Debian jessie for the Raspberry Pi (minimal version)"

+ 1
- 0
stage4/EXPORT_IMAGE View File

@ -0,0 +1 @@
IMG_SUFFIX=""

+ 2
- 0
stage4/EXPORT_NOOBS View File

@ -0,0 +1,2 @@
NOOBS_NAME="Raspbian with PIXEL"
NOOBS_DESCRIPTION="A port of Debian jessie for the Raspberry Pi (full desktop version)"

Loading…
Cancel
Save