From 3aa1adfa2a13dab2d26d03d24cffdbbebf461ab0 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 2 Nov 2023 11:47:02 +0100 Subject: [PATCH 1/2] coreos-base/update_engine: Fix iterating over signatures This pulls in https://github.com/flatcar/update_engine/pull/31 to correctly skip over signature entries that cause errors which can be the case for the dummy signatures. --- changelog/bugfixes/2023-11-02-oem-update.md | 1 + .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2023-11-02-oem-update.md diff --git a/changelog/bugfixes/2023-11-02-oem-update.md b/changelog/bugfixes/2023-11-02-oem-update.md new file mode 100644 index 00000000000..9074d8d95d7 --- /dev/null +++ b/changelog/bugfixes/2023-11-02-oem-update.md @@ -0,0 +1 @@ +- Fixed iterating over the OEM update payload signatures which prevented the AWS OEM update to 3745.x.y ([update-engine#31](https://github.com/flatcar/update_engine/pull/31)) 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 02528db1462..b52130f6c15 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="e4b55716dc08be6211026730f0bbf94e6ce44d51" # flatcar-master + CROS_WORKON_COMMIT="d262b46e4c0595e6cefa726a19b8b8c1cdf167a5" # flatcar-master KEYWORDS="amd64 arm64" fi From 20bba0c62330fc1656a939df66e38df49fca560d Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 2 Nov 2023 13:39:04 +0100 Subject: [PATCH 2/2] coreos-base/update_engine: Bump ebuild revision --- ...e_engine-0.4.10-r16.ebuild => update_engine-0.4.10-r17.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-r16.ebuild => update_engine-0.4.10-r17.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r17.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r16.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r17.ebuild