From 24d88e2f616b906835d18d7f7ab2497dacb060b8 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 12 Mar 2024 10:54:44 +0100 Subject: [PATCH] coreos-base/update_engine: Switch to rescue=nologreplay btrfs option 'norecovery' was deprecated and has been removed in kernel v6.8 so switch to the new way of doing things. This pulls in https://github.com/flatcar/update_engine/pull/40. Signed-off-by: Jeremi Piotrowski --- ...engine-0.4.10-r21.ebuild => update_engine-0.4.10-r22.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r21.ebuild => update_engine-0.4.10-r22.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r21.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r22.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r21.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r22.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 48cb9e4a5c..cc6ed4c042 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="f627c4def9ff42cc6bf4b04cf211e11a42b34f31" # flatcar-master + CROS_WORKON_COMMIT="541576a4dcd56397597abef7d9ce4c539631ed65" # flatcar-master KEYWORDS="amd64 arm64" fi