Skip to content

Commit 71188f1

Browse files
committed
Assorted aarch64 fixups
1 parent 06163df commit 71188f1

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
run: |
5656
packer validate packer/ubuntu-build.json
5757
packer validate packer/mint-build.json
58+
packer validate packer/ubuntu-kvm.json
5859
# Allow beta/test builds to fail validation
5960
packer validate -var-file=packer/beta-vars.json packer/mint-build.json || true
6061
Python:

packer/ubuntu-kvm.json

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
2-
"min_packer_version": "1.7.1",
2+
"min_packer_version": "1.6.0",
33
"variables": {
4-
"vm_name": "JMU Linux Mint",
4+
"vm_name": "JMU Ubuntu",
55
"semester": "Fa21",
6-
"version": "20",
76

87
"build_id": "{{isotime \"2006-01-02\"}}",
98

@@ -12,7 +11,7 @@
1211

1312
"headless": "false",
1413

15-
"output_dir": "{{pwd}}/artifacts_mint",
14+
"output_dir": "{{pwd}}/{{user `vm_name`}} {{user `semester`}}.utm/Images",
1615
"mirror_url": "http://cdimage.ubuntu.com/focal/daily-live/current",
1716
"iso_file": "focal-desktop-arm64.iso",
1817

@@ -27,9 +26,9 @@
2726
"accelerator": "kvm",
2827
"memory": 4096,
2928
"machine_type": "virt",
30-
"firmware": "/usr/share/qemu-efi-aarch64/QEMU_EFI.fd",
3129
"qemu_binary": "qemu-system-aarch64",
3230
"qemuargs": [
31+
[ "-bios", "/usr/share/qemu-efi-aarch64/QEMU_EFI.fd" ],
3332
[ "-boot", "strict=off" ],
3433
[ "-vga", "vmware" ],
3534
[ "-cpu", "host" ],
@@ -53,10 +52,10 @@
5352
"ssh_username": "{{user `ssh_user`}}",
5453
"ssh_password": "{{user `ssh_pass`}}",
5554
"ssh_timeout": "100m",
56-
"vm_name": "{{user `vm_name`}} {{user `semester`}}",
55+
"vm_name": "image.qcow2",
5756
"net_device": "virtio-net",
5857
"disk_interface": "virtio",
59-
"boot_wait": "15s",
58+
"boot_wait": "25s",
6059
"boot_command": [
6160
"c<wait><wait>",
6261
"linux /casper/vmlinuz",
@@ -83,12 +82,5 @@
8382
"./oem-build",
8483
"/usr/sbin/oem-config-prepare"
8584
]
86-
}],
87-
"post-processors": [
88-
{
89-
"type": "checksum",
90-
"checksum_types": "sha256",
91-
"output": "{{user `output_dir`}}/image-{{user `semester` | lower }}.{{.ChecksumType}}sum"
92-
}
93-
]
85+
}]
9486
}

0 commit comments

Comments
 (0)