From d05773b8ee67f4576c9b57eb6edc91570675695a Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 16 Jan 2024 20:04:34 +0100 Subject: [PATCH] coreos-base/(ue-rs|update_engine): Control extracted OEM payload name This pulls in https://github.com/flatcar/ue-rs/pull/49 and https://github.com/flatcar/update_engine/pull/36 to fix the handling of OEM update payloads in a Nebraska response with self-hosted packages. Before this fix the processing failed and had to rely on the fallback download from the release server. --- .../bugfixes/2024-01-16-self-hosted-oem-update-payloads.md | 1 + .../ue-rs/{ue-rs-0.1.0-r5.ebuild => ue-rs-0.1.0-r6.ebuild} | 0 .../coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild | 2 +- ...engine-0.4.10-r20.ebuild => update_engine-0.4.10-r21.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog/bugfixes/2024-01-16-self-hosted-oem-update-payloads.md rename sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/{ue-rs-0.1.0-r5.ebuild => ue-rs-0.1.0-r6.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r20.ebuild => update_engine-0.4.10-r21.ebuild} (100%) diff --git a/changelog/bugfixes/2024-01-16-self-hosted-oem-update-payloads.md b/changelog/bugfixes/2024-01-16-self-hosted-oem-update-payloads.md new file mode 100644 index 00000000000..a8639a2ee43 --- /dev/null +++ b/changelog/bugfixes/2024-01-16-self-hosted-oem-update-payloads.md @@ -0,0 +1 @@ +- Fixed the handling of OEM update payloads in a Nebraska response with self-hosted packages ([ue-rs#49](https://github.com/flatcar/ue-rs/pull/49)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild index dba1c236a86..f7d30a80abc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="efc55818aace4fa34b3d9169f3c5c77e71356796" # trunk + CROS_WORKON_COMMIT="fa5202f19e91c6310964ae1d1cbf5988f13f4435" # trunk KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r20.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r20.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r21.ebuild 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 17282e3405c..d83d9e18308 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="43bb354c67c513ace66d414d9d4aec761eb24680" # flatcar-master + CROS_WORKON_COMMIT="7b7d6b712e6aeb9cd3d01c7734c25927ea06da04" # flatcar-master KEYWORDS="amd64 arm64" fi