diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-revert-internal-oem-drop-noop-OEMs.patch deleted file mode 100644 index cf576c5fbb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-revert-internal-oem-drop-noop-OEMs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 60a6c5a81e06fbaed6939ac925937ca941f0732e Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Tue, 20 Feb 2024 10:25:24 +0100 -Subject: [PATCH 16/19] revert: internal/oem: drop noop OEMs - -This reverts: https://github.com/flatcar/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132 - -Signed-off-by: Mathieu Tortuyaux ---- - internal/providers/metal/metal.go | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/internal/providers/metal/metal.go b/internal/providers/metal/metal.go -index 27c923d4..ae259f8f 100644 ---- a/internal/providers/metal/metal.go -+++ b/internal/providers/metal/metal.go -@@ -26,10 +26,26 @@ import ( - ) - - func init() { -+ platform.Register(platform.Provider{ -+ Name: "cloudsigma", -+ Fetch: fetchConfig, -+ }) - platform.Register(platform.Provider{ - Name: "metal", - Fetch: fetchConfig, - }) -+ platform.Register(platform.Provider{ -+ Name: "rackspace", -+ Fetch: fetchConfig, -+ }) -+ platform.Register(platform.Provider{ -+ Name: "rackspace-onmetal", -+ Fetch: fetchConfig, -+ }) -+ platform.Register(platform.Provider{ -+ Name: "vagrant", -+ Fetch: fetchConfig, -+ }) - } - - func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { --- -2.51.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-usr-share-oem-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-usr-share-oem-oem.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-usr-share-oem-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-usr-share-oem-oem.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-internal-exec-stages-mount-Mount-oem.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-internal-exec-stages-mount-Mount-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-internal-exec-stages-mount-Mount-oem.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 63750b1496..0d3d12faa8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -31,10 +31,9 @@ else "${FILESDIR}/0013-Partially-revert-drop-OEM-URI-support.patch" "${FILESDIR}/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch" "${FILESDIR}/0015-translation-support-OEM-and-oem.patch" - "${FILESDIR}/0016-revert-internal-oem-drop-noop-OEMs.patch" - "${FILESDIR}/0017-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" - "${FILESDIR}/0018-usr-share-oem-oem.patch" - "${FILESDIR}/0019-internal-exec-stages-mount-Mount-oem.patch" + "${FILESDIR}/0016-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" + "${FILESDIR}/0017-usr-share-oem-oem.patch" + "${FILESDIR}/0018-internal-exec-stages-mount-Mount-oem.patch" ) fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/Manifest index 3d27149da6..cd067e0e48 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/Manifest @@ -1 +1 @@ -DIST bootengine-003a67d93a99705391a0a1fa825f018b074d8e8b.tar.gz 37805 BLAKE2B 25abb7cf425a02c330245c7efc63406ee823fd9921afd39f9b413eda1451fa48ed150dd104cb550f9b81e7445b4c9e50a0ec55077dbf6de0c712cbcb7339dd67 SHA512 a9246398a560a7bbdb7b1d714012fdca65a2475843cfcb5fd20551086165623d248c577b6170fb32a75709a67014b33581c415e4c5410202e29a57e6a0ff6d88 +DIST bootengine-a19dace6ad74359e6c3677fccadc36a7ce09767a.tar.gz 37827 BLAKE2B fa3a4a348bfaf7acc8fc0f9002da040580969801da22121f3d74f3cf0943e7d99d681a564e912260d453261e3483dfc7b3c07a404d8f8048a5bd3353c4f31791 SHA512 e5693fa5bcdd2023857954c2234f290bea28f9416ec31c469e4545756f5630fa5b7ce701f3a7c48797698066de090f9aea349fcc9a000306fdb4a145d0fb38c4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r42.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r43.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r42.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r43.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 2857e0ab74..4eec788a2f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/flatcar/bootengine.git" inherit git-r3 else - EGIT_VERSION="003a67d93a99705391a0a1fa825f018b074d8e8b" # flatcar-master + EGIT_VERSION="a19dace6ad74359e6c3677fccadc36a7ce09767a" # flatcar-master SRC_URI="https://github.com/flatcar/bootengine/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz" S="${WORKDIR}/${PN}-${EGIT_VERSION}" KEYWORDS="amd64 arm arm64 x86"