From 32a1b786206476a61acf7086dc38967ed0c1724c Mon Sep 17 00:00:00 2001
From: Brian Norris <briannorris@google.com>
Date: Thu, 26 Sep 2024 12:18:13 -0700
Subject: [PATCH] felix: Pull init.insmod.*.cfg from vendor_dlkm

We've started pushing init.insmod.*.cfg into the kernel prebuilts, and
installing it to /vendor_dlkm/etc, but it may not be available on all
prebuilt variants (e.g., kernel 5.10).

Here, we:
1. conditionally install our common init.*cfg to /vendor_dlkm (only if
   $(TARGET_KERNEL_DIR) doesn't have a copy)
2. point init at /vendor_dlkm/etc

When we've cycled completely off of kernel 5.10, we can drop #1.

Bug: 369686096
Test: build, boot
Flag: EXEMPT refactor
Change-Id: If8f879366645cbe9bf330d136dd7190763b2d6bc
---
 conf/init.felix.rc | 2 +-
 device-felix.mk    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/conf/init.felix.rc b/conf/init.felix.rc
index 47475e3..46a8980 100644
--- a/conf/init.felix.rc
+++ b/conf/init.felix.rc
@@ -86,7 +86,7 @@ on early-boot
     start insmod_sh_felix
     chown system system /sys/class/power_supply/dualbatt/dbatt_stats
 
-service insmod_sh_felix /vendor/bin/insmod.sh /vendor/etc/init.insmod.felix.cfg
+service insmod_sh_felix /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.felix.cfg
     class main
     user root
     group root system
diff --git a/device-felix.mk b/device-felix.mk
index 69e4375..f443348 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -60,9 +60,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/felix/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.felix.rc
 
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/felix/init.insmod.felix.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.felix.cfg
+	device/google/felix/init.insmod.felix.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.felix.cfg
+endif
 
 # Camera
 PRODUCT_COPY_FILES += \