From 8601789cd44d78e56c00b1cea5e0de4c2b2b8bda Mon Sep 17 00:00:00 2001 From: quic-raghuvar Date: Thu, 22 Aug 2024 15:18:55 +0530 Subject: [PATCH 1/3] Make android-toold-adbd.service consistent between selinux-enabled and -disabled configurations ConditionPathExists is set to /etc/usb-debugging-enabled as part of meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service file. However, in meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service file ConditionPathExists is set to /var/usb-debugging-enabled This causes an internal inconsistency between selinux-enabled and -disabled configurations. Hence, change ConditionPathExists=/var/usb-debugging-enabled to ConditionPathExists=/etc/usb-debugging-enabled Reported-by: @lumag --- .../android-tools/android-tools/android-tools-adbd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74e3..b6661f2e39b 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service @@ -1,6 +1,6 @@ [Unit] Description=Android Debug Bridge -ConditionPathExists=/var/usb-debugging-enabled +ConditionPathExists=/etc/usb-debugging-enabled Before=android-system.service [Service] From a29c6386d576ddb7163c4b685b9faabf71d60d2a Mon Sep 17 00:00:00 2001 From: quic-raghuvar Date: Thu, 22 Aug 2024 15:18:55 +0530 Subject: [PATCH 2/3] android-toold-adbd: Fix inconsistency between selinux configurations ConditionPathExists is set to /etc/usb-debugging-enabled as part of meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service file. However, in meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service file ConditionPathExists is set to /var/usb-debugging-enabled This causes an internal inconsistency between selinux-enabled and -disabled configurations. Hence, change ConditionPathExists=/var/usb-debugging-enabled to ConditionPathExists=/etc/usb-debugging-enabled Reported-by: @lumag --- .../android-tools/android-tools/android-tools-adbd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74e3..b6661f2e39b 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service @@ -1,6 +1,6 @@ [Unit] Description=Android Debug Bridge -ConditionPathExists=/var/usb-debugging-enabled +ConditionPathExists=/etc/usb-debugging-enabled Before=android-system.service [Service] From 073fb0eb0491680bc4d469f25c1603b34b002553 Mon Sep 17 00:00:00 2001 From: quic-raghuvar Date: Mon, 2 Sep 2024 12:14:16 +0530 Subject: [PATCH 3/3] Revert "Make android-tools-adbd.service consistent between selinux configurations This reverts commit 8601789cd44d78e56c00b1cea5e0de4c2b2b8bda. --- .../android-tools/android-tools/android-tools-adbd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service index b6661f2e39b..ddf8d7f74e3 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service @@ -1,6 +1,6 @@ [Unit] Description=Android Debug Bridge -ConditionPathExists=/etc/usb-debugging-enabled +ConditionPathExists=/var/usb-debugging-enabled Before=android-system.service [Service]