From 075b408020d22528459e62ce554ec3d5ce002557 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 26 Sep 2024 12:18:13 -0700 Subject: [PATCH] tangorpro: 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: Icb9fd5db204cb482a339eb7d8129dfae2538ee68 --- conf/init.tangorpro.rc | 2 +- device-tangorpro.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index 95f92ef..abf8f72 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -20,7 +20,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_tangorpro -service insmod_sh_tangorpro /vendor/bin/insmod.sh /vendor/etc/init.insmod.tangorpro.cfg +service insmod_sh_tangorpro /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.tangorpro.cfg class main user root group root system diff --git a/device-tangorpro.mk b/device-tangorpro.mk index d1d1ada..9887474 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -87,9 +87,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/tangorpro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.tangorpro.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/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.tangorpro.cfg + device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.tangorpro.cfg +endif # Camera PRODUCT_COPY_FILES += \