From f2789a8d3ccd484a6a0eca2b29395a4e726daaca Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 31 May 2017 17:45:28 -0700 Subject: [PATCH] sys-kernel/coreos-kernel: ensure the final systemd is installed The systemd package from setup_board does not have USE=cryptsetup, but it gets installed before build_packages, which satisfies the build-time dependency from the kernel. The initramfs should have the cryptsetup files, so explicitly depend on it to order building the kernel after the final systemd package. --- ...reos-kernel-4.11.2.ebuild => coreos-kernel-4.11.2-r1.ebuild} | 2 +- ...os-modules-4.11.2.ebuild => coreos-modules-4.11.2-r1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.11.2.ebuild => coreos-kernel-4.11.2-r1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.11.2.ebuild => coreos-modules-4.11.2-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.2-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.2-r1.ebuild index 2fe3d5d496..090cb5ec8a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.2-r1.ebuild @@ -19,7 +19,7 @@ DEPEND="${RDEPEND} sys-apps/less sys-apps/sed sys-apps/shadow - sys-apps/systemd + sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.2-r1.ebuild