Changing VMDK generation with the subformat=monolithicFlat

shawchina · Aug 22, 2022 · 1e614c6 · 1e614c6
1 parent be25617
commit 1e614c6
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -84,14 +84,15 @@ jobs:
  echo "Building..."
  make BR2_EXTERNAL=../external
  cd -
- qemu-img convert -O vmdk arpl.img arpl.vmdk
+ #qemu-img convert -O vmdk arpl.img arpl.vmdk
+ qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 
  # Zip image
  - name: Pack
  shell: bash
  run: |
  zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img
- zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip" arpl.vmdk
+ zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip" arpl*.vmdk
 
  # Upload artifact
  - name: Upload
@@ -100,7 +101,7 @@ jobs:
  name: Images
  path: |
  arpl.img
- arpl.vmdk
+ arpl*.vmdk
  retention-days: 5
 
  # Publish a release if is a tag

diff --git a/TODO b/TODO
@@ -1,6 +1,8 @@
 A fazer
  - Checar se tem como atualizar microcode via addon/modules/whatever...
  - Estudar acrescentar modo simples e avançado do menu
+ - Adicionar mais bnários para o addon dbgutils (nano, trace, etc)
+ - Retirar o ttyd da memória quando o root do dsm dar boot
 
 Concluidos:
  - Generalizar código dos addons

diff --git a/files/board/arpl/make-img.sh b/files/board/arpl/make-img.sh
@@ -45,6 +45,8 @@ sudo cp "${BINARIES_DIR}/rootfs.cpio.xz" "${BINARIES_DIR}/p3/initrd-arpl"
 sudo cp -R "${BOARD_PATH}/p1/"* "${BINARIES_DIR}/p1"
 sudo cp -R "${BOARD_PATH}/p3/"* "${BINARIES_DIR}/p3"
 sync
+cp "${BINARIES_DIR}/bzImage" ~/bzImage-arpl
+cp "${BINARIES_DIR}/rootfs.cpio.xz" ~/initrd-arpl
 
 echo "Unmount image file"
 sudo umount "${BINARIES_DIR}/p1"

diff --git a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz
diff --git a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz
diff --git a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz
diff --git a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz
diff --git a/files/board/arpl/p3/modules/denverton-4.4.180.tgz b/files/board/arpl/p3/modules/denverton-4.4.180.tgz
diff --git a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz
diff --git a/files/board/arpl/p3/modules/v1000-4.4.180.tgz b/files/board/arpl/p3/modules/v1000-4.4.180.tgz
diff --git a/img-gen.sh b/img-gen.sh
@@ -80,9 +80,9 @@ echo "Version: ${VERSION}"
 echo "Building... Drink a coffee and wait!"
 make BR2_EXTERNAL=../external
 cd -
-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
+#qemu-img convert -O vmdk -o adapter_type=lsilogic -o compat6 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
-zip -9 "arpl-${VERSION}.vmdk.zip" arpl.vmdk
+zip -9 "arpl-${VERSION}.vmdk.zip" arpl*.vmdk