From cace22768a58a6940b24ecda579dfd02d1bf6a32 Mon Sep 17 00:00:00 2001 From: Philip Howard Date: Thu, 1 Mar 2018 13:58:09 +0000 Subject: [PATCH 01/17] Added Button SHIM, Unicorn HAT HD and Pan Tilt HAT (#159) --- stage4/00-install-packages/01-packages | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stage4/00-install-packages/01-packages b/stage4/00-install-packages/01-packages index 4ede68e..fdf5e73 100644 --- a/stage4/00-install-packages/01-packages +++ b/stage4/00-install-packages/01-packages @@ -17,3 +17,6 @@ python-scrollphathd python3-scrollphathd python-sn3218 python3-sn3218 python-skywriter python3-skywriter python-touchphat python3-touchphat +python-buttonshim python3-buttonshim +python-unicornhathd python3-unicornhathd +python-pantilthat python3-pantilthat From 702b3e7e8068705a30b4376568c6c08dca618d44 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 20 Feb 2018 09:45:06 +0000 Subject: [PATCH 02/17] stage3: install obconf --- stage3/00-install-packages/00-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages index 9e4d84c..ad64cce 100644 --- a/stage3/00-install-packages/00-packages +++ b/stage3/00-install-packages/00-packages @@ -11,3 +11,4 @@ chromium-browser rpi-chromium-mods gldriver-test fonts-droid-fallback fonts-liberation2 +obconf From 4c7980fa1ef966da15a02c7b78f6670cafad606c Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 20 Feb 2018 09:46:31 +0000 Subject: [PATCH 03/17] stage4: drop 'Documents' directory Closes #121 --- stage4/02-extras/00-run.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh index 23df1d7..e24f351 100755 --- a/stage4/02-extras/00-run.sh +++ b/stage4/02-extras/00-run.sh @@ -18,14 +18,6 @@ tar xvf files/python_games.tar.gz -C ${ROOTFS_DIR}/home/pi/python_games --strip- chown 1000:1000 ${ROOTFS_DIR}/home/pi/python_games -Rv chmod +x ${ROOTFS_DIR}/home/pi/python_games/launcher.sh -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/BlueJ/ "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/Greenfoot/ "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/scratch/Projects/Demos/ "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" - #Alacarte fixes install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local" install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share" From c430f618d048cec735224fd4166444f0d858f62a Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 20 Feb 2018 09:59:45 +0000 Subject: [PATCH 04/17] Remove ld.so.preload and policy-rc.d changes --- export-image/00-allow-rerun/00-run.sh | 8 -------- export-image/00-allow-rerun/files/policy-rc.d | 3 --- export-image/04-finalise/01-run.sh | 6 ------ stage1/01-sys-tweaks/00-run.sh | 1 - stage1/01-sys-tweaks/files/policy-rc.d | 3 --- stage2/01-sys-tweaks/01-run.sh | 8 -------- 6 files changed, 29 deletions(-) delete mode 100644 export-image/00-allow-rerun/files/policy-rc.d delete mode 100755 stage1/01-sys-tweaks/files/policy-rc.d diff --git a/export-image/00-allow-rerun/00-run.sh b/export-image/00-allow-rerun/00-run.sh index 1355b2e..b77c30e 100755 --- a/export-image/00-allow-rerun/00-run.sh +++ b/export-image/00-allow-rerun/00-run.sh @@ -1,13 +1,5 @@ #!/bin/bash -e -if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then - mv ${ROOTFS_DIR}/etc/ld.so.preload ${ROOTFS_DIR}/etc/ld.so.preload.disabled -fi - -if [ ! -e ${ROOTFS_DIR}/usr/sbin/policy-rc.d ]; then - install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/ -fi - if [ ! -x ${ROOTFS_DIR}/usr/bin/qemu-arm-static ]; then cp /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/ fi diff --git a/export-image/00-allow-rerun/files/policy-rc.d b/export-image/00-allow-rerun/files/policy-rc.d deleted file mode 100644 index 1924710..0000000 --- a/export-image/00-allow-rerun/files/policy-rc.d +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exit 101 diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh index f04c7ee..b093f01 100755 --- a/export-image/04-finalise/01-run.sh +++ b/export-image/04-finalise/01-run.sh @@ -13,13 +13,7 @@ if [ -d ${ROOTFS_DIR}/home/pi/.config ]; then fi rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -rm -f ${ROOTFS_DIR}/usr/sbin/policy-rc.d rm -f ${ROOTFS_DIR}/usr/bin/qemu-arm-static -if [ "${USE_QEMU}" != "1" ]; then - if [ -e ${ROOTFS_DIR}/etc/ld.so.preload.disabled ]; then - mv ${ROOTFS_DIR}/etc/ld.so.preload.disabled ${ROOTFS_DIR}/etc/ld.so.preload - fi -fi rm -f ${ROOTFS_DIR}/etc/apt/sources.list~ rm -f ${ROOTFS_DIR}/etc/apt/trusted.gpg~ diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index 53a1b2b..4454056 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/stage1/01-sys-tweaks/00-run.sh @@ -2,7 +2,6 @@ install -d ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf -install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d #TODO: Necessary in systemd? install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab on_chroot << EOF diff --git a/stage1/01-sys-tweaks/files/policy-rc.d b/stage1/01-sys-tweaks/files/policy-rc.d deleted file mode 100755 index 1924710..0000000 --- a/stage1/01-sys-tweaks/files/policy-rc.d +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exit 101 diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index b735f58..9eb7629 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -22,14 +22,6 @@ EOF if [ "${USE_QEMU}" = "1" ]; then echo "enter QEMU mode" install -m 644 files/90-qemu.rules ${ROOTFS_DIR}/etc/udev/rules.d/ - if [ -e ${ROOTFS_DIR}/etc/ld.so.preload.disabled ]; then - rm ${ROOTFS_DIR}/etc/ld.so.preload.disabled - touch ${ROOTFS_DIR}/etc/ld.so.preload.disabled - fi - if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then - rm ${ROOTFS_DIR}/etc/ld.so.preload - touch ${ROOTFS_DIR}/etc/ld.so.preload - fi on_chroot << EOF systemctl disable resize2fs_once EOF From e6f7cd5cd6f45a5917d8453c19104e42eefcfe65 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 1 Mar 2018 15:42:16 +0000 Subject: [PATCH 05/17] stage2: don't set 'country' in wpa_supplicant.conf --- stage2/02-net-tweaks/files/wpa_supplicant.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/stage2/02-net-tweaks/files/wpa_supplicant.conf b/stage2/02-net-tweaks/files/wpa_supplicant.conf index c58b871..0fc335e 100644 --- a/stage2/02-net-tweaks/files/wpa_supplicant.conf +++ b/stage2/02-net-tweaks/files/wpa_supplicant.conf @@ -1,3 +1,2 @@ -country=GB ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev update_config=1 From 40eae05204c00a4c4a070ea651fa4c11b12f5beb Mon Sep 17 00:00:00 2001 From: James Ruan Date: Fri, 2 Mar 2018 01:52:26 +0800 Subject: [PATCH 06/17] make root filesystem 4M aligned (#154) --- export-image/prerun.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/export-image/prerun.sh b/export-image/prerun.sh index cec133c..3acc248 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -13,6 +13,7 @@ BOOT_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR}/boot --block-size=1 | cut TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/archives --block-size=1 | cut -f 1) ROUND_SIZE="$((4 * 1024 * 1024))" +ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192)) IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE)) truncate -s ${IMG_SIZE} ${IMG_FILE} @@ -29,7 +30,7 @@ c n -8192 +${ROUNDED_ROOT_SECTOR} p From 4d689a25fdd2309e1c6c1b01d12523b3cd401461 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 1 Mar 2018 17:55:25 +0000 Subject: [PATCH 07/17] export-image: don't round up if already a multiple of 4MB Fixes #156 --- export-image/prerun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export-image/prerun.sh b/export-image/prerun.sh index 3acc248..72cb299 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -14,7 +14,7 @@ TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/ ROUND_SIZE="$((4 * 1024 * 1024))" ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192)) -IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE)) +IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE)) truncate -s ${IMG_SIZE} ${IMG_FILE} fdisk -H 255 -S 63 ${IMG_FILE} < Date: Mon, 5 Mar 2018 16:35:11 +0100 Subject: [PATCH 08/17] Add option to preserve build container (#160) --- README.md | 6 ++++++ build-docker.sh | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e2453b..b770309 100755 --- a/README.md +++ b/README.md @@ -139,6 +139,12 @@ continue: CONTINUE=1 ./build-docker.sh ``` +After successful build, the build container is by default removed. This may be undesired when making incremental changes to a customized build. To prevent the build script from remove the container add + +```bash +PRESERVE_CONTAINER=1 ./build-docker.sh +``` + There is a possibility that even when running from a docker container, the installation of `qemu-user-static` will silently fail when building the image because `binfmt-support` _must be enabled on the underlying kernel_. An easy diff --git a/build-docker.sh b/build-docker.sh index e0a9b90..b683d4b 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -21,6 +21,7 @@ fi CONTAINER_NAME=${CONTAINER_NAME:-pigen_work} CONTINUE=${CONTINUE:-0} +PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0} if [ "$*" != "" ] || [ -z "${IMG_NAME}" ]; then if [ -z "${IMG_NAME}" ]; then @@ -33,6 +34,7 @@ Usage: Optional environment arguments: ( = ) CONTAINER_NAME=pigen_work set a name for the build container CONTINUE=1 continue from a previously started container + PRESERVE_CONTAINER=1 keep build container even on successful build EOF exit 1 fi @@ -75,6 +77,10 @@ fi echo "copying results from deploy/" $DOCKER cp "${CONTAINER_NAME}":/pi-gen/deploy . ls -lah deploy -$DOCKER rm -v $CONTAINER_NAME + +# cleanup +if [ "$PRESERVE_CONTAINER" != "1" ]; then + $DOCKER rm -v $CONTAINER_NAME +fi echo "Done! Your image(s) should be in deploy/" From 019d47db3b7b2a3bd859f19a130fcd5f869ef137 Mon Sep 17 00:00:00 2001 From: Junian Triajianto Date: Tue, 13 Mar 2018 17:20:22 +0700 Subject: [PATCH 09/17] Update stage specification using SKIP_IMAGES (#163) Change Stage specification guide from removing `EXPORT*` files to adding `SKIP_IMAGES` as per new recommended development process. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b770309..281f244 100755 --- a/README.md +++ b/README.md @@ -213,14 +213,14 @@ If you wish to build up to a specified stage (such as building up to stage 2 for a lite system), place an empty file named `SKIP` in each of the `./stage` directories you wish not to include. -Then remove the `EXPORT*` files from `./stage4` (if building up to stage 2) or -from `./stage2` (if building a minimal system). +Then add an empty file named `SKIP_IMAGES` to `./stage4` (if building up to stage 2) or +to `./stage2` (if building a minimal system). ```bash # Example for building a lite system echo "IMG_NAME='Raspbian'" > config touch ./stage3/SKIP ./stage4/SKIP ./stage5/SKIP -rm stage4/EXPORT* stage5/EXPORT* +touch ./stage4/SKIP_IMAGES ./stage5/SKIP_IMAGES sudo ./build.sh # or ./build-docker.sh ``` From 56da271499afe7ae8e35a8fd30f04135283b2fb0 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 2 Mar 2018 20:08:07 +0000 Subject: [PATCH 10/17] Remove unnecessary files --- scripts/check_deps.sh | 0 scripts/release.sh | 0 stage2/00-copies-and-fills/00-run.sh | 3 --- stage2/00-copies-and-fills/02-run.sh | 3 --- 4 files changed, 6 deletions(-) delete mode 100755 scripts/check_deps.sh delete mode 100755 scripts/release.sh delete mode 100755 stage2/00-copies-and-fills/00-run.sh delete mode 100755 stage2/00-copies-and-fills/02-run.sh diff --git a/scripts/check_deps.sh b/scripts/check_deps.sh deleted file mode 100755 index e69de29..0000000 diff --git a/scripts/release.sh b/scripts/release.sh deleted file mode 100755 index e69de29..0000000 diff --git a/stage2/00-copies-and-fills/00-run.sh b/stage2/00-copies-and-fills/00-run.sh deleted file mode 100755 index 4b3a849..0000000 --- a/stage2/00-copies-and-fills/00-run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -touch ${ROOTFS_DIR}/spindle_install diff --git a/stage2/00-copies-and-fills/02-run.sh b/stage2/00-copies-and-fills/02-run.sh deleted file mode 100755 index c579d6a..0000000 --- a/stage2/00-copies-and-fills/02-run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -rm -f ${ROOTFS_DIR}/spindle_install From ff2d5edee18efbb7ba2498e5bf8d308c186c4866 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 2 Mar 2018 20:08:24 +0000 Subject: [PATCH 11/17] shellcheck --- build-docker.sh | 4 +- build.sh | 93 ++++++++++++++------------ export-image/00-allow-rerun/00-run.sh | 4 +- export-image/02-network/01-run.sh | 2 +- export-image/03-set-partuuid/00-run.sh | 8 +-- export-image/04-finalise/01-run.sh | 81 +++++++++++----------- export-image/prerun.sh | 34 +++++----- export-noobs/00-release/00-run.sh | 44 ++++++------ export-noobs/prerun.sh | 30 ++++----- scripts/common | 6 +- scripts/dependencies_check | 4 +- stage0/00-configure-apt/00-run.sh | 10 +-- stage0/prerun.sh | 4 +- stage1/00-boot-files/00-run.sh | 4 +- stage1/01-sys-tweaks/00-run.sh | 6 +- stage1/02-net-tweaks/00-run.sh | 6 +- stage1/prerun.sh | 2 +- stage2/01-sys-tweaks/01-run.sh | 18 ++--- stage2/02-net-tweaks/01-run.sh | 8 +-- stage2/prerun.sh | 2 +- stage3/01-tweaks/00-run.sh | 2 +- stage3/prerun.sh | 2 +- stage4/01-console-autologin/00-run.sh | 3 +- stage4/02-extras/00-run.sh | 16 ++--- stage4/prerun.sh | 2 +- stage5/prerun.sh | 2 +- 26 files changed, 203 insertions(+), 194 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index b683d4b..16d20f5 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -57,7 +57,7 @@ if [ "$CONTAINER_EXISTS" != "" ]; then trap "echo 'got CTRL+C... please wait 5s'; $DOCKER stop -t 5 ${CONTAINER_NAME}_cont" SIGINT SIGTERM time $DOCKER run --rm --privileged \ --volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \ - -e IMG_NAME=${IMG_NAME}\ + -e IMG_NAME="${IMG_NAME}"\ pi-gen \ bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static && cd /pi-gen; ./build.sh; @@ -66,7 +66,7 @@ if [ "$CONTAINER_EXISTS" != "" ]; then else trap "echo 'got CTRL+C... please wait 5s'; $DOCKER stop -t 5 ${CONTAINER_NAME}" SIGINT SIGTERM time $DOCKER run --name "${CONTAINER_NAME}" --privileged \ - -e IMG_NAME=${IMG_NAME}\ + -e IMG_NAME="${IMG_NAME}"\ "${config_file[@]}" \ pi-gen \ bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static && diff --git a/build.sh b/build.sh index d72d4f5..f0597b7 100755 --- a/build.sh +++ b/build.sh @@ -1,22 +1,23 @@ #!/bin/bash -e - +# shellcheck disable=SC2119,SC1091 run_sub_stage() { log "Begin ${SUB_STAGE_DIR}" - pushd ${SUB_STAGE_DIR} > /dev/null + pushd "${SUB_STAGE_DIR}" > /dev/null for i in {00..99}; do - if [ -f ${i}-debconf ]; then + if [ -f "${i}-debconf" ]; then log "Begin ${SUB_STAGE_DIR}/${i}-debconf" on_chroot << EOF debconf-set-selections < /dev/null + pushd "${STAGE_WORK_DIR}" > /dev/null if [ "${CLEAN}" = "1" ]; then rm -rf .pc - rm -rf *-pc + rm -rf "./*-pc" fi - QUILT_PATCHES=${SUB_STAGE_DIR}/${i}-patches - SUB_STAGE_QUILT_PATCH_DIR="$(basename $SUB_STAGE_DIR)-pc" - mkdir -p $SUB_STAGE_QUILT_PATCH_DIR - ln -snf $SUB_STAGE_QUILT_PATCH_DIR .pc - if [ -e ${SUB_STAGE_DIR}/${i}-patches/EDIT ]; then + QUILT_PATCHES="${SUB_STAGE_DIR}/${i}-patches" + SUB_STAGE_QUILT_PATCH_DIR="$(basename "$SUB_STAGE_DIR")-pc" + mkdir -p "$SUB_STAGE_QUILT_PATCH_DIR" + ln -snf "$SUB_STAGE_QUILT_PATCH_DIR" .pc + if [ -e "${SUB_STAGE_DIR}/${i}-patches/EDIT" ]; then echo "Dropping into bash to edit patches..." bash fi @@ -80,20 +81,20 @@ EOF run_stage(){ log "Begin ${STAGE_DIR}" - STAGE=$(basename ${STAGE_DIR}) - pushd ${STAGE_DIR} > /dev/null - unmount ${WORK_DIR}/${STAGE} - STAGE_WORK_DIR=${WORK_DIR}/${STAGE} - ROOTFS_DIR=${STAGE_WORK_DIR}/rootfs + STAGE="$(basename "${STAGE_DIR}")" + pushd "${STAGE_DIR}" > /dev/null + unmount "${WORK_DIR}/${STAGE}" + STAGE_WORK_DIR="${WORK_DIR}/${STAGE}" + ROOTFS_DIR="${STAGE_WORK_DIR}"/rootfs if [ ! -f SKIP_IMAGES ]; then - if [ -f ${STAGE_DIR}/EXPORT_IMAGE ]; then + if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ]; then EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}" fi fi if [ ! -f SKIP ]; then if [ "${CLEAN}" = "1" ]; then - if [ -d ${ROOTFS_DIR} ]; then - rm -rf ${ROOTFS_DIR} + if [ -d "${ROOTFS_DIR}" ]; then + rm -rf "${ROOTFS_DIR}" fi fi if [ -x prerun.sh ]; then @@ -102,16 +103,16 @@ run_stage(){ log "End ${STAGE_DIR}/prerun.sh" fi for SUB_STAGE_DIR in ${STAGE_DIR}/*; do - if [ -d ${SUB_STAGE_DIR} ] && - [ ! -f ${SUB_STAGE_DIR}/SKIP ]; then + if [ -d "${SUB_STAGE_DIR}" ] && + [ ! -f "${SUB_STAGE_DIR}/SKIP" ]; then run_sub_stage fi done fi - unmount ${WORK_DIR}/${STAGE} - PREV_STAGE=${STAGE} - PREV_STAGE_DIR=${STAGE_DIR} - PREV_ROOTFS_DIR=${ROOTFS_DIR} + unmount "${WORK_DIR}/${STAGE}" + PREV_STAGE="${STAGE}" + PREV_STAGE_DIR="${STAGE_DIR}" + PREV_ROOTFS_DIR="${ROOTFS_DIR}" popd > /dev/null log "End ${STAGE_DIR}" } @@ -131,15 +132,17 @@ if [ -z "${IMG_NAME}" ]; then exit 1 fi -export USE_QEMU=${USE_QEMU:-0} -export IMG_DATE=${IMG_DATE:-"$(date +%Y-%m-%d)"} +export USE_QEMU="${USE_QEMU:-0}" +export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}" -export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" export SCRIPT_DIR="${BASE_DIR}/scripts" -export WORK_DIR=${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"} +export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}" export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"} export LOG_FILE="${WORK_DIR}/build.log" +export BASE_DIR + export CLEAN export IMG_NAME export APT_PROXY @@ -162,29 +165,33 @@ export QUILT_NO_DIFF_INDEX=1 export QUILT_NO_DIFF_TIMESTAMPS=1 export QUILT_REFRESH_ARGS="-p ab" -source ${SCRIPT_DIR}/common -source ${SCRIPT_DIR}/dependencies_check +# shellcheck source=scripts/common +source "${SCRIPT_DIR}/common" +# shellcheck source=scripts/dependencies_check +source "${SCRIPT_DIR}/dependencies_check" -dependencies_check ${BASE_DIR}/depends +dependencies_check "${BASE_DIR}/depends" -mkdir -p ${WORK_DIR} +mkdir -p "${WORK_DIR}" log "Begin ${BASE_DIR}" -for STAGE_DIR in ${BASE_DIR}/stage*; do +for STAGE_DIR in "${BASE_DIR}/stage"*; do run_stage done CLEAN=1 for EXPORT_DIR in ${EXPORT_DIRS}; do STAGE_DIR=${BASE_DIR}/export-image + # shellcheck source=/dev/null source "${EXPORT_DIR}/EXPORT_IMAGE" - EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename ${EXPORT_DIR})/rootfs + EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename "${EXPORT_DIR}")/rootfs run_stage if [ "${USE_QEMU}" != "1" ]; then - if [ -e ${EXPORT_DIR}/EXPORT_NOOBS ]; then - source ${EXPORT_DIR}/EXPORT_NOOBS - STAGE_DIR=${BASE_DIR}/export-noobs + if [ -e "${EXPORT_DIR}/EXPORT_NOOBS" ]; then + # shellcheck source=/dev/null + source "${EXPORT_DIR}/EXPORT_NOOBS" + STAGE_DIR="${BASE_DIR}/export-noobs" run_stage fi fi diff --git a/export-image/00-allow-rerun/00-run.sh b/export-image/00-allow-rerun/00-run.sh index b77c30e..f7c5b4e 100755 --- a/export-image/00-allow-rerun/00-run.sh +++ b/export-image/00-allow-rerun/00-run.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -if [ ! -x ${ROOTFS_DIR}/usr/bin/qemu-arm-static ]; then - cp /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/ +if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then + cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/" fi diff --git a/export-image/02-network/01-run.sh b/export-image/02-network/01-run.sh index e21b791..4150732 100755 --- a/export-image/02-network/01-run.sh +++ b/export-image/02-network/01-run.sh @@ -1,3 +1,3 @@ #!/bin/bash -e -install -m 644 files/resolv.conf ${ROOTFS_DIR}/etc/ +install -m 644 files/resolv.conf "${ROOTFS_DIR}/etc/" diff --git a/export-image/03-set-partuuid/00-run.sh b/export-image/03-set-partuuid/00-run.sh index 4b18405..29edc67 100755 --- a/export-image/03-set-partuuid/00-run.sh +++ b/export-image/03-set-partuuid/00-run.sh @@ -2,12 +2,12 @@ IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" -IMGID="$(dd if=${IMG_FILE} skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')" +IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')" BOOT_PARTUUID="${IMGID}-01" ROOT_PARTUUID="${IMGID}-02" -sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" ${ROOTFS_DIR}/etc/fstab -sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" ${ROOTFS_DIR}/etc/fstab +sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab" +sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab" -sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" ${ROOTFS_DIR}/boot/cmdline.txt +sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/boot/cmdline.txt" diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh index b093f01..b706774 100755 --- a/export-image/04-finalise/01-run.sh +++ b/export-image/04-finalise/01-run.sh @@ -8,74 +8,75 @@ on_chroot << EOF hardlink -t /usr/share/doc EOF -if [ -d ${ROOTFS_DIR}/home/pi/.config ]; then - chmod 700 ${ROOTFS_DIR}/home/pi/.config +if [ -d "${ROOTFS_DIR}/home/pi/.config" ]; then + chmod 700 "${ROOTFS_DIR}/home/pi/.config" fi -rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -rm -f ${ROOTFS_DIR}/usr/bin/qemu-arm-static +rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" +rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static" -rm -f ${ROOTFS_DIR}/etc/apt/sources.list~ -rm -f ${ROOTFS_DIR}/etc/apt/trusted.gpg~ +rm -f "${ROOTFS_DIR}/etc/apt/sources.list~" +rm -f "${ROOTFS_DIR}/etc/apt/trusted.gpg~" -rm -f ${ROOTFS_DIR}/etc/passwd- -rm -f ${ROOTFS_DIR}/etc/group- -rm -f ${ROOTFS_DIR}/etc/shadow- -rm -f ${ROOTFS_DIR}/etc/gshadow- +rm -f "${ROOTFS_DIR}/etc/passwd-" +rm -f "${ROOTFS_DIR}/etc/group-" +rm -f "${ROOTFS_DIR}/etc/shadow-" +rm -f "${ROOTFS_DIR}/etc/gshadow-" -rm -f ${ROOTFS_DIR}/var/cache/debconf/*-old -rm -f ${ROOTFS_DIR}/var/lib/dpkg/*-old +rm -f "${ROOTFS_DIR}/var/cache/debconf/*-old" +rm -f "${ROOTFS_DIR}/var/lib/dpkg/*-old" -rm -f ${ROOTFS_DIR}/usr/share/icons/*/icon-theme.cache +rm -f "${ROOTFS_DIR}/usr/share/icons/*/icon-theme.cache" -rm -f ${ROOTFS_DIR}/var/lib/dbus/machine-id +rm -f "${ROOTFS_DIR}/var/lib/dbus/machine-id" -true > ${ROOTFS_DIR}/etc/machine-id +true > "${ROOTFS_DIR}/etc/machine-id" -ln -nsf /proc/mounts ${ROOTFS_DIR}/etc/mtab +ln -nsf /proc/mounts "${ROOTFS_DIR}/etc/mtab" -for _FILE in $(find ${ROOTFS_DIR}/var/log/ -type f); do - true > ${_FILE} -done +find "${ROOTFS_DIR}/var/log/" -type f -exec cp /dev/null {} \; rm -f "${ROOTFS_DIR}/root/.vnc/private.key" rm -f "${ROOTFS_DIR}/etc/vnc/updateid" -update_issue $(basename ${EXPORT_DIR}) -install -m 644 ${ROOTFS_DIR}/etc/rpi-issue ${ROOTFS_DIR}/boot/issue.txt -install files/LICENSE.oracle ${ROOTFS_DIR}/boot/ +update_issue "$(basename "${EXPORT_DIR}")" +install -m 644 "${ROOTFS_DIR}/etc/rpi-issue" "${ROOTFS_DIR}/boot/issue.txt" +install files/LICENSE.oracle "${ROOTFS_DIR}/boot/" cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE" -firmware=$(zgrep "firmware as of" "$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \ - head -n1 | \ - sed -n 's|.* \([^ ]*\)$|\1|p') -printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware" >> "$INFO_FILE" +{ + firmware=$(zgrep "firmware as of" \ + "$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \ + head -n1 | sed -n 's|.* \([^ ]*\)$|\1|p') + printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware" -kernel=$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash") -printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel" >> "$INFO_FILE" + kernel="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")" + printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel" -uname=$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7") -printf "Uname string: %s\n" "$uname" >> "$INFO_FILE" + uname="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")" -printf "\nPackages:\n">> "$INFO_FILE" -dpkg -l --root "$ROOTFS_DIR" >> "$INFO_FILE" + printf "Uname string: %s\n" "$uname" + printf "\nPackages:\n" + dpkg -l --root "$ROOTFS_DIR" +} >> "$INFO_FILE" -ROOT_DEV=$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ') +ROOT_DEV="$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')" -unmount ${ROOTFS_DIR} -zerofree -v ${ROOT_DEV} +unmount "${ROOTFS_DIR}" +zerofree -v "${ROOT_DEV}" -unmount_image ${IMG_FILE} +unmount_image "${IMG_FILE}" -mkdir -p ${DEPLOY_DIR} +mkdir -p "${DEPLOY_DIR}" -rm -f ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip +rm -f "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip" -pushd ${STAGE_WORK_DIR} > /dev/null -zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE}) +pushd "${STAGE_WORK_DIR}" > /dev/null +zip "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip" \ + "$(basename "${IMG_FILE}")" popd > /dev/null cp "$INFO_FILE" "$DEPLOY_DIR" diff --git a/export-image/prerun.sh b/export-image/prerun.sh index 72cb299..0ac7181 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -2,22 +2,22 @@ IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" -unmount_image ${IMG_FILE} +unmount_image "${IMG_FILE}" -rm -f ${IMG_FILE} +rm -f "${IMG_FILE}" -rm -rf ${ROOTFS_DIR} -mkdir -p ${ROOTFS_DIR} +rm -rf "${ROOTFS_DIR}" +mkdir -p "${ROOTFS_DIR}" -BOOT_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR}/boot --block-size=1 | cut -f 1) -TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/archives --block-size=1 | cut -f 1) +BOOT_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}/boot" --block-size=1 | cut -f 1) +TOTAL_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --block-size=1 | cut -f 1) ROUND_SIZE="$((4 * 1024 * 1024))" ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192)) IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE)) -truncate -s ${IMG_SIZE} ${IMG_FILE} -fdisk -H 255 -S 63 ${IMG_FILE} < /dev/null -mkfs.ext4 -L rootfs -O $ROOT_FEATURES $ROOT_DEV > /dev/null +mkdosfs -n boot -F 32 -v "$BOOT_DEV" > /dev/null +mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null -mount -v $ROOT_DEV ${ROOTFS_DIR} -t ext4 -mkdir -p ${ROOTFS_DIR}/boot -mount -v $BOOT_DEV ${ROOTFS_DIR}/boot -t vfat +mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4 +mkdir -p "${ROOTFS_DIR}/boot" +mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot" -t vfat -rsync -aHAXx --exclude var/cache/apt/archives ${EXPORT_ROOTFS_DIR}/ ${ROOTFS_DIR}/ +rsync -aHAXx --exclude var/cache/apt/archives "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/" diff --git a/export-noobs/00-release/00-run.sh b/export-noobs/00-release/00-run.sh index 25f62fd..5874944 100755 --- a/export-noobs/00-release/00-run.sh +++ b/export-noobs/00-release/00-run.sh @@ -2,35 +2,35 @@ NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}" -install -v -m 744 files/partition_setup.sh ${NOOBS_DIR}/ -install -v files/partitions.json ${NOOBS_DIR}/ -install -v files/os.json ${NOOBS_DIR}/ -install -v files/OS.png ${NOOBS_DIR}/ -install -v files/release_notes.txt ${NOOBS_DIR}/ +install -v -m 744 files/partition_setup.sh "${NOOBS_DIR}/" +install -v files/partitions.json "${NOOBS_DIR}/" +install -v files/os.json "${NOOBS_DIR}/" +install -v files/OS.png "${NOOBS_DIR}/" +install -v files/release_notes.txt "${NOOBS_DIR}/" -tar -v -c -C files/marketing -f ${NOOBS_DIR}/marketing.tar . +tar -v -c -C files/marketing -f "${NOOBS_DIR}/marketing.tar" . -BOOT_SIZE=$(xz --robot -l ${NOOBS_DIR}/boot.tar.xz | grep totals | cut -f 5) -ROOT_SIZE=$(xz --robot -l ${NOOBS_DIR}/root.tar.xz | grep totals | cut -f 5) +BOOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/boot.tar.xz" | grep totals | cut -f 5)" +ROOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/root.tar.xz" | grep totals | cut -f 5)" -BOOT_SIZE=$(expr ${BOOT_SIZE} / 1000000 \+ 1) -ROOT_SIZE=$(expr ${ROOT_SIZE} / 1000000 \+ 1) +BOOT_SIZE="$(( BOOT_SIZE / 1000000 + 1))" +ROOT_SIZE="$(( ROOT_SIZE / 1000000 + 1))" -BOOT_NOM=$(expr ${BOOT_SIZE} \* 3) -ROOT_NOM=$(expr ${ROOT_SIZE} \+ 400) +BOOT_NOM="$(( BOOT_SIZE * 3 ))" +ROOT_NOM="$(( ROOT_SIZE + 400 ))" -mv "${NOOBS_DIR}/OS.png" "${NOOBS_DIR}/$(echo ${NOOBS_NAME} | sed 's/ /_/g').png" +mv "${NOOBS_DIR}/OS.png" "${NOOBS_DIR}/${NOOBS_NAME// /_}.png" -sed ${NOOBS_DIR}/partitions.json -i -e "s|BOOT_SIZE|${BOOT_SIZE}|" -sed ${NOOBS_DIR}/partitions.json -i -e "s|ROOT_SIZE|${ROOT_SIZE}|" +sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SIZE|${BOOT_SIZE}|" +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}/partitions.json" -i -e "s|BOOT_NOM|${BOOT_NOM}|" +sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_NOM|${ROOT_NOM}|" -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}/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}|" +sed "${NOOBS_DIR}/release_notes.txt" -i -e "s|UNRELEASED|${IMG_DATE}|" -cp -a ${NOOBS_DIR} ${DEPLOY_DIR}/ +cp -a "${NOOBS_DIR}" "${DEPLOY_DIR}/" diff --git a/export-noobs/prerun.sh b/export-noobs/prerun.sh index dafe654..1889567 100755 --- a/export-noobs/prerun.sh +++ b/export-noobs/prerun.sh @@ -2,14 +2,14 @@ IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}" -unmount_image ${IMG_FILE} +unmount_image "${IMG_FILE}" -mkdir -p ${STAGE_WORK_DIR} -cp ${WORK_DIR}/export-image/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img ${STAGE_WORK_DIR}/ +mkdir -p "${STAGE_WORK_DIR}" +cp "${WORK_DIR}/export-image/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" "${STAGE_WORK_DIR}/" -rm -rf ${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX} +rm -rf "${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}" -PARTED_OUT=$(parted -s ${IMG_FILE} unit b print) +PARTED_OUT=$(parted -s "${IMG_FILE}" unit b print) BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \ | cut -d" " -f 2 | tr -d B) BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \ @@ -20,21 +20,21 @@ ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \ ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \ | cut -d" " -f 4 | tr -d B) -BOOT_DEV=$(losetup --show -f -o ${BOOT_OFFSET} --sizelimit ${BOOT_LENGTH} ${IMG_FILE}) -ROOT_DEV=$(losetup --show -f -o ${ROOT_OFFSET} --sizelimit ${ROOT_LENGTH} ${IMG_FILE}) +BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}") +ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}") echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH" echo "/: offset $ROOT_OFFSET, length $ROOT_LENGTH" -mkdir -p ${STAGE_WORK_DIR}/rootfs -mkdir -p ${NOOBS_DIR} +mkdir -p "${STAGE_WORK_DIR}/rootfs" +mkdir -p "${NOOBS_DIR}" -mount $ROOT_DEV ${STAGE_WORK_DIR}/rootfs -mount $BOOT_DEV ${STAGE_WORK_DIR}/rootfs/boot +mount "$ROOT_DEV" "${STAGE_WORK_DIR}/rootfs" +mount "$BOOT_DEV" "${STAGE_WORK_DIR}/rootfs/boot" ln -sv "/lib/systemd/system/apply_noobs_os_config.service" "$ROOTFS_DIR/etc/systemd/system/multi-user.target.wants/apply_noobs_os_config.service" -bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C ${STAGE_WORK_DIR}/rootfs/boot -cpf ${NOOBS_DIR}/boot.tar.xz . -umount ${STAGE_WORK_DIR}/rootfs/boot -bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C ${STAGE_WORK_DIR}/rootfs --one-file-system -cpf ${NOOBS_DIR}/root.tar.xz . +bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C "${STAGE_WORK_DIR}/rootfs/boot" -cpf "${NOOBS_DIR}/boot.tar.xz" . +umount "${STAGE_WORK_DIR}/rootfs/boot" +bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C "${STAGE_WORK_DIR}/rootfs" --one-file-system -cpf "${NOOBS_DIR}/root.tar.xz" . -unmount_image ${IMG_FILE} +unmount_image "${IMG_FILE}" diff --git a/scripts/common b/scripts/common index f18fd89..efd867e 100644 --- a/scripts/common +++ b/scripts/common @@ -1,5 +1,5 @@ log (){ - date +"[%T] $@" | tee -a "${LOG_FILE}" + date +"[%T] $*" | tee -a "${LOG_FILE}" } export -f log @@ -15,10 +15,10 @@ bootstrap(){ local BOOTSTRAP_CMD=debootstrap fi - capsh --drop=cap_setfcap -- -c "${BOOTSTRAP_CMD} --components=main,contrib,non-free \ + capsh --drop=cap_setfcap -- "${BOOTSTRAP_CMD}" --components=main,contrib,non-free \ --arch armhf \ --keyring "${STAGE_DIR}/files/raspberrypi.gpg" \ - $1 $2 $3" || rmdir "$2/debootstrap" + "$1" "$2" "$3" || rmdir "$2/debootstrap" } export -f bootstrap diff --git a/scripts/dependencies_check b/scripts/dependencies_check index d649f0c..1b92a9c 100644 --- a/scripts/dependencies_check +++ b/scripts/dependencies_check @@ -10,11 +10,11 @@ dependencies_check() for depfile in "$@"; do if [[ -e "$depfile" ]]; then - deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${BASE_DIR}/depends)" + deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${BASE_DIR}/depends")" fi for dep in $deps; do - if ! hash ${dep%:*} 2>/dev/null; then + if ! hash "${dep%:*}" 2>/dev/null; then missing="${missing:+$missing }${dep#*:}" fi done diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh index 7966ef1..9d21ffb 100755 --- a/stage0/00-configure-apt/00-run.sh +++ b/stage0/00-configure-apt/00-run.sh @@ -1,13 +1,13 @@ #!/bin/bash -e -install -m 644 files/sources.list ${ROOTFS_DIR}/etc/apt/ -install -m 644 files/raspi.list ${ROOTFS_DIR}/etc/apt/sources.list.d/ +install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/" +install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/" if [ -n "$APT_PROXY" ]; then - install -m 644 files/51cache ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache - sed ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -i -e "s|APT_PROXY|${APT_PROXY}|" + install -m 644 files/51cache "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" + sed "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" -i -e "s|APT_PROXY|${APT_PROXY}|" else - rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache + rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" fi on_chroot apt-key add - < files/raspberrypi.gpg.key diff --git a/stage0/prerun.sh b/stage0/prerun.sh index 14c09c3..80c43f7 100755 --- a/stage0/prerun.sh +++ b/stage0/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -if [ ! -d ${ROOTFS_DIR} ]; then - bootstrap stretch ${ROOTFS_DIR} http://mirrordirector.raspbian.org/raspbian/ +if [ ! -d "${ROOTFS_DIR}" ]; then + bootstrap stretch "${ROOTFS_DIR}" http://mirrordirector.raspbian.org/raspbian/ fi diff --git a/stage1/00-boot-files/00-run.sh b/stage1/00-boot-files/00-run.sh index 2c976a8..bc61397 100755 --- a/stage1/00-boot-files/00-run.sh +++ b/stage1/00-boot-files/00-run.sh @@ -1,4 +1,4 @@ #!/bin/bash -e -install -m 644 files/cmdline.txt ${ROOTFS_DIR}/boot/ -install -m 644 files/config.txt ${ROOTFS_DIR}/boot/ +install -m 644 files/cmdline.txt "${ROOTFS_DIR}/boot/" +install -m 644 files/config.txt "${ROOTFS_DIR}/boot/" diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index 4454056..61ba51b 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/stage1/01-sys-tweaks/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e -install -d ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d -install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf -install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab +install -d "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d" +install -m 644 files/noclear.conf "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf" +install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab" on_chroot << EOF if ! id -u pi >/dev/null 2>&1; then diff --git a/stage1/02-net-tweaks/00-run.sh b/stage1/02-net-tweaks/00-run.sh index 174b9f8..96a1774 100755 --- a/stage1/02-net-tweaks/00-run.sh +++ b/stage1/02-net-tweaks/00-run.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -install -m 644 files/ipv6.conf ${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf -install -m 644 files/hostname ${ROOTFS_DIR}/etc/hostname +install -m 644 files/ipv6.conf "${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf" +install -m 644 files/hostname "${ROOTFS_DIR}/etc/hostname" -ln -sf /dev/null ${ROOTFS_DIR}/etc/systemd/network/99-default.link +ln -sf /dev/null "${ROOTFS_DIR}/etc/systemd/network/99-default.link" diff --git a/stage1/prerun.sh b/stage1/prerun.sh index ebb5d35..9acd13c 100755 --- a/stage1/prerun.sh +++ b/stage1/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -if [ ! -d ${ROOTFS_DIR} ]; then +if [ ! -d "${ROOTFS_DIR}" ]; then copy_previous fi diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 9eb7629..4e9c7d0 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -1,15 +1,15 @@ #!/bin/bash -e -install -m 755 files/resize2fs_once ${ROOTFS_DIR}/etc/init.d/ +install -m 755 files/resize2fs_once "${ROOTFS_DIR}/etc/init.d/" -install -d ${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d -install -m 644 files/ttyoutput.conf ${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d/ +install -d "${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d" +install -m 644 files/ttyoutput.conf "${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d/" -install -m 644 files/50raspi ${ROOTFS_DIR}/etc/apt/apt.conf.d/ +install -m 644 files/50raspi "${ROOTFS_DIR}/etc/apt/apt.conf.d/" -install -m 644 files/console-setup ${ROOTFS_DIR}/etc/default/ +install -m 644 files/console-setup "${ROOTFS_DIR}/etc/default/" -install -m 755 files/rc.local ${ROOTFS_DIR}/etc/ +install -m 755 files/rc.local "${ROOTFS_DIR}/etc/" on_chroot << EOF systemctl disable hwclock.sh @@ -21,7 +21,7 @@ EOF if [ "${USE_QEMU}" = "1" ]; then echo "enter QEMU mode" - install -m 644 files/90-qemu.rules ${ROOTFS_DIR}/etc/udev/rules.d/ + install -m 644 files/90-qemu.rules "${ROOTFS_DIR}/etc/udev/rules.d/" on_chroot << EOF systemctl disable resize2fs_once EOF @@ -34,7 +34,7 @@ fi on_chroot << \EOF for GRP in input spi i2c gpio; do - groupadd -f -r $GRP + groupadd -f -r "$GRP" done for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do adduser pi $GRP @@ -49,4 +49,4 @@ on_chroot << EOF usermod --pass='*' root EOF -rm -f ${ROOTFS_DIR}/etc/ssh/ssh_host_*_key* +rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key* diff --git a/stage2/02-net-tweaks/01-run.sh b/stage2/02-net-tweaks/01-run.sh index a96b556..d21419e 100755 --- a/stage2/02-net-tweaks/01-run.sh +++ b/stage2/02-net-tweaks/01-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e -install -v -d ${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d -install -v -m 644 files/wait.conf ${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/ +install -v -d "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d" +install -v -m 644 files/wait.conf "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/" -install -v -d ${ROOTFS_DIR}/etc/wpa_supplicant -install -v -m 600 files/wpa_supplicant.conf ${ROOTFS_DIR}/etc/wpa_supplicant/ +install -v -d "${ROOTFS_DIR}/etc/wpa_supplicant" +install -v -m 600 files/wpa_supplicant.conf "${ROOTFS_DIR}/etc/wpa_supplicant/" diff --git a/stage2/prerun.sh b/stage2/prerun.sh index ebb5d35..9acd13c 100755 --- a/stage2/prerun.sh +++ b/stage2/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -if [ ! -d ${ROOTFS_DIR} ]; then +if [ ! -d "${ROOTFS_DIR}" ]; then copy_previous fi diff --git a/stage3/01-tweaks/00-run.sh b/stage3/01-tweaks/00-run.sh index f64961c..5da7c1a 100755 --- a/stage3/01-tweaks/00-run.sh +++ b/stage3/01-tweaks/00-run.sh @@ -1,3 +1,3 @@ #!/bin/bash -e -rm -f ${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf +rm -f "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf" diff --git a/stage3/prerun.sh b/stage3/prerun.sh index ebb5d35..9acd13c 100755 --- a/stage3/prerun.sh +++ b/stage3/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -if [ ! -d ${ROOTFS_DIR} ]; then +if [ ! -d "${ROOTFS_DIR}" ]; then copy_previous fi diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh index 11ee373..2189bef 100755 --- a/stage4/01-console-autologin/00-run.sh +++ b/stage4/01-console-autologin/00-run.sh @@ -1,3 +1,4 @@ #!/bin/bash -e -ln -sf /etc/systemd/system/autologin@.service ${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service +ln -sf /etc/systemd/system/autologin@.service \ + "${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service" diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh index e24f351..08c6c1e 100755 --- a/stage4/02-extras/00-run.sh +++ b/stage4/02-extras/00-run.sh @@ -1,22 +1,22 @@ #!/bin/bash -e -HASH=`wget https://api.github.com/repos/KenT2/python-games/git/refs/heads/master -qO -| grep \"sha\" | cut -f 2 -d ':' | cut -f 2 -d \"` +HASH="$(wget https://api.github.com/repos/KenT2/python-games/git/refs/heads/master -qO -| grep \"sha\" | cut -f 2 -d ':' | cut -f 2 -d \")" if [ -f files/python_games.hash ]; then - HASH_LOCAL=`cat files/python_games.hash` + HASH_LOCAL="$(cat files/python_games.hash)" fi if [ ! -e files/python_games.tar.gz ] || [ "$HASH" != "$HASH_LOCAL" ]; then wget "https://github.com/KenT2/python-games/tarball/master" -O files/python_games.tar.gz - echo $HASH > files/python_games.hash + echo "$HASH" > files/python_games.hash fi -ln -sf pip3 ${ROOTFS_DIR}/usr/bin/pip-3.2 +ln -sf pip3 "${ROOTFS_DIR}/usr/bin/pip-3.2" -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/python_games -tar xvf files/python_games.tar.gz -C ${ROOTFS_DIR}/home/pi/python_games --strip-components=1 -chown 1000:1000 ${ROOTFS_DIR}/home/pi/python_games -Rv -chmod +x ${ROOTFS_DIR}/home/pi/python_games/launcher.sh +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/python_games" +tar xvf files/python_games.tar.gz -C "${ROOTFS_DIR}/home/pi/python_games" --strip-components=1 +chown 1000:1000 "${ROOTFS_DIR}/home/pi/python_games" -Rv +chmod +x "${ROOTFS_DIR}/home/pi/python_games/launcher.sh" #Alacarte fixes install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local" diff --git a/stage4/prerun.sh b/stage4/prerun.sh index ebb5d35..9acd13c 100755 --- a/stage4/prerun.sh +++ b/stage4/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -if [ ! -d ${ROOTFS_DIR} ]; then +if [ ! -d "${ROOTFS_DIR}" ]; then copy_previous fi diff --git a/stage5/prerun.sh b/stage5/prerun.sh index ebb5d35..9acd13c 100755 --- a/stage5/prerun.sh +++ b/stage5/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -if [ ! -d ${ROOTFS_DIR} ]; then +if [ ! -d "${ROOTFS_DIR}" ]; then copy_previous fi From 589afcc72d9a9e514f499af5530da74577cd46c6 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 1 Mar 2018 18:56:10 +0000 Subject: [PATCH 12/17] Update release notes --- .../00-release/files/release_notes.txt | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 2177cfe..fac14ee 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,37 @@ UNRELEASED: + * Raspberry Pi 3 B+ support + * WiFi is disabled until wireless regulatory domain is set (Pi 3 B+ only) + - The domain can be done through 'Raspberry Pi Configuration' (rc_gui), + 'raspi-config' or by setting 'country=' to an appropriate ISO 3166 + alpha2 country code in /etc/wpa_supplicant/wpa_supplicant.conf. + * Default wireless regulatory domain is now unset + * Added support to desktop for different screen sizes and resolutions, + including multiple preset options in Appearance Settings and pixel doubling + option in Raspberry Pi Configuration + * Version 2.1.16 of Thonny included + * Version 29.0.0.113 of Adobe PepperFlash player included + * Version 1.2.post1 of Pygame Zero included + * Bluetooth plugin now supports connection to Bluetooth LE HID devices + * Network plugin now indicates 5G-compatible APs + * Latest changes to Bluez ALSA service merged + - service now started on CLI boot as well as GUI boot + * Latest changes to dhcpcd networking plugin merged + * Improved support for running on pi-top devices + * Small design changes to PiX theme and icons + * Bug fix - hide spurious window resize handles + * Bug fix - Scratch 2 remote GPIO state block now works correctly + * Updated WiFi Firmware + - brcmfmac43455-sdio 7.45.154 + - brcmfmac43430-sdio 7.45.98.38 + * New packages: + - policykit-1 + - obconf + - python-buttonshim python3-buttonshim + - python-unicornhathd python3-unicornhathd + - python-pantilthat python3-pantilthat + * Linux kernel 4.9.80+ + * Raspberry Pi firmware 3347884c7df574bbabeff6dca63caf686e629699 +2017-11-29: * Added battery monitor plugin for taskbar - works on x86 images or first-generation Pi-Top * Added cutdown mode to PCManFM file manager to reduce complexity * Added ability to rename files in PCManFM by clicking name when selected From de5b2baa1ce065b74116b9ee9460f6932b99da0a Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 19 Mar 2018 15:17:58 -0400 Subject: [PATCH 13/17] README.md: Clarify USE_QEMU (#165) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 281f244..c8a374e 100755 --- a/README.md +++ b/README.md @@ -70,7 +70,8 @@ The following environment variables are supported: * `USE_QEMU` (Default: `"0"`) - This enable the Qemu mode and set filesystem and image suffix if set to 1. + Setting to '1' enables the QEMU mode - creating an image that can be mounted via QEMU for an emulated + environment. These images include "-qemu" in the image file name. A simple example for building Raspbian: From 343cabc8f54c7da157161dbd58b628a60f618c3c Mon Sep 17 00:00:00 2001 From: David Steele Date: Sat, 24 Mar 2018 13:36:18 -0400 Subject: [PATCH 14/17] Remove quotes in globbed patch CLEANup (#168) Globbing does not work within single or double quotes. https://unix.stackexchange.com/questions/67757/wildcards-inside-quotes --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f0597b7..ebeb46a 100755 --- a/build.sh +++ b/build.sh @@ -40,7 +40,7 @@ EOF pushd "${STAGE_WORK_DIR}" > /dev/null if [ "${CLEAN}" = "1" ]; then rm -rf .pc - rm -rf "./*-pc" + rm -rf ./*-pc fi QUILT_PATCHES="${SUB_STAGE_DIR}/${i}-patches" SUB_STAGE_QUILT_PATCH_DIR="$(basename "$SUB_STAGE_DIR")-pc" From 75452f9a00de7acdbf32f56dbbd3bd3dd607ad96 Mon Sep 17 00:00:00 2001 From: David Steele Date: Sat, 24 Mar 2018 14:10:47 -0400 Subject: [PATCH 15/17] Add README detail on the 'patches' process (#170) --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c8a374e..709a9ca 100755 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ The following process is followed to build images: There are a number of different files and directories which can be used to control different parts of the build process: - - **00-run.sh** - A unix shell script. Needs to be made executable for it to run + - **00-run.sh** - A unix shell script. Needs to be made executable for it to run. - **00-run-chroot.sh** - A unix shell script which will be run in the chroot of the image build directory. Needs to be made executable for it to run. @@ -111,9 +111,12 @@ The following process is followed to build images: separated, per line. - **00-packages-nr** - As 00-packages, except these will be installed using - the ```--no-install-recommends -y``` parameters to apt-get + the ```--no-install-recommends -y``` parameters to apt-get. - - **00-patches** - A directory containing patch files to be applied + - **00-patches** - A directory containing patch files to be applied, using quilt. + If a file named 'EDIT' is present in the directory, the build process will + be interrupted with a bash session, allowing an opportunity to create/revise + the patches. * If the stage directory contains files called "EXPORT_NOOBS" or "EXPORT_IMAGE" then add this stage to a list of images to generate From 555417bbe665b23ad81eda5ab9cb0c9edfcd480b Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 26 Mar 2018 08:06:10 -0400 Subject: [PATCH 16/17] Fix some quoted globs in export-image cleanup (#173) --- export-image/04-finalise/01-run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh index b706774..e8662a0 100755 --- a/export-image/04-finalise/01-run.sh +++ b/export-image/04-finalise/01-run.sh @@ -23,10 +23,10 @@ rm -f "${ROOTFS_DIR}/etc/group-" rm -f "${ROOTFS_DIR}/etc/shadow-" rm -f "${ROOTFS_DIR}/etc/gshadow-" -rm -f "${ROOTFS_DIR}/var/cache/debconf/*-old" -rm -f "${ROOTFS_DIR}/var/lib/dpkg/*-old" +rm -f "${ROOTFS_DIR}"/var/cache/debconf/*-old +rm -f "${ROOTFS_DIR}"/var/lib/dpkg/*-old -rm -f "${ROOTFS_DIR}/usr/share/icons/*/icon-theme.cache" +rm -f "${ROOTFS_DIR}"/usr/share/icons/*/icon-theme.cache rm -f "${ROOTFS_DIR}/var/lib/dbus/machine-id" From 93db3736721d968a6ab67d37243d6f3aa6958d00 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 28 Mar 2018 10:58:28 +0100 Subject: [PATCH 17/17] sources.list: change {mirrordirector,archive}.raspbian.org to raspbian.raspberrypi.org --- stage0/00-configure-apt/files/sources.list | 4 ++-- stage0/prerun.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stage0/00-configure-apt/files/sources.list b/stage0/00-configure-apt/files/sources.list index f13c50c..45e5210 100644 --- a/stage0/00-configure-apt/files/sources.list +++ b/stage0/00-configure-apt/files/sources.list @@ -1,3 +1,3 @@ -deb http://mirrordirector.raspbian.org/raspbian/ stretch main contrib non-free rpi +deb http://raspbian.raspberrypi.org/raspbian/ stretch main contrib non-free rpi # Uncomment line below then 'apt-get update' to enable 'apt-get source' -#deb-src http://archive.raspbian.org/raspbian/ stretch main contrib non-free rpi +#deb-src http://raspbian.raspberrypi.org/raspbian/ stretch main contrib non-free rpi diff --git a/stage0/prerun.sh b/stage0/prerun.sh index 80c43f7..7c09b02 100755 --- a/stage0/prerun.sh +++ b/stage0/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e if [ ! -d "${ROOTFS_DIR}" ]; then - bootstrap stretch "${ROOTFS_DIR}" http://mirrordirector.raspbian.org/raspbian/ + bootstrap stretch "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/ fi