From e8b4b308c9b68837b5a24aa8d3655e495344c13c Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 8 Mar 2024 16:18:50 +0000 Subject: [PATCH] coreos/config: Add hooks for zfs ebuilds The zfs-kmod ebuild needs KERNEL_DIR to point to the correct /lib/modules directory. The zfs ebuild installs two systemd unit masks to /usr/lib/systemd which result in "dangling symlink" errors during the image build. These systemd unit masks are only necessary for old Ubuntu systems that have sysv-init-systemd compat wrappers. Signed-off-by: Jeremi Piotrowski --- .../third_party/coreos-overlay/coreos/config/env/sys-fs/zfs | 4 ++++ .../coreos-overlay/coreos/config/env/sys-fs/zfs-kmod | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs new file mode 100644 index 0000000000..62adecfe84 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs @@ -0,0 +1,4 @@ +cros_post_src_install_rm_systemd_masks() { + rm "${D}$(systemd_get_systemunitdir)"/zfs-load-key.service + rm "${D}$(systemd_get_systemunitdir)"/zfs-import.service +} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod new file mode 100644 index 0000000000..55536d82a8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod @@ -0,0 +1,2 @@ +: ${MODULES_ROOT:=$(echo ${SYSROOT}/lib/modules/*)} +KERNEL_DIR="${MODULES_ROOT}/build"