From 5a2c696e2132b79f66a25115078123b12eaebffc Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 27 Nov 2023 16:33:37 +0100 Subject: [PATCH 1/2] coreos-base/update_engine: Ensure /etc/extensions is mergable This pulls in https://github.com/flatcar/update_engine/pull/32 to make the Docker/containerd sysexts show up when updating from Beta 3760.1.0. --- changelog/bugfixes/2023-11-27-etc-extensions.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-27-etc-extensions.md diff --git a/changelog/bugfixes/2023-11-27-etc-extensions.md b/changelog/bugfixes/2023-11-27-etc-extensions.md new file mode 100644 index 0000000000..fde5ec4137 --- /dev/null +++ b/changelog/bugfixes/2023-11-27-etc-extensions.md @@ -0,0 +1 @@ +- Fixed the missing `/etc/extensions/` symlinks for the inbuilt Docker/containerd systemd-sysext images on update from Beta 3760.1.0 ([update_engine#32](https://github.com/flatcar/update_engine/pull/32)) 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 b52130f6c1..f43742eef4 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="d262b46e4c0595e6cefa726a19b8b8c1cdf167a5" # flatcar-master + CROS_WORKON_COMMIT="a9b9beec3dbb5aac105fb73e68c3cead23a2236c" # flatcar-master KEYWORDS="amd64 arm64" fi From 0735fcb692199ccccf33ecf88679cb6dae13142b Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 29 Nov 2023 12:46:12 +0100 Subject: [PATCH 2/2] coreos-base/update_engine: bump revision --- ...e_engine-0.4.10-r17.ebuild => update_engine-0.4.10-r18.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-r17.ebuild => update_engine-0.4.10-r18.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r17.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r17.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r18.ebuild