From fb4c3d9fcb2d2ff63990905d5a966ed5ae79c966 Mon Sep 17 00:00:00 2001 From: Fabio Belavenuto Date: Tue, 26 Jul 2022 17:28:01 -0300 Subject: [PATCH] Cosmetics --- VERSION | 2 +- files/board/arpl/overlayfs/opt/arpl/include/consts.sh | 2 +- files/board/arpl/overlayfs/opt/arpl/menu.sh | 6 ++++-- img-gen.sh | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index ede7e587..64d0a444 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3-alpha5 +0.3-alpha6 diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh index d2f8c51f..95d4ebf4 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh @@ -1,5 +1,5 @@ -ARPL_VERSION="0.3-alpha5" +ARPL_VERSION="0.3-alpha6" # Define paths TMP_PATH="/tmp" diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 66f8f2b0..e0298806 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -63,6 +63,7 @@ function modelMenu() { M="`basename ${M}`" M="${M::-4}" PLATFORM=`readModelKey "${M}" "platform"` + DT="`readModelKey "${M}" "dt"`" # Check id model is compatible with CPU COMPATIBLE=1 for F in `readModelArray "${M}" "flags"`; do @@ -71,9 +72,10 @@ function modelMenu() { break fi done - [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} ${PLATFORM} " + [ "${DT}" = "true" ] && DT="-DT" || DT="" + [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} \Zb${PLATFORM}${DT}\Zn " done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) - dialog --backtitle "`backtitle`" --menu "Choose the model" 0 0 0 \ + dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \ ${ITEMS} 2>${TMP_PATH}/resp [ $? -ne 0 ] && return resp=$(<${TMP_PATH}/resp) diff --git a/img-gen.sh b/img-gen.sh index 9047a1f0..7a1284bb 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -73,7 +73,8 @@ echo "Version: ${VERSION}" echo "Building... Drink a coffee and wait!" make BR2_EXTERNAL=../external cd - -qemu-img convert -O vmdk arpl.img arpl.vmdk +qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img arpl.vmdk +#qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk [ -x test.sh ] && ./test.sh rm -f *.zip zip -9 "arpl-${VERSION}.img.zip" arpl.img