From 3110ade74fd4d268c347333589b53cb18087cbe6 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 5 Sep 2023 10:27:04 -0700 Subject: [PATCH] device-shift-axolotl: add edt-ft5x06 driver to initramfs (MR 4374) It seems like the driver name has changed *again* in 6.5.x kernels, so let's just have both drivers in the initramfs to help with migrating between newer/older kernels and any future flip/flopping of drivers. This is a bit of a hack... it works because missing modules are not fatal for mkinitfs. The reason why they aren't fatal is that whether or not it's builtin is somewhat arbitrary... there's an open issue[1] for mkinitfs to make this smarter, i.e. throw an error if the .ko doesn't exist AND it's not builtin for the *installed* kernel. When that's implemented then this patch would likely result in mkinitfs failing on this device because one of those drivers may not be installed or builtin. I don't have time to implement this in mkinitfs, so adding this crude workaround of just including both seemed like a reasonable thing to do since the 6.5 kernel will break fde on this device (this has happened before). [ci:skip-build]: already built successfully in CI --- device/community/device-shift-axolotl/APKBUILD | 6 +++--- device/community/device-shift-axolotl/modules-initfs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD index fa0b627bf..8f8881542 100644 --- a/device/community/device-shift-axolotl/APKBUILD +++ b/device/community/device-shift-axolotl/APKBUILD @@ -4,8 +4,8 @@ pkgname=device-shift-axolotl pkgdesc="SHIFT6mq" -pkgver=11 -pkgrel=1 +pkgver=12 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -48,6 +48,6 @@ nonfree_firmware() { sha512sums=" 88e5a1f014e48c811df46e94e09016f4f65cd99eb7e0baff4f7aaf9ee9cec2f8d9d9849aa23b6a28dac9631eeace530c5d914b538f186acbbd1e907d9041cc7e deviceinfo -6bea4c8628853197600db11d11d2ad64f365ad2bdd9d06a05af0f3e96d4dcd2ffb9ddbd8ffc439f3d54baef02ad6eb05a7c16d308eecb24088279e63d7eb514a modules-initfs +4dc84207c5ca84b33b74139c8b0c9ce5baa8bcb1068df9943c478c02abcf8daccb88e06af63f120a434a115e277008e899305bd5239d8669436cb269889040e9 modules-initfs 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51 q6voiced.conf " diff --git a/device/community/device-shift-axolotl/modules-initfs b/device/community/device-shift-axolotl/modules-initfs index 91d39ffbf..790b1f271 100644 --- a/device/community/device-shift-axolotl/modules-initfs +++ b/device/community/device-shift-axolotl/modules-initfs @@ -1,3 +1,4 @@ +edt-ft5x06 focaltech_fts gpi i2c_qcom_geni