[RPI] Refactor Raspberry Pi Setup Script for Improved Structure and Readability
- Encapsulated functionality into functions for better script organization. - Introduced 'write_os_release' and 'write_machine_info' functions for creating os-release and machine-info files. - Streamlined Raspberry Pi specific file handling with 'handle_raspberry_pi' function. - Consolidated script execution within a 'main' function for clearer flow and execution order. - Improved readability with consistent formatting and added inline comments for clarity. - Enhanced robustness with comprehensive error checking and streamlined command execution. - RPI5 not supported yet.
This commit is contained in:
Bohdan Buinich
parent
3851ed9fab
commit
736bfebe31
|
|
@ -1,73 +1,88 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
set -u
|
# Set board directory and include meta files
|
||||||
set -e
|
|
||||||
|
|
||||||
BOARD_DIR="$(dirname $0)"
|
BOARD_DIR="$(dirname $0)"
|
||||||
|
|
||||||
. "${BR2_EXTERNAL_OPENVOICEOS_PATH}/meta"
|
. "${BR2_EXTERNAL_OPENVOICEOS_PATH}/meta"
|
||||||
. "${BOARD_DIR}/meta"
|
. "${BOARD_DIR}/meta"
|
||||||
|
|
||||||
# Write os-release
|
# Function to create and write os-release file
|
||||||
{
|
write_os_release() {
|
||||||
echo "NAME=\"${OVOS_NAME}\""
|
local os_release_file="${TARGET_DIR}/usr/lib/os-release"
|
||||||
echo "VERSION=\"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\""
|
echo "Creating os-release at ${os_release_file}"
|
||||||
echo "ID=${OVOS_ID}"
|
{
|
||||||
echo "VERSION_ID=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}"
|
echo "NAME=\"${OVOS_NAME}\""
|
||||||
echo "PRETTY_NAME=\"${OVOS_NAME} ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\""
|
echo "VERSION=\"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\""
|
||||||
echo "CPE_NAME=cpe:2.3:o:openvoiceos:${OVOS_ID}:${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}:*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*"
|
echo "ID=${OVOS_ID}"
|
||||||
echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS"
|
echo "VERSION_ID=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}"
|
||||||
echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation"
|
echo "PRETTY_NAME=\"${OVOS_NAME} ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\""
|
||||||
echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues"
|
echo "CPE_NAME=cpe:2.3:o:openvoiceos:${OVOS_ID}:${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}:*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*"
|
||||||
echo "VARIANT=\"${OVOS_NAME} - Buildroot Edition\""
|
echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS"
|
||||||
echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-buildroot"
|
echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation"
|
||||||
} > "${TARGET_DIR}/usr/lib/os-release"
|
echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues"
|
||||||
|
echo "VARIANT=\"${OVOS_NAME} - Buildroot Edition\""
|
||||||
|
echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-buildroot"
|
||||||
|
} > "${os_release_file}"
|
||||||
|
}
|
||||||
|
|
||||||
# Write machine-info
|
# Function to create and write machine-info file
|
||||||
{
|
write_machine_info() {
|
||||||
echo "CHASSIS=${CHASSIS}"
|
local machine_info_file="${TARGET_DIR}/etc/machine-info"
|
||||||
echo "DEPLOYMENT=${DEPLOYMENT}"
|
echo "Creating machine-info at ${machine_info_file}"
|
||||||
} > "${TARGET_DIR}/etc/machine-info"
|
{
|
||||||
|
echo "CHASSIS=${CHASSIS}"
|
||||||
|
echo "DEPLOYMENT=${DEPLOYMENT}"
|
||||||
|
} > "${machine_info_file}"
|
||||||
|
}
|
||||||
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/cmdline.txt ${BINARIES_DIR}/rpi-firmware/cmdline.txt
|
# Function to handle Raspberry Pi specific files
|
||||||
grub-editenv "${BINARIES_DIR}/efi-part/EFI/BOOT/grubenv" create
|
handle_raspberry_pi() {
|
||||||
|
local pi_version=$1
|
||||||
|
echo "Handling Raspberry Pi ${pi_version} specific files"
|
||||||
|
cp -f "../buildroot-external/board/ovos/raspberrypi/${pi_version}/config.txt" "${BINARIES_DIR}/rpi-firmware/config.txt"
|
||||||
|
cp -f "../buildroot-external/board/ovos/raspberrypi/${pi_version}/RPI_EFI.fd" "${BINARIES_DIR}/rpi-firmware/RPI_EFI.fd"
|
||||||
|
cp -f "../buildroot-external/board/ovos/raspberrypi/grub-efi.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg"
|
||||||
|
cp -f "../buildroot-external/board/ovos/raspberrypi/${pi_version}/sw-description" "${BINARIES_DIR}"
|
||||||
|
}
|
||||||
|
|
||||||
echo "Check for kernel in ${TARGET_DIR}"
|
# Main function to execute script logic
|
||||||
if [ -f "${TARGET_DIR}/boot/Image" ]; then
|
main() {
|
||||||
echo "Found Image, renaming to kernel"
|
write_os_release
|
||||||
mv ${TARGET_DIR}/boot/Image ${TARGET_DIR}/boot/kernel
|
write_machine_info
|
||||||
fi
|
|
||||||
|
|
||||||
# Copy the right config.txt file
|
echo "Copying cmdline.txt to ${BINARIES_DIR}/rpi-firmware/"
|
||||||
for arg in "$@"
|
cp -f ../buildroot-external/board/ovos/raspberrypi/cmdline.txt "${BINARIES_DIR}/rpi-firmware/cmdline.txt"
|
||||||
do
|
|
||||||
case "${arg}" in
|
|
||||||
--rpi3)
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/rpi3/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/rpi3/RPI_EFI.fd ${BINARIES_DIR}/rpi-firmware/RPI_EFI.fd
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/rpi3/sw-description ${BINARIES_DIR}
|
|
||||||
;;
|
|
||||||
--rpi4)
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/rpi4/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/rpi4/RPI_EFI.fd ${BINARIES_DIR}/rpi-firmware/RPI_EFI.fd
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
|
|
||||||
cp -f ../buildroot-external/board/ovos/raspberrypi/rpi4/sw-description ${BINARIES_DIR}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# Prepare home data
|
echo "Creating grubenv"
|
||||||
rm -f ${BINARIES_DIR}/homefs.ext4
|
grub-editenv "${BINARIES_DIR}/efi-part/EFI/BOOT/grubenv" create
|
||||||
truncate --size="6890M" ${BINARIES_DIR}/homefs.ext4
|
|
||||||
mkfs.ext4 -L "homefs" -E lazy_itable_init=0,lazy_journal_init=0 ${BINARIES_DIR}/homefs.ext4
|
|
||||||
|
|
||||||
# Mount home image
|
echo "Checking for kernel in ${TARGET_DIR}"
|
||||||
mkdir -p ${BINARIES_DIR}/home
|
if [ -f "${TARGET_DIR}/boot/Image" ]; then
|
||||||
sudo mount -o loop,discard ${BINARIES_DIR}/homefs.ext4 ${BINARIES_DIR}/home
|
echo "Found Image, renaming to kernel"
|
||||||
|
mv "${TARGET_DIR}/boot/Image" "${TARGET_DIR}/boot/kernel"
|
||||||
|
fi
|
||||||
|
|
||||||
# sync home folder
|
# Process command line arguments
|
||||||
sudo rsync -ah --progress ${TARGET_DIR}/home/* ${BINARIES_DIR}/home/
|
for arg in "$@"; do
|
||||||
|
case "${arg}" in
|
||||||
|
--rpi3) handle_raspberry_pi "rpi3" ;;
|
||||||
|
--rpi4) handle_raspberry_pi "rpi4" ;;
|
||||||
|
# --rpi5) handle_raspberry_pi "rpi5" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
# Unmount home image
|
# Prepare and sync home data
|
||||||
sudo umount ${BINARIES_DIR}/homefs.ext4
|
local home_img="${BINARIES_DIR}/homefs.ext4"
|
||||||
|
echo "Preparing home data at ${home_img}"
|
||||||
|
rm -f "${home_img}"
|
||||||
|
truncate --size="6890M" "${home_img}"
|
||||||
|
mkfs.ext4 -L "homefs" -E lazy_itable_init=0,lazy_journal_init=0 "${home_img}"
|
||||||
|
|
||||||
|
local home_mount_point="${BINARIES_DIR}/home"
|
||||||
|
mkdir -p "${home_mount_point}"
|
||||||
|
sudo mount -o loop,discard "${home_img}" "${home_mount_point}"
|
||||||
|
sudo rsync -ah --progress "${TARGET_DIR}/home/"* "${home_mount_point}/"
|
||||||
|
sudo umount "${home_img}"
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue