chore: copy over sd-boot and sd-stub from tools

Copy over sd-boot and sd-stub from tools, since they are sttaic EFI PE32 executables. Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · May 16, 2023 · 7958db1 · 7958db1
1 parent 813b3c3
commit 7958db1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 160 deletions.
diff --git a/Pkgfile b/Pkgfile
@@ -3,7 +3,7 @@
 format: v1alpha2
 
 vars:
-  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.5.0-alpha.0-4-geedc294
+  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.5.0-alpha.0-5-g271c4a6
 
   # renovate: datasource=github-releases depName=containernetworking/plugins
   cni_version: v1.3.0

diff --git a/libinih/pkg.yaml b/libinih/pkg.yaml
@@ -3,14 +3,13 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
+  - stage: openssl
 steps:
   - sources:
       - url: https://github.com/benhoyt/inih/archive/refs/tags/r{{ .libinih_version }}.tar.gz
         destination: inih.tar.gz
         sha256: "{{ .libinih_sha256 }}"
         sha512: "{{ .libinih_sha512 }}"
-    env:
-      LD_LIBRARY_PATH: /toolchain/lib
     prepare:
       - |
         tar -xzf inih.tar.gz --strip-components=1
@@ -45,13 +44,13 @@ steps:
         -Dutf-8_bom=true \
         -Dinline_comments=true \
         -Duse_heap=false \
-        . output
+        . build
     build:
       - |
-        meson compile -j 1 -C output
+        meson compile -j 1 -C build
     install:
       - |
-        DESTDIR="/rootfs" meson install --no-rebuild -C output
+        DESTDIR="/rootfs" meson install --no-rebuild -C build
 finalize:
   - from: /rootfs
     to: /
diff --git a/sd-boot/patches/musl.patch b/sd-boot/patches/musl.patch
diff --git a/sd-boot/pkg.yaml b/sd-boot/pkg.yaml
@@ -3,47 +3,13 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
+  - image: "{{ .TOOLS_IMAGE }}"
 steps:
-  - sources:
-      - url: https://github.com/systemd/systemd/archive/refs/tags/v{{ .systemd_version }}.tar.gz
-        destination: systemd.tar.gz
-        sha256: "{{ .systemd_sha256 }}"
-        sha512: "{{ .systemd_sha512 }}"
-    env:
-      LD_LIBRARY_PATH: /toolchain/lib
-    prepare:
-      - |
-        tar -xzf systemd.tar.gz --strip-components=1
-
-        ln -s /toolchain/bin/echo /toolchain/bin/getent
-        mkdir -p /usr/bin
-        ln -sf /toolchain/bin/env /usr/bin/env
-        ln -sf /toolchain/bin/python3 /toolchain/bin/python
-
-        pip3 install jinja2 ninja
-
-        patch -p1 < /pkg/patches/musl.patch
-
-        meson setup build \
-          --buildtype=release \
-          -Dmode=release \
-          -Dsbat-distro=talos \
-          -Dsbat-distro-summary="Talos Linux" \
-          -Dsbat-distro-url=https://github.com/siderolabs/pkgs/issues \
-          -Dman=false \
-          -Defi=true \
-          -Dgnu-efi=true \
-          -Defi-libdir=/toolchain/lib \
-          -Defi-includedir=/toolchain/include/efi \
-          -Dtests=false
-    build:
-      - |
-        ninja -j $(nproc) -C build systemd-boot
-    install:
+  - install:
       - |
         mkdir -p /rootfs
 
-        cp build/src/boot/efi/*.efi /rootfs
+        cp /toolchain/lib/systemd/boot/efi/*.efi /rootfs
 finalize:
   - from: /rootfs
     to: /
diff --git a/sd-stub/patches/musl.patch b/sd-stub/patches/musl.patch
diff --git a/sd-stub/pkg.yaml b/sd-stub/pkg.yaml
@@ -3,47 +3,13 @@ variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
   - stage: base
+  - image: "{{ .TOOLS_IMAGE }}"
 steps:
-  - sources:
-      - url: https://github.com/systemd/systemd/archive/refs/tags/v{{ .systemd_version }}.tar.gz
-        destination: systemd.tar.gz
-        sha256: "{{ .systemd_sha256 }}"
-        sha512: "{{ .systemd_sha512 }}"
-    env:
-      LD_LIBRARY_PATH: /toolchain/lib
-    prepare:
-      - |
-        tar -xzf systemd.tar.gz --strip-components=1
-
-        ln -s /toolchain/bin/echo /toolchain/bin/getent
-        mkdir -p /usr/bin
-        ln -sf /toolchain/bin/env /usr/bin/env
-        ln -sf /toolchain/bin/python3 /toolchain/bin/python
-
-        pip3 install jinja2 ninja
-
-        patch -p1 < /pkg/patches/musl.patch
-
-        meson setup build \
-          --buildtype=release \
-          -Dmode=release \
-          -Dsbat-distro=talos \
-          -Dsbat-distro-summary="Talos Linux" \
-          -Dsbat-distro-url=https://github.com/siderolabs/pkgs/issues \
-          -Dman=false \
-          -Defi=true \
-          -Dgnu-efi=true \
-          -Defi-libdir=/toolchain/lib \
-          -Defi-includedir=/toolchain/include/efi \
-          -Dtests=false
-    build:
-      - |
-        ninja -j $(nproc) -C build systemd-stub
-    install:
+  - install:
       - |
         mkdir -p /rootfs
 
-        cp build/src/boot/efi/*.efi.stub /rootfs
+        cp /toolchain/lib/systemd/boot/efi/*.efi.stub /rootfs
 finalize:
   - from: /rootfs
     to: /