From af249419bceb022cbc18a6b0a7cb85c5fbb814f0 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 22 Feb 2024 14:08:36 +0100 Subject: [PATCH 1/2] coreos-base/coreos-cloudinit: bump commit ID Signed-off-by: Mathieu Tortuyaux --- ...dinit-1.14.0-r7.ebuild => coreos-cloudinit-1.14.0-r8.ebuild} | 0 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-1.14.0-r7.ebuild => coreos-cloudinit-1.14.0-r8.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r8.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r7.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r8.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index a9abc0901da..a9aebf08bec 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -12,7 +12,7 @@ inherit cros-workon systemd toolchain-funcs udev coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="47d54a38e766a30c7ab9caabf2292e885505ffe0" # flatcar-master + CROS_WORKON_COMMIT="a7bc5f0050ab3493807ec69977cda26b882b4aad" # flatcar-master KEYWORDS="amd64 arm64" fi From ea3d0cf1c450569f8c446b43cf505456324b36a3 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 23 Feb 2024 10:59:32 +0100 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/changes/2024-02-23-coreos-cloudinit.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2024-02-23-coreos-cloudinit.md diff --git a/changelog/changes/2024-02-23-coreos-cloudinit.md b/changelog/changes/2024-02-23-coreos-cloudinit.md new file mode 100644 index 00000000000..18ab14c76ff --- /dev/null +++ b/changelog/changes/2024-02-23-coreos-cloudinit.md @@ -0,0 +1 @@ +- ⚠ Removed coreos-cloudinit support for automatic keys conversion (e.g `reboot-strategy` -> `reboot_strategy`) ([scripts#1687](https://github.com/flatcar/scripts/pull/1687))