ec2-ami: remove raw rootfs conversion

EC2 supports vhdx disk formats.
aws4embeddedlinux · Sep 2, 2023 · 68594f0 · 68594f0
1 parent 8ce2b15
commit 68594f0
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/scripts/ec2-ami/create-ec2-ami.sh b/scripts/ec2-ami/create-ec2-ami.sh
@@ -38,19 +38,16 @@ echo TARGET_ARCH=$TARGET_ARCH
 echo IMAGE_ROOTFS_SIZE=$IMAGE_ROOTFS_SIZE
 echo AMI_DISK_SIZE_GB=$AMI_DISK_SIZE_GB
 
-echo "Converting ${IMAGE_NAME}.wic.vhdx to raw format"
-qemu-img convert -f vhdx -O raw ${IMG_DIR}/${IMAGE_NAME}.wic.vhdx ${IMG_DIR}/${IMAGE_NAME}.rootfs.raw
-
-echo "Pushing image ${IMAGE_NAME}.rootfs.raw to s3://${IMPORT_BUCKET_NAME}"
-aws s3 cp ${IMG_DIR}/${IMAGE_NAME}.rootfs.raw s3://${IMPORT_BUCKET_NAME}
+echo "Pushing image ${IMAGE_NAME}.wic.vhdx to s3://${IMPORT_BUCKET_NAME}"
+aws s3 cp ${IMG_DIR}/${IMAGE_NAME}.wic.vhdx s3://${IMPORT_BUCKET_NAME}
 
 cat <<EOF > image-import.json
 {
     "Description": "ewaol docker image",
-    "Format": "raw",
+    "Format": "vhd",
     "UserBucket": {
         "S3Bucket": "${IMPORT_BUCKET_NAME}",
-        "S3Key": "${IMAGE_NAME}.rootfs.raw"
+        "S3Key": "${IMAGE_NAME}.wic.vhdx"
     }
 }
 EOF