chore: Get things building again

Containerfile

@@ -4,11 +4,11 @@ COPY ./packages /packages
 
 FROM cgr.dev/chainguard/wolfi-base AS builder
 
-RUN --mount=type=bind,from=ctx,source=/packages,target=/repo \
-    apk add --allow-untrusted \
-        -X /repo \
-        -X https://packages.wolfi.dev/os \
-        -U --initdb -p /mnt \
+RUN --mount=type=bind,from=ctx,source=/packages,target=/repo <<EOF
+apk add -p /mnt \
+  --allow-untrusted -U --initdb \
+  -X https://apk.cgr.dev/chainguard \
+  -X /repo \
     ostree \
     composefs \
     bootc \
@@ -47,22 +47,25 @@ RUN --mount=type=bind,from=ctx,source=/packages,target=/repo \
     dbus-glib \
     glib \
     shadow
+EOF
 
 # Turn the pacstrapped rootfs into a container image.
 FROM scratch
 COPY --from=builder /mnt /
 
 # Alter root file structure a bit for ostree
-RUN mkdir -p /boot /sysroot && \
-    rm -rf /var/log /home /root /usr/local /srv && \
-    ln -s /var/home /home && \
-    ln -s /var/roothome /root && \
-    ln -s /var/usrlocal /usr/local && \
-    ln -s /var/srv /srv
+RUN <<EOF
+mkdir -p /boot /sysroot
+rm -rf /var/log /home /root /usr/local /srv
+ln -s /var/home /home
+ln -s /var/roothome /root
+ln -s /var/usrlocal /usr/local
+ln -s /var/srv /srv
+EOF
 
 # Setup a temporary root passwd (changeme) for dev purposes
 # TODO: Replace this for a more robust option when in prod
 RUN usermod -p '$6$AJv9RHlhEXO6Gpul$5fvVTZXeM0vC03xckTIjY8rdCofnkKSzvF5vEzXDKAby5p3qaOGTHDypVVxKsCE3CbZz7C3NXnbpITrEUvN/Y/' root
 
 # Necessary labels
-LABEL containers.bootc 1
+LABEL containers.bootc=1

Justfile

@@ -46,8 +46,6 @@ build-tree:
     just build composefs-rs
     just build dracut
 
-    just build py3-pefile
-    just build systemd
     just build kernel
     just build kernel-initramfs
     just build kernel-uki

manifests/bootc.yaml

@@ -1,6 +1,6 @@
 package:
   name: bootc
-  version: 1.5.1
+  version: 1.9.0
   epoch: 0
   description: Boot and upgrade via container images
   copyright:
@@ -23,8 +23,8 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/bootc-dev/bootc.git
-      branch: composefs-backend
-      expected-commit: 54e254cf1dc4925285f717353dc769b345ba149e
+      tag: v${{package.version}}
+      expected-commit: 7ad66dbfe3efaf827f4d3b29b4796b38f3d893dc
 
   - uses: patch
     with:

manifests/bootupd.yaml

@@ -1,7 +1,7 @@
 package:
   name: bootupd
-  version: 0.2.29
-  epoch: 2
+  version: 0.2.31
+  epoch: 0
   description: Bootloader updater
   copyright:
     - license: Apache-2.0
@@ -14,10 +14,13 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      repository: https://github.com/p5/coreos-bootupd.git
-      # tag: v${{package.version}}
-      branch: sdboot-support
-      expected-commit: 23d044ce9533823cf0dbf4168122b9c25d918df5
+      repository: https://github.com/coreos/bootupd.git
+      tag: v${{package.version}}
+      expected-commit: de779db5376f692b314a0b447d700db5b42cc6b1
+
+  - uses: patch
+    with:
+      patches: systemd-boot.patch
 
   - uses: cargo/build
     with: