coreos-base/(ue-rs|update_engine): Control extracted OEM payload name

This pulls in flatcar/ue-rs#49 and flatcar/update_engine#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.
flatcar · Jan 18, 2024 · 3f59006 · 3f59006
1 parent 5b6d3dd
commit 3f59006
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
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
@@ -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/...y/coreos-base/ue-rs/ue-rs-0.1.0-r5.ebuild → ...y/coreos-base/ue-rs/ue-rs-0.1.0-r6.ebuild b/...y/coreos-base/ue-rs/ue-rs-0.1.0-r5.ebuild → ...y/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
@@ -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/...te_engine/update_engine-0.4.10-r20.ebuild → ...te_engine/update_engine-0.4.10-r21.ebuild b/...te_engine/update_engine-0.4.10-r20.ebuild → ...te_engine/update_engine-0.4.10-r21.ebuild
diff --git a/...tainer/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/...tainer/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
Original file line number	Diff line number	Diff line change
		@@ -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))