diff --git a/build_library/oem/oraclecloud/grub.cfg b/build_library/oem/oraclecloud/grub.cfg new file mode 100644 index 00000000000..d0b8ed3c495 --- /dev/null +++ b/build_library/oem/oraclecloud/grub.cfg @@ -0,0 +1,3 @@ +# Flatcar GRUB settings + +set oem_id="oraclecloud" diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 3192d592053..9c4a7b242be 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -23,6 +23,7 @@ VALID_IMG_TYPES=( kubevirt openstack openstack_mini + oraclecloud parallels proxmoxve pxe @@ -155,6 +156,11 @@ IMG_openstack_OEM_SYSEXT=openstack IMG_openstack_mini_DISK_FORMAT=qcow2 IMG_openstack_mini_OEM_SYSEXT=openstack +## Oracle Cloud +IMG_oraclecloud_DISK_FORMAT=qcow2 +IMG_oraclecloud_DISK_LAYOUT=vm +IMG_oraclecloud_OEM_SYSEXT=oraclecloud + ## pxe, which is an cpio image IMG_pxe_DISK_FORMAT=cpio IMG_pxe_PARTITIONED_IMG=0 diff --git a/changelog/changes/2026-06-03-oraclecloud.md b/changelog/changes/2026-06-03-oraclecloud.md new file mode 100644 index 00000000000..684843a9542 --- /dev/null +++ b/changelog/changes/2026-06-03-oraclecloud.md @@ -0,0 +1 @@ +- Added Oracle Cloud Infrastructure images ([flatcar/scripts#3846](https://github.com/flatcar/scripts/pull/3846)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service index 73b01829a76..8278d4ab43f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service @@ -14,6 +14,8 @@ ConditionKernelCommandLine=|coreos.oem.id=gce ConditionKernelCommandLine=|flatcar.oem.id=openstack ConditionKernelCommandLine=|coreos.oem.id=openstack +ConditionKernelCommandLine=|flatcar.oem.id=oraclecloud + ConditionKernelCommandLine=|flatcar.oem.id=scaleway ConditionKernelCommandLine=|flatcar.oem.id=hetzner diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r205.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r206.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r205.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r206.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 6da61fce23e..26f314c34a8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/flatcar/init.git" inherit git-r3 else - EGIT_VERSION="eb859e2b0c6eed7300801e18f878540b650b5950" # flatcar-master + EGIT_VERSION="0bf7e11f5b56b9f7adc2ddb3e4de885c531f3e7f" # flatcar-master SRC_URI="https://github.com/flatcar/init/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz" S="${WORKDIR}/init-${EGIT_VERSION}" KEYWORDS="amd64 arm arm64 x86" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oraclecloud/oem-oraclecloud-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oraclecloud/oem-oraclecloud-0.ebuild new file mode 100644 index 00000000000..b218d78418b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oraclecloud/oem-oraclecloud-0.ebuild @@ -0,0 +1,13 @@ +# Copyright (c) 2013 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="OEM suite for Oracle Cloud" +HOMEPAGE="https://cloud.oracle.com/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="amd64 arm64" + +SYSEXT_NAME="Oracle Cloud" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r45.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r46.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r45.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r46.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 5c2d44a6aae..e9983d2d59a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/flatcar/bootengine.git" inherit git-r3 else - EGIT_VERSION="88137e5416113c4bf3901eba78576dd8bf079aa7" # flatcar-master + EGIT_VERSION="944410b2d2ad280fbf30e96eda0180204c83c85b" # flatcar-master SRC_URI="https://github.com/flatcar/bootengine/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz" S="${WORKDIR}/${PN}-${EGIT_VERSION}" KEYWORDS="amd64 arm arm64 x86"