From 780b36f47737d464100f7e22df1da9174c3c7d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 11 Nov 2024 10:25:38 +0100 Subject: [PATCH] osbuilder: Drop Clear Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Clear Linux rootfs is not being tested anywhere, and it seems Intel doesn't have the capacity to review the PRs related to this (combined with the lack of interested from the rest of the community on reviewing PRs that are specific to this untested rootfs). With this in mind, I'm suggesting we drop Clear Linux support and focus on what we can actually maintain. Signed-off-by: Fabiano Fidêncio --- docs/Developer-Guide.md | 2 +- docs/design/architecture/guest-assets.md | 2 +- tools/osbuilder/README.md | 2 +- .../rootfs-builder/clearlinux/Dockerfile.in | 40 ------------------- .../rootfs-builder/clearlinux/config.sh | 31 -------------- tools/osbuilder/rootfs-builder/rootfs.sh | 3 -- tools/osbuilder/tests/test_config.sh | 1 - 7 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in delete mode 100644 tools/osbuilder/rootfs-builder/clearlinux/config.sh diff --git a/docs/Developer-Guide.md b/docs/Developer-Guide.md index 65b3a7a8b..dcb88d49a 100644 --- a/docs/Developer-Guide.md +++ b/docs/Developer-Guide.md @@ -627,7 +627,7 @@ the following steps (using rootfs or initrd image). > > Look for `INIT_PROCESS=systemd` in the `config.sh` osbuilder rootfs config file > to verify an osbuilder distro supports systemd for the distro you want to build rootfs for. -> For an example, see the [Clear Linux config.sh file](../tools/osbuilder/rootfs-builder/clearlinux/config.sh). +> For an example, see the [Ubuntu config.sh file](../tools/osbuilder/rootfs-builder/ubuntu/config.sh). > > For a non-systemd-based distro, create an equivalent system > service using that distro’s init system syntax. Alternatively, you can build a distro diff --git a/docs/design/architecture/guest-assets.md b/docs/design/architecture/guest-assets.md index 24d0d8027..6efe58c71 100644 --- a/docs/design/architecture/guest-assets.md +++ b/docs/design/architecture/guest-assets.md @@ -135,7 +135,7 @@ See also the [process overview](README.md#process-overview). | Image type | Default distro | Init daemon | Reason | Notes | |-|-|-|-|-| -| [image](background.md#root-filesystem-image) | [Clear Linux](https://clearlinux.org) (for x86_64 systems)| systemd | Minimal and highly optimized | systemd offers flexibility | +| [image](background.md#root-filesystem-image) | [Ubuntu](https://ubuntu.com) (for x86_64 systems) | systemd | Fully tested in our CI | systemd offers flexibility | | [initrd](#initrd-image) | [Alpine Linux](https://alpinelinux.org) | Kata [agent](README.md#agent) (as no systemd support) | Security hardened and tiny C library | See also: diff --git a/tools/osbuilder/README.md b/tools/osbuilder/README.md index 9415de74e..d86ecc144 100644 --- a/tools/osbuilder/README.md +++ b/tools/osbuilder/README.md @@ -80,7 +80,7 @@ filesystem components to generate an initrd. 3. When generating an image, the initrd is extracted to obtain the base rootfs for the image. -Ubuntu is the default distro for building the rootfs, to use a different one, you can set `DISTRO=alpine|clearlinux|debian|ubuntu|cbl-mariner`. +Ubuntu is the default distro for building the rootfs, to use a different one, you can set `DISTRO=alpine|debian|ubuntu|cbl-mariner`. For example `make USE_DOCKER=true DISTRO=alpine rootfs` will make an Alpine rootfs using Docker. ### Rootfs creation diff --git a/tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in b/tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in deleted file mode 100644 index ac5b0ff74..000000000 --- a/tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2018 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -ARG IMAGE_REGISTRY=docker.io -FROM ${IMAGE_REGISTRY}/fedora:30 - -@SET_PROXY@ - -RUN dnf -y update && dnf install -y \ - autoconf \ - automake \ - binutils \ - chrony \ - coreutils \ - curl \ - curl \ - gcc \ - gcc-c++ \ - git \ - glibc-common \ - glibc-devel \ - glibc-headers \ - glibc-static \ - glibc-utils \ - libstdc++-devel \ - libstdc++-static \ - m4 \ - make \ - pkgconfig \ - sed \ - systemd \ - tar \ - vim \ - which && \ - dnf clean all - -# This will install the proper packages to build Kata components -@INSTALL_RUST@ diff --git a/tools/osbuilder/rootfs-builder/clearlinux/config.sh b/tools/osbuilder/rootfs-builder/clearlinux/config.sh deleted file mode 100644 index e447407ac..000000000 --- a/tools/osbuilder/rootfs-builder/clearlinux/config.sh +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) 2018 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -OS_NAME="Clear" -REPO_NAME="clear" - -OS_VERSION=${OS_VERSION:-latest} - -clr_url="https://download.clearlinux.org" - -# resolve version -[ "${OS_VERSION}" = "latest" ] && OS_VERSION=$(curl -sL "${clr_url}/latest") - -BASE_URL="${clr_url}/releases/${OS_VERSION}/${REPO_NAME}/${ARCH}/os/" - -PACKAGES="libudev0-shim kmod-bin iptables-bin" - -#Optional packages: -# systemd: An init system that will start kata-agent if kata-agent -# itself is not configured as init process. -[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd chrony util-linux-bin" || true - -# Init process must be one of {systemd,kata-agent} -INIT_PROCESS=systemd -# List of zero or more architectures to exclude from build, -# as reported by `uname -m` -ARCH_EXCLUDE_LIST=( aarch64 ppc64le s390x ) - -[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 04a855a0c..c7e4a3c90 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -795,9 +795,6 @@ detect_host_distro() "*suse*") distro="suse" ;; - "clear-linux-os") - distro="clearlinux" - ;; *) distro="$ID" ;; diff --git a/tools/osbuilder/tests/test_config.sh b/tools/osbuilder/tests/test_config.sh index 611cd2c43..eb2dc231d 100644 --- a/tools/osbuilder/tests/test_config.sh +++ b/tools/osbuilder/tests/test_config.sh @@ -12,7 +12,6 @@ for distro in $(${sdir}/../rootfs-builder/rootfs.sh -l); do distros+=("${distro}") done test_distros=() -test_distros+=("clearlinux") test_distros+=("ubuntu") skipForRustDistros=()