From 38d1939f4ebf79a2cb6a53190b09110d8c38998c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kelemen=20=28vudiq=29?= Date: Thu, 14 Oct 2021 20:44:55 +0200 Subject: [PATCH] install2emmc: use SYSTEM_SIZE and DISTRONAME in script Script uses arbitrary values for FAT32 partition and name of the distribution. Using placeholders in the script and replacing them at build time offers flexibility, i.e. no need to change arbitrary values in script when SYSTEM_SIZE is changed. --- projects/Allwinner/filesystem/usr/bin/install2emmc | 4 ++-- projects/NXP/devices/iMX8/filesystem/usr/bin/install2emmc | 4 ++-- scripts/image | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/projects/Allwinner/filesystem/usr/bin/install2emmc b/projects/Allwinner/filesystem/usr/bin/install2emmc index 84959c5b6f..e4174451e8 100755 --- a/projects/Allwinner/filesystem/usr/bin/install2emmc +++ b/projects/Allwinner/filesystem/usr/bin/install2emmc @@ -5,7 +5,7 @@ TMP=/tmp/mnt/ -SYSTEM_SIZE=512 +SYSTEM_SIZE=@SYSTEM_SIZE@ UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')" UUID_STORAGE="$(uuidgen)" BOOT=$(grep /flash /proc/mounts | awk '{print $1}' | sed 's/p[012]//g') @@ -30,7 +30,7 @@ fi echo "" echo -e "\033[36m===============================" -echo "Installing LibreELEC to eMMC" +echo "Installing @DISTRONAME@ to eMMC" echo -e "===============================\033[37m" echo "" echo "eMMC found at ${DISK}" diff --git a/projects/NXP/devices/iMX8/filesystem/usr/bin/install2emmc b/projects/NXP/devices/iMX8/filesystem/usr/bin/install2emmc index 6535202228..8883e08e47 100755 --- a/projects/NXP/devices/iMX8/filesystem/usr/bin/install2emmc +++ b/projects/NXP/devices/iMX8/filesystem/usr/bin/install2emmc @@ -5,7 +5,7 @@ TMP=/tmp/mnt/ -SYSTEM_SIZE=512 +SYSTEM_SIZE=@SYSTEM_SIZE@ UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')" UUID_STORAGE="$(uuidgen)" BOOT=$(grep /flash /proc/mounts | awk '{print $1}' | sed 's/p[012]//g') @@ -37,7 +37,7 @@ fi echo "" echo -e "\033[36m===============================" -echo "Installing LibreELEC to eMMC" +echo "Installing @DISTRONAME@ to eMMC" echo -e "===============================\033[37m" echo "" echo "eMMC found at ${DISK}" diff --git a/scripts/image b/scripts/image index 6f2b2c767f..aa8bdc1634 100755 --- a/scripts/image +++ b/scripts/image @@ -203,6 +203,14 @@ if [ -n "${DEVICE}" -a -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/filesyste done fi +# Replace placeholders with values in install script to eMMC +if [ -f ${INSTALL}/usr/bin/install2emmc ]; then + sed -e "s%@SYSTEM_SIZE@%${SYSTEM_SIZE}%g" \ + -i ${INSTALL}/usr/bin/install2emmc + sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \ + -i ${INSTALL}/usr/bin/install2emmc +fi + # Run depmod for base overlay modules MODVER=$(basename $(ls -d ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/*)) find ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/ -name *.ko | \