diff --git a/tools/osbuilder/Makefile b/tools/osbuilder/Makefile index 7f0addf8fd..25effc967e 100644 --- a/tools/osbuilder/Makefile +++ b/tools/osbuilder/Makefile @@ -9,7 +9,7 @@ ROOTFS_BUILDER := $(MK_DIR)/rootfs-builder/rootfs.sh INITRD_BUILDER := $(MK_DIR)/initrd-builder/initrd_builder.sh IMAGE_BUILDER := $(MK_DIR)/image-builder/image_builder.sh -DISTRO ?= centos +DISTRO ?= ubuntu BUILD_METHOD := distro BUILD_METHOD_LIST := distro dracut AGENT_INIT ?= no diff --git a/tools/osbuilder/README.md b/tools/osbuilder/README.md index 7890b72e49..cf8c02cef8 100644 --- a/tools/osbuilder/README.md +++ b/tools/osbuilder/README.md @@ -80,8 +80,8 @@ filesystem components to generate an initrd. 3. When generating an image, the initrd is extracted to obtain the base rootfs for the image. -CentOS is the default distro for building the rootfs, to use a different one, you can set `DISTRO=`. -For example `make USE_DOCKER=true DISTRO=ubuntu rootfs` will make Ubuntu rootfs using Docker. +Ubuntu is the default distro for building the rootfs, to use a different one, you can set `DISTRO=alpine|clearlinux|debian|ubuntu`. +For example `make USE_DOCKER=true DISTRO=alpine rootfs` will make an Alpine rootfs using Docker. ### Rootfs creation @@ -209,9 +209,9 @@ of the the osbuilder distributions. > Note: this table is not relevant for the dracut build method, since it supports any Linux distribution and architecture where dracut is available. -| |Alpine |CentOS |Clear Linux |Debian/Ubuntu |Fedora |openSUSE | -|-- |-- |-- |-- |-- |-- |-- | -|**ARM64** |:heavy_check_mark:|:heavy_check_mark:| | |:heavy_check_mark:|:heavy_check_mark:| -|**PPC64le**|:heavy_check_mark:|:heavy_check_mark:| |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -|**s390x** | | | |:heavy_check_mark:|:heavy_check_mark:| | -|**x86_64** |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +| |Alpine |Clear Linux |Debian/Ubuntu |Fedora |openSUSE | +|-- |-- |-- |-- |-- |-- | +|**ARM64** |:heavy_check_mark:| | |:heavy_check_mark:|:heavy_check_mark:| +|**PPC64le**|:heavy_check_mark:| |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +|**s390x** | | |:heavy_check_mark:|:heavy_check_mark:| | +|**x86_64** |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| diff --git a/tools/osbuilder/dockerfiles/QAT/README.md b/tools/osbuilder/dockerfiles/QAT/README.md index 370eceb5e0..ccc96a5e44 100644 --- a/tools/osbuilder/dockerfiles/QAT/README.md +++ b/tools/osbuilder/dockerfiles/QAT/README.md @@ -8,7 +8,6 @@ To properly load the driver modules, systemd init must be used. It is not adequa to use the agent as the init. Because of this, alpine is not a valid base OS image to use. The following rootfs OS's have been tested with this Dockerfile. -* CentOS * Clear Linux * Fedora * SUSE diff --git a/tools/osbuilder/rootfs-builder/centos/Dockerfile.in b/tools/osbuilder/rootfs-builder/centos/Dockerfile.in deleted file mode 100644 index d05436e2a9..0000000000 --- a/tools/osbuilder/rootfs-builder/centos/Dockerfile.in +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2018 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -ARG IMAGE_REGISTRY=registry.centos.org -FROM ${IMAGE_REGISTRY}/centos:@OS_VERSION@ - -@SET_PROXY@ - -RUN yum -y update && yum install -y \ - autoconf \ - automake \ - binutils \ - chrony \ - coreutils \ - curl \ - gcc \ - gcc-c++ \ - git \ - glibc-common \ - glibc-devel \ - glibc-headers \ - glibc-static \ - glibc-utils \ - libseccomp \ - libseccomp-devel \ - libstdc++-devel \ - libstdc++-static \ - m4 \ - make \ - sed \ - tar \ - vim \ - which && \ - yum clean all - -# This will install the proper packages to build Kata components -@INSTALL_MUSL@ -@INSTALL_RUST@ diff --git a/tools/osbuilder/rootfs-builder/centos/config.sh b/tools/osbuilder/rootfs-builder/centos/config.sh deleted file mode 100644 index b0918614aa..0000000000 --- a/tools/osbuilder/rootfs-builder/centos/config.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2018 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -OS_NAME="Centos" - -OS_VERSION=${OS_VERSION:-7} - -LOG_FILE="/var/log/yum-centos.log" - -MIRROR_LIST="http://mirrorlist.centos.org/?release=${OS_VERSION}&arch=${ARCH}&repo=os&container=container" - -# Aditional Repos -CENTOS_UPDATES_MIRROR_LIST="http://mirrorlist.centos.org/?release=${OS_VERSION}&arch=${ARCH}&repo=updates&container=container" - -CENTOS_EXTRAS_MIRROR_LIST="http://mirrorlist.centos.org/?release=${OS_VERSION}&arch=${ARCH}&repo=extras&container=container" - -CENTOS_PLUS_MIRROR_LIST="http://mirrorlist.centos.org/?release=${OS_VERSION}&arch=${ARCH}&repo=centosplus&container=container" - -GPG_KEY_URL="https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7" - -GPG_KEY_FILE="RPM-GPG-KEY-CentOS-7" - -PACKAGES="coreutils chrony" - -#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" || 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=() - -[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true diff --git a/tools/osbuilder/rootfs-builder/centos/config_aarch64.sh b/tools/osbuilder/rootfs-builder/centos/config_aarch64.sh deleted file mode 100644 index b4f8ccf8d5..0000000000 --- a/tools/osbuilder/rootfs-builder/centos/config_aarch64.sh +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (c) 2018 ARM Limited -# -# SPDX-License-Identifier: Apache-2.0 - -# Base Repos -BASE_URL="http://mirror.centos.org/altarch/${OS_VERSION}/os/${ARCH}/" - -# Additional Repos -CENTOS_UPDATES_URL="http://mirror.centos.org/altarch/${OS_VERSION}/updates/${ARCH}/" - -CENTOS_EXTRAS_URL="http://mirror.centos.org/altarch/${OS_VERSION}/extras/${ARCH}/" - -CENTOS_PLUS_URL="http://mirror.centos.org/altarch/${OS_VERSION}/centosplus/${ARCH}/" - -GPG_KEY_ARCH_URL="http://mirror.centos.org/altarch/7/os/aarch64/RPM-GPG-KEY-CentOS-7" - -GPG_KEY_ARCH_FILE="RPM-GPG-KEY-CentOS-7-aarch64" diff --git a/tools/osbuilder/rootfs-builder/centos/config_ppc64le.sh b/tools/osbuilder/rootfs-builder/centos/config_ppc64le.sh deleted file mode 100644 index 035cfa8b58..0000000000 --- a/tools/osbuilder/rootfs-builder/centos/config_ppc64le.sh +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (c) 2018 IBM -# -# SPDX-License-Identifier: Apache-2.0 - -# Base Repos -BASE_URL="http://mirror.centos.org/altarch/${OS_VERSION}/os/${ARCH}/" - -# Additional Repos -CENTOS_UPDATES_URL="http://mirror.centos.org/altarch/${OS_VERSION}/updates/${ARCH}/" - -CENTOS_EXTRAS_URL="http://mirror.centos.org/altarch/${OS_VERSION}/extras/${ARCH}/" - -CENTOS_PLUS_URL="http://mirror.centos.org/altarch/${OS_VERSION}/centosplus/${ARCH}/" - -GPG_KEY_ARCH_URL="https://raw.githubusercontent.com/CentOS/sig-core-AltArch/master/centos-release-repo/centos-release-7/ppc/RPM-GPG-KEY-CentOS-SIG-AltArch-7-ppc64le" - -GPG_KEY_ARCH_FILE="RPM-GPG-KEY-CentOS-SIG-AltArch-7-ppc64le" diff --git a/versions.yaml b/versions.yaml index c60f334ae1..aed5dc1a9b 100644 --- a/versions.yaml +++ b/versions.yaml @@ -120,7 +120,7 @@ assets: name: "ubuntu" version: "latest" ppc64le: - name: "centos" + name: "ubuntu" version: "latest" s390x: name: "ubuntu"