From 205cab6d0e6be2721c5338bef232e3345d3a299f Mon Sep 17 00:00:00 2001
From: Noel Georgi <git@frezbo.dev>
Date: Tue, 11 Jul 2023 02:10:11 +0530
Subject: [PATCH] chore: feat use new sd-boot

Use new sd-boot. Also drop sd-stub since it's all a single build now.

Signed-off-by: Noel Georgi <git@frezbo.dev>
---
 Makefile                 |  1 -
 Pkgfile                  |  2 +-
 reproducibility/pkg.yaml |  1 -
 sd-boot/pkg.yaml         |  1 +
 sd-stub/pkg.yaml         | 15 ---------------
 5 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 sd-stub/pkg.yaml

diff --git a/Makefile b/Makefile
index e4e8d3334..ab1686e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,6 @@ TARGETS = \
 	raspberrypi-firmware \
 	runc \
 	sd-boot \
-	sd-stub \
 	socat \
 	syslinux \
 	u-boot \
diff --git a/Pkgfile b/Pkgfile
index 288329af2..19598dbd3 100644
--- a/Pkgfile
+++ b/Pkgfile
@@ -3,7 +3,7 @@
 format: v1alpha2
 
 vars:
-  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.5.0-alpha.0-16-gcd3b692
+  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.5.0-alpha.0-17-g9b6d512
 
   # renovate: datasource=github-releases depName=containernetworking/plugins
   cni_version: v1.3.0
diff --git a/reproducibility/pkg.yaml b/reproducibility/pkg.yaml
index 0d4c6abc6..2edf10ee2 100644
--- a/reproducibility/pkg.yaml
+++ b/reproducibility/pkg.yaml
@@ -33,7 +33,6 @@ dependencies:
   # - stage: raspberrypi-firmware
   - stage: runc
   - stage: sd-boot
-  - stage: sd-stub
   - stage: socat
   - stage: syslinux
   - stage: u-boot
diff --git a/sd-boot/pkg.yaml b/sd-boot/pkg.yaml
index 1c0042114..c17654aa6 100644
--- a/sd-boot/pkg.yaml
+++ b/sd-boot/pkg.yaml
@@ -10,6 +10,7 @@ steps:
         mkdir -p /rootfs
 
         cp /toolchain/lib/systemd/boot/efi/*.efi /rootfs
+        cp /toolchain/lib/systemd/boot/efi/*.efi.stub /rootfs
 finalize:
   - from: /rootfs
     to: /
diff --git a/sd-stub/pkg.yaml b/sd-stub/pkg.yaml
deleted file mode 100644
index 40f150f67..000000000
--- a/sd-stub/pkg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: sd-stub
-variant: scratch
-shell: /toolchain/bin/bash
-dependencies:
-  - stage: base
-  - image: "{{ .TOOLS_IMAGE }}"
-steps:
-  - install:
-      - |
-        mkdir -p /rootfs
-
-        cp /toolchain/lib/systemd/boot/efi/*.efi.stub /rootfs
-finalize:
-  - from: /rootfs
-    to: /