Merge pull request #97 from gardenlinux/cleanup/secureboot

cleanup secureboot
gardenlinux · Sep 16, 2024 · b560928 · b560928
2 parents e2dff54 + 759d98d
commit b560928
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 762 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,6 +16,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 RUN git clone --branch debian/1.26 --depth=1 https://salsa.debian.org/debian/datefudge.git
 RUN make -C datefudge install
 
+FROM debian:testing AS resizefat32
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends build-essential ca-certificates git
+RUN git clone https://github.com/gardenlinux/resizefat32
+RUN make -C resizefat32 install
+
 FROM debian:testing
 
 LABEL org.opencontainers.image.source="https://github.com/gardenlinux/builder"
@@ -31,6 +36,7 @@ COPY --from=mv_data /usr/bin/mv_data /usr/bin/mv_data
 COPY --from=aws-kms-pkcs11 /aws_kms_pkcs11.so /aws_kms_pkcs11.so
 COPY --from=datefudge /usr/lib/datefudge/datefudge.so /usr/lib/datefudge/datefudge.so
 COPY --from=datefudge /usr/bin/datefudge /usr/bin/datefudge
+COPY --from=resizefat32 /usr/bin/resizefat32 /usr/bin/resizefat32
 RUN mv /aws_kms_pkcs11.so "/usr/lib/$(uname -m)-linux-gnu/pkcs11/aws_kms_pkcs11.so"
 COPY builder /builder
 RUN mkdir /builder/cert

diff --git a/builder/image.d/make_repart_disk b/builder/image.d/make_repart_disk
diff --git a/builder/image.d/make_repart_partition b/builder/image.d/make_repart_partition