Merge pull request #61 from fbelavenuto/dev

Modules
This commit is contained in:
Fabio Belavenuto 2022-07-27 11:41:59 -03:00 committed by GitHub
commit fcc9328138
12 changed files with 8 additions and 5 deletions

View File

@ -1 +1 @@
0.3-alpha5 0.3-alpha6

View File

@ -1,5 +1,5 @@
ARPL_VERSION="0.3-alpha5" ARPL_VERSION="0.3-alpha6"
# Define paths # Define paths
TMP_PATH="/tmp" TMP_PATH="/tmp"

View File

@ -63,6 +63,7 @@ function modelMenu() {
M="`basename ${M}`" M="`basename ${M}`"
M="${M::-4}" M="${M::-4}"
PLATFORM=`readModelKey "${M}" "platform"` PLATFORM=`readModelKey "${M}" "platform"`
DT="`readModelKey "${M}" "dt"`"
# Check id model is compatible with CPU # Check id model is compatible with CPU
COMPATIBLE=1 COMPATIBLE=1
for F in `readModelArray "${M}" "flags"`; do for F in `readModelArray "${M}" "flags"`; do
@ -71,9 +72,10 @@ function modelMenu() {
break break
fi fi
done 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) 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 ${ITEMS} 2>${TMP_PATH}/resp
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
resp=$(<${TMP_PATH}/resp) resp=$(<${TMP_PATH}/resp)

View File

@ -73,7 +73,8 @@ echo "Version: ${VERSION}"
echo "Building... Drink a coffee and wait!" echo "Building... Drink a coffee and wait!"
make BR2_EXTERNAL=../external make BR2_EXTERNAL=../external
cd - 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 [ -x test.sh ] && ./test.sh
rm -f *.zip rm -f *.zip
zip -9 "arpl-${VERSION}.img.zip" arpl.img zip -9 "arpl-${VERSION}.img.zip" arpl.img