From 3228c2a04821b48e0b9b9cef7d6cde4721f6a47d Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 26 Jul 2023 13:13:10 +0200 Subject: [PATCH] wip: Support OEM systemd-sysext images and Flatcar extensions TODO: changelog --- ...e-0.4.10-r10.ebuild => update_engine-0.4.10-r11.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 7 ++++++- ...gine-0.0.38-r17.ebuild => bootengine-0.0.38-r18.ebuild} | 0 .../sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r10.ebuild => update_engine-0.4.10-r11.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r17.ebuild => bootengine-0.0.38-r18.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r11.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r10.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r11.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 297549bd82a..c850e9bea8e 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="c6f566d47d8949632f7f43871eb8d5c625af3209" # flatcar-master + CROS_WORKON_COMMIT="5ebd18bba5163ee9c1d0d4db2218d53c12f8a807" # TODO: flatcar-master KEYWORDS="amd64 arm64" fi @@ -102,6 +102,11 @@ src_install() { insinto /usr/share/dbus-1/system.d doins com.coreos.update1.conf + insinto /usr/share/update_engine + doins src/update_engine/update_metadata.proto + exeinto /usr/share/update_engine + doexe decode_payload + # Install rule to remove old UpdateEngine.conf from /etc dotmpfiles "${FILESDIR}"/update-engine.conf } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r18.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 b8c81c0245c..6e4141efa0f 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 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="cc0fdec0cc6c5692acac95a928984ea8a5eb8f08" # flatcar-master + CROS_WORKON_COMMIT="9aa0a0d2e4c763b3ab9fbbff13ad4229746e6697" # TODO: flatcar-master KEYWORDS="amd64 arm arm64 x86" fi