From ef5e95d5bd44fedf7f64f960f4eec73999531a2a Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 9 May 2025 12:52:16 -0400 Subject: [PATCH] whitespace changes to appease downstream CI The prow/validate job does some various whitespace checks and was complaining about these so I guess I'll try to make it happy: ``` [+] Found files with whitespace at the end of line ./fedora-coreos-config/fedora-bootc/.gitlab-ci.yml ./fedora-coreos-config/fedora-bootc/bootc-base-imagectl.md ./fedora-coreos-config/fedora-bootc/fedora-iot.yaml ./fedora-coreos-config/fedora-bootc/iot/manifest.yaml [+] Found files with missing empty line at end of file ./fedora-coreos-config/fedora-bootc/bootc-base-imagectl ./fedora-coreos-config/fedora-bootc/fedora-iot.yaml ./fedora-coreos-config/fedora-bootc/iot/manifest.yaml ``` --- .gitlab-ci.yml | 2 +- bootc-base-imagectl | 3 ++- bootc-base-imagectl.md | 6 +++--- fedora-iot.yaml | 2 +- iot/manifest.yaml | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e201329..9bbf195 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ build-minimal: script: | set -xeuo pipefail buildah build -f Containerfile --no-cache -t localhost/fedora-bootc:minimal ${PRIV_ARGS} --build-arg=manifest=fedora-minimal . - cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal + cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal build-minimal-plus: extends: .build-image diff --git a/bootc-base-imagectl b/bootc-base-imagectl index 6f1e9da..4dc2d7b 100755 --- a/bootc-base-imagectl +++ b/bootc-base-imagectl @@ -114,4 +114,5 @@ if __name__ == "__main__": cmd_list.set_defaults(func=run_list) args = parser.parse_args() - args.func(args) \ No newline at end of file + args.func(args) + diff --git a/bootc-base-imagectl.md b/bootc-base-imagectl.md index b3cba04..311bb7a 100644 --- a/bootc-base-imagectl.md +++ b/bootc-base-imagectl.md @@ -90,7 +90,7 @@ and downloaded by clients, even if the content didn't actually change. The `bootc-base-imagectl rechunk` command fixes all of these issues by taking an input container, operates on its final merged filesystem tree (hence removed/overridden files are handled), and then splits it up -(currently based on the RPM database) into separate layers (tarballs). +(currently based on the RPM database) into separate layers (tarballs). Further, because bootc uses OSTree today, and OSTree canonializes all timestamps to zero on the client side, this tool does that at build time. @@ -104,7 +104,7 @@ can be selected by passing `--manifest` to `build-rootfs`. The current implementation uses `rpm-ostree` on a manifest (treefile) embedded in the container image itself. These manifests are not intended -to be editable directly. +to be editable directly. To emphasize: the implementation of this command (especially the configuration files that it reads) are subject to change. @@ -113,7 +113,7 @@ files that it reads) are subject to change. The build tooling is designed to support "cross builds"; the repository root could e.g. be CentOS Stream 10, while the -builder root is Fedora or RHEL, etc. +builder root is Fedora or RHEL, etc. In other words, one given base image can be used as a "builder" to produce another using different RPMs. diff --git a/fedora-iot.yaml b/fedora-iot.yaml index 487bf77..27aabce 100644 --- a/fedora-iot.yaml +++ b/fedora-iot.yaml @@ -1,4 +1,4 @@ include: - iot/manifest.yaml - fedora-minimal-plus.yaml - \ No newline at end of file + diff --git a/iot/manifest.yaml b/iot/manifest.yaml index 229babd..52922a8 100644 --- a/iot/manifest.yaml +++ b/iot/manifest.yaml @@ -1,6 +1,6 @@ metadata: summary: Fedora IoT bootc image - + variables: distro: "fedora-iot" @@ -56,4 +56,4 @@ packages-aarch64: - bcm283x-firmware - optee_client - uboot-images-armv8 - \ No newline at end of file +