From 853ec1c6ace8a85429b38d8968a51f21f2100379 Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Tue, 20 Dec 2022 10:55:46 +0100 Subject: [PATCH] refactor(olss): :recycle: aarch64 builds improvements Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/distr/ol8-aarch64/image-scripts.sh | 2 +- oracle-linux-image-tools/distr/ol9-aarch64/image-scripts.sh | 2 +- oracle-linux-image-tools/packer-template/qemu-aarch64.pkr.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oracle-linux-image-tools/distr/ol8-aarch64/image-scripts.sh b/oracle-linux-image-tools/distr/ol8-aarch64/image-scripts.sh index c0889d8..da40e93 100755 --- a/oracle-linux-image-tools/distr/ol8-aarch64/image-scripts.sh +++ b/oracle-linux-image-tools/distr/ol8-aarch64/image-scripts.sh @@ -47,7 +47,7 @@ distr::validate() { # None ####################################### distr::packer_conf() { - if [[ -c /dev/kvm ]]; then + if [[ -c /dev/kvm && $(uname -m) == "aarch64" ]]; then cat >>"$1" <<-EOF accel = "kvm" EOF diff --git a/oracle-linux-image-tools/distr/ol9-aarch64/image-scripts.sh b/oracle-linux-image-tools/distr/ol9-aarch64/image-scripts.sh index e5a11e3..18dbf4f 100755 --- a/oracle-linux-image-tools/distr/ol9-aarch64/image-scripts.sh +++ b/oracle-linux-image-tools/distr/ol9-aarch64/image-scripts.sh @@ -98,7 +98,7 @@ logvol / --fstype=\"xfs\" --vgname=vg_main --size=4096 --name=lv_root --gr # None ####################################### distr::packer_conf() { - if [[ -c /dev/kvm ]]; then + if [[ -c /dev/kvm && $(uname -m) == "aarch64" ]]; then cat >>"$1" <<-EOF accel = "kvm" EOF diff --git a/oracle-linux-image-tools/packer-template/qemu-aarch64.pkr.hcl b/oracle-linux-image-tools/packer-template/qemu-aarch64.pkr.hcl index 98602bd..ca4da89 100644 --- a/oracle-linux-image-tools/packer-template/qemu-aarch64.pkr.hcl +++ b/oracle-linux-image-tools/packer-template/qemu-aarch64.pkr.hcl @@ -53,7 +53,7 @@ source "qemu" "aarch64" { qemuargs = concat( var.qemu_args, [ - ["-machine", "virt-rhel8.2.0,accel=${local.accel},dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format"], + ["-machine", "virt,accel=${local.accel},dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format"], ["-cpu", local.cpu], [ "-blockdev",