diff --git a/toolkit/imageconfigs/core-efi-aarch64.json b/toolkit/imageconfigs/core-efi-aarch64.json new file mode 100644 index 0000000000..c0ec5d4cba --- /dev/null +++ b/toolkit/imageconfigs/core-efi-aarch64.json @@ -0,0 +1,58 @@ +{ + "Disks": [ + { + "PartitionTableType": "gpt", + "MaxSize": 4096, + "Artifacts": [ + { + "Name": "core", + "Type": "vhdx" + } + ], + "Partitions": [ + { + "ID": "boot", + "Flags": [ + "esp", + "boot" + ], + "Start": 1, + "End": 9, + "FsType": "fat32" + }, + { + "ID": "rootfs", + "Start": 9, + "End": 0, + "FsType": "ext4" + } + ] + } + ], + "SystemConfigs": [ + { + "Name": "Standard", + "BootType": "efi", + "PartitionSettings": [ + { + "ID": "boot", + "MountPoint": "/boot/efi", + "MountOptions" : "umask=0077" + }, + { + "ID": "rootfs", + "MountPoint": "/" + } + ], + "PackageLists": [ + "packagelists/hyperv-packages.json", + "packagelists/core-packages-image-aarch64.json", + "packagelists/cloud-init-packages.json" + ], + "KernelOptions": { + "default": "kernel" + }, + "Hostname": "cbl-mariner" + } + ] +} diff --git a/toolkit/imageconfigs/full-aarch64.json b/toolkit/imageconfigs/full-aarch64.json new file mode 100644 index 0000000000..73b1c03e21 --- /dev/null +++ b/toolkit/imageconfigs/full-aarch64.json @@ -0,0 +1,26 @@ +{ + "SystemConfigs": [ + { + "Name": "CBL-Mariner Full", + "PackageLists": [ + "packagelists/hyperv-packages.json", + "packagelists/developer-packages.json", + "packagelists/virtualization-host-packages.json", + "packagelists/core-packages-image-aarch64.json" + ], + "KernelOptions": { + "default": "kernel" + } + }, + { + "Name": "CBL-Mariner Core", + "PackageLists": [ + "packagelists/hyperv-packages.json", + "packagelists/core-packages-image-aarch64.json" + ], + "KernelOptions": { + "default": "kernel" + } + } + ] +} \ No newline at end of file diff --git a/toolkit/imageconfigs/packagelists/core-packages-image-aarch64.json b/toolkit/imageconfigs/packagelists/core-packages-image-aarch64.json new file mode 100644 index 0000000000..15aff253e4 --- /dev/null +++ b/toolkit/imageconfigs/packagelists/core-packages-image-aarch64.json @@ -0,0 +1,10 @@ +{ + "packages": [ + "shim-unsigned", + "grub2-efi-binary", + "ca-certificates", + "core-packages-base-image", + "initramfs" + ], + "_comment": "Install 'initramfs' last to avoid unnecessary regeneration when other packages, such as 'kernel', are installed." +} diff --git a/toolkit/imageconfigs/packagelists/core-packages-image.json b/toolkit/imageconfigs/packagelists/core-packages-image.json index 15aff253e4..865b8595e2 100644 --- a/toolkit/imageconfigs/packagelists/core-packages-image.json +++ b/toolkit/imageconfigs/packagelists/core-packages-image.json @@ -1,6 +1,6 @@ { "packages": [ - "shim-unsigned", + "shim", "grub2-efi-binary", "ca-certificates", "core-packages-base-image", diff --git a/toolkit/resources/imageconfigs/packagelists/iso-initrd-packages.json b/toolkit/resources/imageconfigs/packagelists/iso-initrd-packages.json index 20b2997ac0..f6e6c558e9 100644 --- a/toolkit/resources/imageconfigs/packagelists/iso-initrd-packages.json +++ b/toolkit/resources/imageconfigs/packagelists/iso-initrd-packages.json @@ -57,7 +57,7 @@ "rpm", "sed", "shadow-utils", - "shim-unsigned", + "shim", "sqlite", "systemd", "tar",