From 809f7e2a39a6d02ee9db51b687f8363b40beed8c Mon Sep 17 00:00:00 2001 From: Simon Campion Date: Fri, 22 Mar 2024 17:50:19 +0100 Subject: [PATCH 1/3] sys-kernel/bootengine: Bump commit for root unlocking service --- .../sys-kernel/bootengine/bootengine-9999.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 4a8ce1fa9a..dfc3627ff0 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 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/bootengine" +CROS_WORKON_PROJECT="simoncampion/bootengine" CROS_WORKON_LOCALNAME="bootengine" CROS_WORKON_OUTOFTREE_BUILD=1 CROS_WORKON_REPO="https://github.com" @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="19245b06d7634f1d2cea30c49f2a92e2462d8551" # flatcar-master + CROS_WORKON_COMMIT="66145c330d6d0b44c2cc161e042e6f18966c2e4f" KEYWORDS="amd64 arm arm64 x86" fi @@ -31,6 +31,7 @@ src_install() { # re-use existing filesystem permissions during initrd creation. chmod +x "${D}"/usr/lib/dracut/modules.d/10*-generator/*-generator \ "${D}"/usr/lib/dracut/modules.d/10diskless-generator/diskless-btrfs \ + "${D}"/usr/lib/dracut/modules.d/10networkd-dependency-generator/*-generator \ "${D}"/usr/lib/dracut/modules.d/03flatcar-network/parse-ip-for-networkd.sh \ "${D}"/usr/lib/dracut/modules.d/30disk-uuid/disk-uuid.sh \ "${D}"/usr/lib/dracut/modules.d/30ignition/ignition-generator \ @@ -38,7 +39,7 @@ src_install() { "${D}"/usr/lib/dracut/modules.d/30ignition/ignition-setup-pre.sh \ "${D}"/usr/lib/dracut/modules.d/30ignition/ignition-kargs-helper \ "${D}"/usr/lib/dracut/modules.d/30ignition/retry-umount.sh \ - "${D}"/usr/lib/dracut/modules.d/40networkd-dependency/*-generator \ + "${D}"/usr/lib/dracut/modules.d/31decrypt-root/decrypt-root \ "${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root \ "${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root-after-ignition \ "${D}"/usr/lib/dracut/modules.d/99setup-root/gpg-agent-wrapper \ From 538239b1e84a57837f839030198e223cec866e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 27 Mar 2024 10:27:51 +0100 Subject: [PATCH 2/3] Update sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild --- .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dfc3627ff0..0792a36e4c 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 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="simoncampion/bootengine" +CROS_WORKON_PROJECT="flatcar/bootengine" CROS_WORKON_LOCALNAME="bootengine" CROS_WORKON_OUTOFTREE_BUILD=1 CROS_WORKON_REPO="https://github.com" From dbe524b1c8c916dca33dc023d2d3d4292ba8fc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 27 Mar 2024 10:27:58 +0100 Subject: [PATCH 3/3] Update sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild --- .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0792a36e4c..ea7d2364aa 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="66145c330d6d0b44c2cc161e042e6f18966c2e4f" + CROS_WORKON_COMMIT="77adbbe1ae91ae29efa11d7b46e4d71af351e154" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi