From d417519f98700c8d8f276ad9d00c0cb4543329b3 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Mon, 24 Oct 2022 00:47:02 +0000 Subject: [PATCH 1/3] buildsystem: move STORAGE_SIZE to the general buildsystem Signed-off-by: Ian Leonard --- distributions/LibreELEC/options | 3 +++ scripts/image | 1 + scripts/mkimage | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 67402796fc..3941b115e0 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -62,6 +62,9 @@ # Default system partition offset, in sectors, eg. 2048 SYSTEM_PART_START=8192 +# Size of storage partition, in MB. Must be >=32 + STORAGE_SIZE=32 + # build with swap support (yes / no) SWAP_SUPPORT="yes" diff --git a/scripts/image b/scripts/image index 436552ffa5..a0e51f50d0 100755 --- a/scripts/image +++ b/scripts/image @@ -53,6 +53,7 @@ function do_mkimage() { EXTRA_CMDLINE="${EXTRA_CMDLINE}" \ SYSTEM_SIZE="${SYSTEM_SIZE}" \ SYSTEM_PART_START="${SYSTEM_PART_START}" \ + STORAGE_SIZE="${STORAGE_SIZE:-32}" \ OVA_SIZE="${OVA_SIZE}" \ ${SCRIPTS}/mkimage } diff --git a/scripts/mkimage b/scripts/mkimage index ff836c3866..f25be46163 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -18,8 +18,6 @@ if [ -z "${SYSTEM_SIZE}" -o -z "${SYSTEM_PART_START}" ]; then exit 1 fi -STORAGE_SIZE=32 # STORAGE_SIZE must be >= 32 ! - DISK_START_PADDING=$(( (${SYSTEM_PART_START} + 2048 - 1) / 2048 )) DISK_GPT_PADDING=1 DISK_SIZE=$(( ${DISK_START_PADDING} + ${SYSTEM_SIZE} + ${STORAGE_SIZE} + ${DISK_GPT_PADDING} )) From 0a0f34a9c66787d19f4cb015af7b14f47dbccfcc Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 14 Jul 2020 02:01:07 +0000 Subject: [PATCH 2/3] show_config: add information on storage fs and squashfs compression Signed-off-by: Ian Leonard --- config/show_config | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/show_config b/config/show_config index 82029ff957..58dddeb26c 100644 --- a/config/show_config +++ b/config/show_config @@ -61,6 +61,17 @@ show_config() { config_message+="\n - Include firmware:\t\t\t ${config_firmware}" done + # Image Filsystem + + config_message+="\n\n Image Filesystems:" + config_message+="\n ${dashes}${dashes}" + config_message+="\n - Flash Size (MiB): \t\t\t ${SYSTEM_SIZE}" + config_message+="\n - Storage Size (MiB): \t\t\t ${STORAGE_SIZE}" + config_message+="\n - SquashFS Compression Method: \t ${SQUASHFS_COMPRESSION}" + if [ -n "${SQUASHFS_COMPRESSION_OPTION}" ]; then + config_message+="\n - SquashFS Compression Options: \t ${SQUASHFS_COMPRESSION_OPTION}" + fi + # Misc. Filesystems config_message+="\n\n Misc. Filesystems:" From 1a128b5b6d6d63bdd614b140e374e2a518d34ba6 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 24 Apr 2022 18:41:49 +0000 Subject: [PATCH 3/3] options: relocate ARM_MEM_SUPPORT to distribution options Display in show_config too. Signed-off-by: Ian Leonard --- config/options | 7 ------- config/show_config | 1 + distributions/LibreELEC/options | 7 +++++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config/options b/config/options index 221463edf9..1973f11652 100644 --- a/config/options +++ b/config/options @@ -35,13 +35,6 @@ fi export ARCH="${ARCH:-x86_64}" TARGET_ARCH="${ARCH}" -# include arm-mem package on arm -if [ "${TARGET_ARCH}" = "arm" ]; then - ARM_MEM_SUPPORT="yes" -else - ARM_MEM_SUPPORT="no" -fi - # include helper functions . config/functions diff --git a/config/show_config b/config/show_config index 58dddeb26c..2ac7d3f2c8 100644 --- a/config/show_config +++ b/config/show_config @@ -33,6 +33,7 @@ show_config() { config_message+="\n - GOLD (Google Linker) Support:\t ${GOLD_SUPPORT}" config_message+="\n - MOLD (Modern Linker) Support:\t ${MOLD_SUPPORT}" config_message+="\n - Default Linker:\t\t\t ${DEFAULT_LINKER}" + config_message+="\n - Accelerated arm libc functions:\t ${ARM_MEM_SUPPORT}" config_message+="\n - LLVM support:\t\t\t ${LLVM_SUPPORT}" config_message+="\n - DEBUG:\t\t\t\t ${DEBUG:-no}" config_message+="\n - CFLAGS:\t\t\t\t ${TARGET_CFLAGS}" diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 3941b115e0..a4ab096ebd 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -50,6 +50,13 @@ # Install glibc locales to the build (yes / no) GLIBC_LOCALES="yes" +# Install arm-mem package on ARM32 (yes / no) + if [ "${TARGET_ARCH}" = "arm" ]; then + ARM_MEM_SUPPORT="yes" + else + ARM_MEM_SUPPORT="no" + fi + # additional drivers to install: # for a list of additional drivers see packages/linux-drivers # Space separated list is supported,