Evolution-X-Tensor/device_google_tangorpro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tangorpro: Pull init.insmod.*.cfg from vendor_dlkm

Browse source 
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
This commit is contained in:
Brian Norris 2024-09-26 12:18:13 -07:00
parent 32c2f95b10
commit 075b408020
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/init.tangorpro.rc
View file

@ -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

8
device-tangorpro.mk
View file

@ -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 += \