From 5a35f10acac347b47ef2cd95309089120aef7145 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 12 Dec 2023 13:40:31 +0100 Subject: [PATCH 1/2] coreos-base/update_engine: bump ebuild revision --- ...e_engine-0.4.10-r18.ebuild => update_engine-0.4.10-r19.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r18.ebuild => update_engine-0.4.10-r19.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r18.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r19.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r18.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r19.ebuild From fe164a8b0fdf44755a8b3918a89130e356f955d9 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 11 Dec 2023 17:13:38 +0100 Subject: [PATCH 2/2] coreos-base/update_engine: Only store Omaha response for update check This pulls in https://github.com/flatcar/update_engine/pull/33 to fix supplying extension update payloads with a custom base URL in Nebraska. --- changelog/bugfixes/2023-12-11-update-extension-custom-url.md | 1 + .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2023-12-11-update-extension-custom-url.md diff --git a/changelog/bugfixes/2023-12-11-update-extension-custom-url.md b/changelog/bugfixes/2023-12-11-update-extension-custom-url.md new file mode 100644 index 00000000000..3751bc4d95b --- /dev/null +++ b/changelog/bugfixes/2023-12-11-update-extension-custom-url.md @@ -0,0 +1 @@ +- Fixed supplying extension update payloads with a custom base URL in Nebraska ([Flatcar#1281](https://github.com/flatcar/Flatcar/issues/1281)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index f43742eef4f..25ac9a04f22 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="a9b9beec3dbb5aac105fb73e68c3cead23a2236c" # flatcar-master + CROS_WORKON_COMMIT="8fb11a4abfbf42941efdd73d06ee180bb26557f6" # flatcar-master KEYWORDS="amd64 arm64" fi