feat: add build of TKL v17

dafyddj · Jul 20, 2023 · 8d67892 · 8d67892
1 parent c169246
commit 8d67892
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,14 +3,15 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   run-packer:
     runs-on: macos-12
+    timeout-minutes: 30
     env:
       MAKE_VARS: --dry-run
       PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       VAGRANT_CLOUD_TOKEN: ${{ secrets.VAGRANT_CLOUD_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
-        version: [tkl16]
+        version: [tkl16, tkl17]
     steps:
       - name: Prepare environment
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [tkl16]
+        version: [tkl16, tkl17]
     steps:
       - name: Prepare environment
         run: |

diff --git a/.kojo/build.kojo b/.kojo/build.kojo
@@ -3,14 +3,15 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   run-packer:
     runs-on: macos-12
+    timeout-minutes: 30
     env:
       MAKE_VARS: --dry-run
       PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       VAGRANT_CLOUD_TOKEN: ${{ secrets.VAGRANT_CLOUD_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
-        version: [tkl16]
+        version: [tkl16, tkl17]
     steps:
       - name: Prepare environment
         run: |

diff --git a/boot/main.build b/boot/main.build
@@ -125,13 +125,43 @@ locals {
     "<tab><right><enter>",                   // Skip email address
     "<wait4s><right><enter><wait4s>"         // Skip security updates
   ]
+  boot_tkl16 = [
+    "<enter><wait40s>",                      // Skip installer boot screen
+    "<enter><wait4s><left><enter>",          // Guided partitioning with LVM, and write to disk
+    "<wait4s><enter>",                       // Choose "90%"
+    "<wait20><left><enter>",                 // "Yes"; write changes to disk
+    "<wait60s><enter>",                      // Copying data to disk; "Yes"; Install GRUB
+    "<wait20><down><enter>",                 // Choose "Reboot system"
+    "<wait70s>",                             // Installation proceeds
+    "${var.ssh_password}<enter><wait2s>",    // Enter password
+    "${var.ssh_password}<enter><wait2s>",    // Enter password again
+    "<tab><right><enter><wait2s>",           // Skip API key
+    "<tab><right><enter>",                   // Skip email address
+    "<wait4s><right><enter><wait4s>"         // Skip security updates
+  ]
+  boot_tkl17 = [
+    "<enter><wait30>",                      // Skip installer boot screen
+    "<enter><wait3><left><enter>",          // Guided partitioning with LVM, and write to disk
+    "<wait3><enter>",                       // Choose "90%"
+    "<wait20><left><enter>",                // "Yes"; write changes to disk
+    "<wait60><enter>",                      // Copying data to disk; "Yes"; Install GRUB
+    "<wait60><up><enter>",                  // Removing live packages; Choose "Eject and Reboot"
+    "<wait4><enter>",                       // "Enter" to continue
+    "<wait70>",                             // Installation proceeds
+    "${var.ssh_password}<enter><wait2>",    // Enter password
+    "${var.ssh_password}<enter><wait2>",    // Enter password again
+    "<tab><right><enter><wait2>",           // Skip API key
+    "<tab><right><enter>",                  // Skip email address
+    "<wait2><right><enter><wait3>"          // Skip security updates
+  ]
 }
 
 source "virtualbox-iso" "boot" {
   boot_wait                = "5s"
   cpus                     = var.cpus
   disk_size                = var.disk_size
   guest_additions_mode     = "disable"
+  guest_os_type = "Debian_64"
   headless                 = var.headless
   hard_drive_discard       = true
   hard_drive_nonrotational = true
@@ -152,7 +182,6 @@ build {
 
   source "virtualbox-iso.boot" {
     boot_command  = local.boot_tkl14_15
-    guest_os_type = "Debian_64"
     iso_checksum  = "171bb1c9fdba78830e7c5c0d084cf4b448ae564b041fff592f46a9306d51dbf7"
     iso_urls      = [
       "${var.root_dir}/iso/turnkey-core-14.2-jessie-amd64.iso",
@@ -164,7 +193,6 @@ build {
 
   source "virtualbox-iso.boot" {
     boot_command  = local.boot_tkl14_15
-    guest_os_type = "Debian_64"
     iso_checksum  = "7c2d654313e934df8a03772680c34cbbc03d93ec6a208961e5f0b85b1c2f68f1"
     iso_urls      = [
       "${var.root_dir}/iso/turnkey-core-15.0-stretch-amd64.iso",
@@ -175,21 +203,7 @@ build {
   }
 
   source "virtualbox-iso.boot" {
-    boot_command             = [
-      "<enter><wait40s>",                      // Skip installer boot screen
-      "<enter><wait4s><left><enter>",          // Guided partitioning with LVM, and write to disk
-      "<wait4s><enter>",                       // Choose "90%"
-      "<wait20><left><enter>",                 // "Yes"; write changes to disk
-      "<wait60s><enter>",                      // Copying data to disk; "Yes"; Install GRUB
-      "<wait20><down><enter>",                 // Choose "Reboot system"
-      "<wait70s>",                             // Installation proceeds
-      "${var.ssh_password}<enter><wait2s>",    // Enter password
-      "${var.ssh_password}<enter><wait2s>",    // Enter password again
-      "<tab><right><enter><wait2s>",           // Skip API key
-      "<tab><right><enter>",                   // Skip email address
-      "<wait4s><right><enter><wait4s>"         // Skip security updates
-    ]
-    guest_os_type = "Debian_64"
+    boot_command  = local.boot_tkl16
     iso_checksum  = "44e79c72781aa2483047552bce7e354838145406409d4a5a5175c8e13ab703ae"
     iso_urls      = [
       "${var.root_dir}/iso/turnkey-core-16.1-buster-amd64.iso",
@@ -199,3 +213,15 @@ build {
     ]
     name          = "tkl16"
   }
+
+  source "virtualbox-iso.boot" {
+    boot_command  = local.boot_tkl17
+    iso_checksum  = "e89d421a4d46a4a35c583b9e6a18a6a5a11d373209d0d30a82c193492af60222"
+    iso_urls      = [
+      "${var.root_dir}/iso/turnkey-core-17.1-bullseye-amd64.iso",
+      "${var.iso_dir}/turnkey-core-17.1-bullseye-amd64.iso",
+      var.iso_url,
+      "http://mirror.turnkeylinux.org/turnkeylinux/images/iso/turnkey-core-17.1-bullseye-amd64.iso"
+    ]
+    name          = "tkl17"
+  }
diff --git a/export/main.build b/export/main.build
@@ -67,3 +67,7 @@ build {
   source "virtualbox-vm.export" {
     name    = "tkl16"
   }
+
+  source "virtualbox-vm.export" {
+    name    = "tkl17"
+  }
diff --git a/install/main.pkr.hcl b/install/main.pkr.hcl
@@ -48,4 +48,8 @@ build {
   source "virtualbox-vm.install" {
     name    = "tkl16"
   }
+
+  source "virtualbox-vm.install" {
+    name    = "tkl17"
+  }
 }
diff --git a/kernel/main.build b/kernel/main.build
@@ -53,3 +53,7 @@ build {
   source "virtualbox-vm.kernel" {
     name    = "tkl16"
   }
+
+  source "virtualbox-vm.kernel" {
+    name    = "tkl17"
+  }
diff --git a/pre.mk b/pre.mk
@@ -17,7 +17,7 @@ vdiext = .vdi
 snapext := .snapshot
 boxext := .box
 
-win_vers := tkl142 tkl15 tkl16
+win_vers := tkl142 tkl15 tkl16 tkl17
 
 artifact_pre :=
 extra_srcs :=

diff --git a/update/main.build b/update/main.build
@@ -53,3 +53,7 @@ build {
   source "virtualbox-vm.update" {
     name    = "tkl16"
   }
+
+  source "virtualbox-vm.update" {
+    name    = "tkl17"
+  }
diff --git a/upload/main.build b/upload/main.build
@@ -39,7 +39,7 @@ build {
     name    = "tkl16"
   }
 
-#  source "null.upload" {
-#    name    = "tkl17"
-#  }
+  source "null.upload" {
+    name    = "tkl17"
+  }