diff --git a/Cargo.lock b/Cargo.lock index e0a55d8..0b88ea5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,9 +129,9 @@ checksum = "534d589df1ef528a238f4bc4b1db081a1280f3aedf2695fd8971e9853a7fa4f6" [[package]] name = "libc" -version = "0.2.177" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "lock_api" @@ -224,9 +224,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", ] @@ -259,9 +259,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.110" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.8" +version = "0.9.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" dependencies = [ "serde_core", "serde_spanned", @@ -283,18 +283,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -371,6 +371,6 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" diff --git a/Cargo.toml b/Cargo.toml index 37f3e89..39c7127 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ version = "1.3.0" default-features = false [workspace.dependencies.toml] -version = "0.9.8" +version = "0.9.10+spec-1.1.0" default-features = false features = ["serde", "parse"] diff --git a/Dockerfile b/Dockerfile index 9ea5c95..9d383c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG RUST_PROFILE=release ARG RUST_TARGET_SUBDIR=release -FROM --platform=$BUILDPLATFORM rust:1.91.1-alpine@sha256:8efbfb788786eeb127adc581394349c5fb567712156e0f8c2e499acadbc23756 AS build +FROM --platform=$BUILDPLATFORM rust:1.92.0-alpine@sha256:f6c22e0a256c05d44fca23bf530120b5d4a6249a393734884281ca80782329bc AS build RUN apk --no-cache add musl-dev busybox-static ARG RUST_PROFILE RUN adduser -S -s /bin/sh build diff --git a/hack/dev/boot/Dockerfile b/hack/dev/boot/Dockerfile index c2e5708..29b4b0f 100644 --- a/hack/dev/boot/Dockerfile +++ b/hack/dev/boot/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM debian:trixie@sha256:01a723bf5bfb21b9dda0c9a33e0538106e4d02cce8f557e118dd61259553d598 AS build +FROM --platform=$BUILDPLATFORM debian:trixie@sha256:0d01188e8dd0ac63bf155900fad49279131a876a1ea7fac917c62e87ccb2732d AS build ARG BUILDPLATFORM ARG EFI_NAME RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y \ diff --git a/hack/dev/build.sh b/hack/dev/build.sh index 38f1bcd..f393a66 100755 --- a/hack/dev/build.sh +++ b/hack/dev/build.sh @@ -113,23 +113,6 @@ if [ "${SKIP_SPROUT_BUILD}" != "1" ]; then cp "hack/dev/configs/${SPROUT_CONFIG_NAME}.sprout.toml" "${FINAL_DIR}/sprout.toml" cp "hack/dev/configs/xen.cfg" "${FINAL_DIR}/xen.cfg" cp "hack/dev/configs/bls.conf" "${FINAL_DIR}/bls.conf" - - mkdir -p "${FINAL_DIR}/efi/EFI/BOOT" - cp "${FINAL_DIR}/sprout.efi" "${FINAL_DIR}/efi/EFI/BOOT/${EFI_NAME}.EFI" - if [ -f "${FINAL_DIR}/kernel.efi" ]; then - cp "${FINAL_DIR}/kernel.efi" "${FINAL_DIR}/efi/EFI/BOOT/KERNEL.EFI" - fi - if [ -f "${FINAL_DIR}/shell.efi" ]; then - cp "${FINAL_DIR}/shell.efi" "${FINAL_DIR}/efi/EFI/BOOT/SHELL.EFI" - fi - if [ -f "${FINAL_DIR}/xen.efi" ]; then - cp "${FINAL_DIR}/xen.efi" "${FINAL_DIR}/efi/EFI/BOOT/XEN.EFI" - fi - if [ -f "${FINAL_DIR}/xen.cfg" ]; then - cp "${FINAL_DIR}/xen.cfg" "${FINAL_DIR}/efi/EFI/BOOT/XEN.CFG" - fi - cp "${FINAL_DIR}/sprout.toml" "${FINAL_DIR}/efi/SPROUT.TOML" - cp "${FINAL_DIR}/initramfs" "${FINAL_DIR}/efi/INITRAMFS" fi if [ "${SKIP_BOOT_BUILD}" != "1" ]; then diff --git a/hack/dev/configs/xen.cfg b/hack/dev/configs/xen.cfg index 358ac4d..01b4b55 100644 --- a/hack/dev/configs/xen.cfg +++ b/hack/dev/configs/xen.cfg @@ -3,5 +3,5 @@ default=sprout [sprout] options=clocksource=tsc smp=on smt=on ioapic_ack=new dom0_vcpus_pin=on spec-ctrl=gds-mit=no noreboot console=com1 -kernel=\EFI\BOOT\KERNEL.EFI console=hvc0 -ramdisk=\initramfs +kernel=\VMLINUZ console=hvc0 +ramdisk=\INITRAMFS diff --git a/hack/dev/kernel/Dockerfile b/hack/dev/kernel/Dockerfile index 05529ab..0ef0893 100644 --- a/hack/dev/kernel/Dockerfile +++ b/hack/dev/kernel/Dockerfile @@ -1,7 +1,7 @@ -ARG KERNEL_SOURCE_URL=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.17.8.tar.xz -ARG KERNEL_CHECKSUM=sha256:5a8de64a75fca706c01c6c0a77cf75a74618439db195e25f1f0268af6b2fb1da +ARG KERNEL_SOURCE_URL=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.2.tar.xz +ARG KERNEL_CHECKSUM=sha256:558c6bbab749492b34f99827fe807b0039a744693c21d3a7e03b3a48edaab96a -FROM --platform=$BUILDPLATFORM debian:trixie@sha256:01a723bf5bfb21b9dda0c9a33e0538106e4d02cce8f557e118dd61259553d598 AS buildenv +FROM --platform=$BUILDPLATFORM debian:trixie@sha256:0d01188e8dd0ac63bf155900fad49279131a876a1ea7fac917c62e87ccb2732d AS buildenv RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y \ build-essential squashfs-tools python3-yaml \ patch diffutils sed mawk findutils zstd \ diff --git a/hack/dev/kernel/docker-build.sh b/hack/dev/kernel/docker-build.sh index f88f568..05e3dc5 100755 --- a/hack/dev/kernel/docker-build.sh +++ b/hack/dev/kernel/docker-build.sh @@ -38,11 +38,17 @@ if [ "${TARGET_KARCH}" = "x86_64" ]; then ./scripts/config -e XEN_PV_DOM0 fi +./scripts/config -e IPV6 + ./scripts/config -e BPF_SYSCALL ./scripts/config -e UEVENT_HELPER ./scripts/config --set-str UEVENT_HELPER_PATH "/sbin/hotplug" +./scripts/config -e SYN_COOKIES + +./scripts/config -d DEBUG_STACK_USAGE + ./scripts/config -e DRM_VIRTIO_GPU ./scripts/config -e FRAMEBUFFER_CONSOLE ./scripts/config -e FRAMEBUFFER_CONSOLE_DETECT_PRIMARY diff --git a/hack/dev/utils/Dockerfile.copy-direct b/hack/dev/utils/Dockerfile.copy-direct index a78f4c6..200a0f8 100644 --- a/hack/dev/utils/Dockerfile.copy-direct +++ b/hack/dev/utils/Dockerfile.copy-direct @@ -1 +1 @@ -FROM --platform=$BUILDPLATFORM debian:trixie@sha256:01a723bf5bfb21b9dda0c9a33e0538106e4d02cce8f557e118dd61259553d598 +FROM --platform=$BUILDPLATFORM debian:trixie@sha256:0d01188e8dd0ac63bf155900fad49279131a876a1ea7fac917c62e87ccb2732d diff --git a/hack/dev/utils/Dockerfile.copy-polyfill b/hack/dev/utils/Dockerfile.copy-polyfill index bbf9dd5..ba65b69 100644 --- a/hack/dev/utils/Dockerfile.copy-polyfill +++ b/hack/dev/utils/Dockerfile.copy-polyfill @@ -1,4 +1,4 @@ ARG TARGET_IMAGE=scratch FROM ${TARGET_IMAGE} AS image -FROM --platform=$BUILDPLATFORM debian:trixie@sha256:01a723bf5bfb21b9dda0c9a33e0538106e4d02cce8f557e118dd61259553d598 AS final +FROM --platform=$BUILDPLATFORM debian:trixie@sha256:0d01188e8dd0ac63bf155900fad49279131a876a1ea7fac917c62e87ccb2732d AS final COPY --from=image / /image diff --git a/hack/dev/vm/Dockerfile.initramfs b/hack/dev/vm/Dockerfile.initramfs index baa34e4..e7bc603 100644 --- a/hack/dev/vm/Dockerfile.initramfs +++ b/hack/dev/vm/Dockerfile.initramfs @@ -1,4 +1,4 @@ -FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS rootfs +FROM alpine:3.23@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62 AS rootfs RUN apk --no-cache add alpine-base tzdata wireless-regdb ifupdown-ng agetty RUN rc-update add devfs sysinit && \ rc-update add dmesg sysinit && \ @@ -21,7 +21,7 @@ RUN rc-update add devfs sysinit && \ ADD kernel.modules.tgz / COPY files/interfaces /etc/network/interfaces -FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS build +FROM alpine:3.23@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62 AS build COPY --from=rootfs / /rootfs WORKDIR /rootfs RUN find . | cpio -R 0:0 --ignore-devno --renumber-inodes -o -H newc --quiet > /initramfs diff --git a/hack/dev/vm/Dockerfile.ovmf b/hack/dev/vm/Dockerfile.ovmf index bb84b90..cc171a2 100644 --- a/hack/dev/vm/Dockerfile.ovmf +++ b/hack/dev/vm/Dockerfile.ovmf @@ -1,4 +1,4 @@ -FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS build +FROM alpine:3.23@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62 AS build ARG TARGETPLATFORM RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ] || [ "${TARGETPLATFORM}" = "linux/x86_64" ]; then \ apk --no-cache add ovmf edk2-shell; cp /usr/share/ovmf/bios.bin /ovmf.fd; fi diff --git a/hack/dev/vm/Dockerfile.xen b/hack/dev/vm/Dockerfile.xen index 96824e9..fe87f72 100644 --- a/hack/dev/vm/Dockerfile.xen +++ b/hack/dev/vm/Dockerfile.xen @@ -1,4 +1,4 @@ -FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS build +FROM alpine:3.23@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62 AS build ARG TARGETPLATFORM RUN apk add --no-cache xen-hypervisor && cp /usr/lib/efi/xen.efi /xen.efi diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b3dd79b..3de5887 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.91.1" +channel = "1.92.0" components = ["rustfmt", "clippy"] targets = ["x86_64-unknown-uefi", "aarch64-unknown-uefi"]