Merge pull request #7036 from antonlacon/le11-scripts

buildsystem: additions to show_config, related

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
 

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}"
@@ -62,6 +63,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:"

distributions/LibreELEC/options

@@ -53,6 +53,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,
@@ -65,6 +72,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"
 

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
 }

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} ))