From 271691624f18c6bb397479d186bf124131447389 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Mon, 22 Jul 2024 19:16:57 +0200 Subject: [PATCH] Disable waydroid option when using Project C schedulers. It depends on PSI which is disabled on those schedulers due to bugs. Related to https://github.com/Frogging-Family/linux-tkg/issues/975 --- customization.cfg | 1 + linux-tkg-config/prepare | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/customization.cfg b/customization.cfg index 0e56d7b8..fde7a846 100644 --- a/customization.cfg +++ b/customization.cfg @@ -185,6 +185,7 @@ _bcachefs="false" _ntsync="false" # Set to "true" to enable Binder modules to use Waydroid Android containers +# !!! Not available on Project C schedulers (PDS & BMQ) due to disabled PSI on those !!! _waydroid="" # Various patches and tweaks from Zen/Liquorix, Xanmod and the community - Default is "true" diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 1ed57d7a..dc952c64 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -1691,18 +1691,20 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r unset _msg # Waydroid - if [ -z "$_waydroid" ]; then - plain "" - plain "Enable android modules for use with Waydroid?" - plain "https://waydro.id" - read -rp "`echo $' > N/y : '`" CONDITION12; - fi - if [[ "$CONDITION12" =~ [yY] ]] || [ "$_waydroid" = "true" ]; then - _enable "ANDROID" "ANDROID_BINDER_IPC" "ANDROID_BINDERFS" - _disable "ANDROID_BINDER_IPC_SELFTEST" - scripts/config --set-str "ANDROID_BINDER_DEVICES" "" - if [[ "$CONDITION12" =~ [yY] ]]; then - read -rp "Press enter to continue..." + if [ "${_cpusched}" != "pds" ] && [ "${_cpusched}" != "bmq" ]; then + if [ -z "$_waydroid" ]; then + plain "" + plain "Enable android modules for use with Waydroid?" + plain "https://waydro.id" + read -rp "`echo $' > N/y : '`" CONDITION12; + fi + if [[ "$CONDITION12" =~ [yY] ]] || [ "$_waydroid" = "true" ]; then + _enable "ANDROID" "ANDROID_BINDER_IPC" "ANDROID_BINDERFS" + _disable "ANDROID_BINDER_IPC_SELFTEST" + scripts/config --set-str "ANDROID_BINDER_DEVICES" "" + if [[ "$CONDITION12" =~ [yY] ]]; then + read -rp "Press enter to continue..." + fi fi fi