diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index ba715812195..2b873838345 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -6,6 +6,7 @@ # Default values use the format IMG_DEFAULT_. VALID_IMG_TYPES=( + oraclecloud akamai ami ami_vmdk @@ -48,6 +49,7 @@ VALID_IMG_TYPES=( #list of oem package names, minus the oem- prefix VALID_OEM_PACKAGES=( + oraclecloud akamai azure cloudsigma @@ -350,6 +352,13 @@ IMG_akamai_OEM_PACKAGE=common-oem-files IMG_akamai_OEM_USE=akamai IMG_akamai_OEM_SYSEXT=oem-akamai +## Oracle Cloud +IMG_oraclecloud_DISK_FORMAT=qcow2 +IMG_oraclecloud_DISK_LAYOUT=vm +IMG_oraclecloud_OEM_PACKAGE=common-oem-files +IMG_oraclecloud_OEM_USE=oraclecloud +IMG_oraclecloud_OEM_SYSEXT=oem-oraclecloud + # proxmoxve IMG_proxmoxve_DISK_FORMAT=qcow2 IMG_proxmoxve_DISK_LAYOUT=vm diff --git a/changelog/updates/2026-03-16-ca-certificates-3.121-update.md b/changelog/updates/2026-03-16-ca-certificates-3.121-update.md new file mode 100644 index 00000000000..c4e863a7182 --- /dev/null +++ b/changelog/updates/2026-03-16-ca-certificates-3.121-update.md @@ -0,0 +1 @@ +- ca-certificates ([3.121](https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_121.html)) diff --git a/sdk_container/.repo/manifests/version.txt.orig b/sdk_container/.repo/manifests/version.txt.orig new file mode 100644 index 00000000000..3b00bebfab5 --- /dev/null +++ b/sdk_container/.repo/manifests/version.txt.orig @@ -0,0 +1,11 @@ +<<<<<<< HEAD +FLATCAR_VERSION=4628.0.0+nightly-20260318-2100 +FLATCAR_VERSION_ID=4628.0.0 +FLATCAR_BUILD_ID="nightly-20260318-2100" +FLATCAR_SDK_VERSION=4628.0.0 +======= +FLATCAR_VERSION=4643.0.0+nightly-20260318-2100 +FLATCAR_VERSION_ID=4643.0.0 +FLATCAR_BUILD_ID="nightly-20260318-2100" +FLATCAR_SDK_VERSION=4643.0.0+nightly-20260318-2100 +>>>>>>> main diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r11.ebuild index 6bdfa95ca07..bc8ca067e28 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r11.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r11.ebuild @@ -34,6 +34,7 @@ COMMON_OEMIDS=( azure hetzner openstack + oraclecloud packet proxmoxve qemu diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/oraclecloud/grub.cfg.frag b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/oraclecloud/grub.cfg.frag new file mode 100644 index 00000000000..31a579babb8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/oraclecloud/grub.cfg.frag @@ -0,0 +1,2 @@ +set oem_id="oraclecloud" +set linux_append="flatcar.autologin flatcar.oem.id=oraclecloud" 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..5bccad8ece2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oraclecloud/oem-oraclecloud-0.ebuild @@ -0,0 +1,15 @@ +# 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/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm64" +IUSE="" + +OEM_NAME="oraclecloud"