diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index a1a20d9e..cd4e3a02 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -120,7 +120,6 @@ jobs: echo "Repack initrd" cp -f "brx/bzImage-arc" "files/p3/bzImage-arc" - #cp -f "brx/initrd-arc" "files/p3/initrd-arc" repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc" echo "Copying files" @@ -137,9 +136,9 @@ jobs: sudo losetup --detach ${LOOPX} echo "Image Converter" - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk - qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx + qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk + qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk + qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx # Zip image and generate checksum - name: Pack Next Image @@ -210,9 +209,9 @@ jobs: sudo losetup --detach ${LOOPX} echo "Image Converter" - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk - qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx + qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk + qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk + qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx # Zip image and generate checksum - name: Pack Stable Image diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1417241a..1596cd89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -146,7 +146,6 @@ jobs: echo "Repack initrd" cp -f "brx/bzImage-arc" "files/p3/bzImage-arc" - #cp -f "brx/initrd-arc" "files/p3/initrd-arc" repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc" echo "Copying files" @@ -163,9 +162,9 @@ jobs: sudo losetup --detach ${LOOPX} echo "Image Converter" - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk - qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx + qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk + qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk + qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx echo "Create Arc ova" convertova "${IMAGE_FILE}" "arc.ova" @@ -240,9 +239,9 @@ jobs: sudo losetup --detach ${LOOPX} echo "Image Converter" - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk - qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx + qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk + qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk + qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx echo "Create Arc ova" convertova "${IMAGE_FILE}" "arc.ova" diff --git a/img-gen-n.sh b/img-gen-n.sh index eb231482..63f67e1d 100755 --- a/img-gen-n.sh +++ b/img-gen-n.sh @@ -46,7 +46,6 @@ echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH echo "Repack initrd" cp -f "brx/bzImage-arc" "files/p3/bzImage-arc" -#cp -f "brx/initrd-arc" "files/p3/initrd-arc" repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc" echo "Copying files" @@ -62,4 +61,4 @@ rmdir "/tmp/p3" sudo losetup --detach ${LOOPX} -qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk +qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk diff --git a/img-gen-s.sh b/img-gen-s.sh index 4e0c6bd9..3cfb7433 100755 --- a/img-gen-s.sh +++ b/img-gen-s.sh @@ -46,7 +46,6 @@ echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH echo "Repack initrd" cp -f "brs/bzImage-arc" "files/p3/bzImage-arc" -#cp -f "brs/initrd-arc" "files/p3/initrd-arc" repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc" echo "Copying files" @@ -62,4 +61,4 @@ rmdir "/tmp/p3" sudo losetup --detach ${LOOPX} -qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk +qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk