From 5263469dc3f4cf4a01244ed257f9822e5ed6b54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Wed, 31 May 2023 11:09:23 +0200
Subject: [PATCH] x86 architecture

---
 .github/workflows/build.yml       | 1 +
 haiku.pkr.hcl                     | 4 ++--
 resources/provision.sh            | 7 ++++++-
 var_files/r1beta4/x86.pkrvars.hcl | 1 +
 var_files/x86.pkrvars.hcl         | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 var_files/r1beta4/x86.pkrvars.hcl
 create mode 100644 var_files/x86.pkrvars.hcl

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8982353..803d886 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,6 +20,7 @@ jobs:
             - 'r1beta4'
 
           architecture:
+            - x86
             - x86-64
 
     steps:
diff --git a/haiku.pkr.hcl b/haiku.pkr.hcl
index e5121d3..c6f72ae 100644
--- a/haiku.pkr.hcl
+++ b/haiku.pkr.hcl
@@ -112,7 +112,7 @@ source "qemu" "qemu" {
   boot_wait = "45s"
 
   boot_command = [
-    "<enter><wait20s>",
+    "<enter><wait30s>",
     "<menu><wait5s>",
     "<down><down><down><down><down><down><down><down><down><down><right><wait2s>",
     "<down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><down><enter><wait5s>",
@@ -123,7 +123,7 @@ source "qemu" "qemu" {
     "Installer<enter><wait2s>",
     "<enter><wait3s>",
     "<tab><wait1s><tab><wait1s><down><wait1s><up><wait1s><down><wait1s><enter><wait1s><enter><wait45s>",
-    "<enter>",
+    "<enter><wait1s>",
     "shutdown -r<enter>"
   ]
 
diff --git a/resources/provision.sh b/resources/provision.sh
index 9ae5628..86cd370 100644
--- a/resources/provision.sh
+++ b/resources/provision.sh
@@ -4,7 +4,12 @@ set -exu
 
 
 install_extra_packages() {
-  pkgman update -y haiku haiku_devel haiku_loader haiku_datatranslators webpositive
+  if [[ "`uname -m`" == "BePC" ]]; then
+	  pkgman update -y haiku haiku_devel haiku_loader haiku_datatranslators
+	  pkgman update -y haiku_x86 haiku_x86_devel webpositive_x86
+  else
+	  pkgman update -y haiku haiku_devel haiku_loader haiku_datatranslators webpositive
+  fi
 }
 
 install_extra_packages
diff --git a/var_files/r1beta4/x86.pkrvars.hcl b/var_files/r1beta4/x86.pkrvars.hcl
new file mode 100644
index 0000000..c33dd3b
--- /dev/null
+++ b/var_files/r1beta4/x86.pkrvars.hcl
@@ -0,0 +1 @@
+checksum = "sha256:c184e609a6c0021f9acd2df9fc111c2e12d01107d01f943fbea66c936b063f88"
diff --git a/var_files/x86.pkrvars.hcl b/var_files/x86.pkrvars.hcl
new file mode 100644
index 0000000..e84b6ef
--- /dev/null
+++ b/var_files/x86.pkrvars.hcl
@@ -0,0 +1 @@
+architecture = "x86"