From e16da83984ae0c02c49267918872befbe16ec465 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 25 Jan 2024 15:16:56 +0100 Subject: [PATCH] coreos-base/coreos-init: Add flatcar-update flag to skip OEM payloads This pulls in https://github.com/flatcar/init/pull/114 to support a flag to skip providing OEM payloads, with the goal of easing downgrades to non-sysext-OEM releases or, when backported to LTS with the default behavior switched, to opt-in to OEM payloads for airgapped updates that can't use the fallback download. --- changelog/changes/2024-01-25-flatcar-update-oem.md | 1 + .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/changes/2024-01-25-flatcar-update-oem.md diff --git a/changelog/changes/2024-01-25-flatcar-update-oem.md b/changelog/changes/2024-01-25-flatcar-update-oem.md new file mode 100644 index 00000000000..5d5e299e2b5 --- /dev/null +++ b/changelog/changes/2024-01-25-flatcar-update-oem.md @@ -0,0 +1 @@ +- Added a `flatcar-update --oem-payloads ` flag to skip providing OEM payloads, e.g., for downgrades ([init#114](https://github.com/flatcar/init/pull/114)) 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 fbc055c49bd..f7550920990 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 @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="db7a12ed8b5cbfc3023b01af1ed2666c210ba78d" # flatcar-master + CROS_WORKON_COMMIT="7e30bf5baa1abc5113024f2238d9c235aedaf62e" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi