summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghuvarya S <quic_raghuvar@quicinc.com>2024-09-24 12:02:30 +0530
committerArmin Kuster <akuster808@gmail.com>2024-10-06 07:14:36 -0400
commitebad6c98e2bde6ed770b4ae9dd074f760b917be4 (patch)
treea4e1e05048be1df27b336df96197977e0afd4110
parent3309a9d4dde1b8cbab60322ec24e121330e23cea (diff)
downloadmeta-openembedded-ebad6c98e2bde6ed770b4ae9dd074f760b917be4.tar.gz
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 selinux-disabled configurations. Backport-of: a29c6386d576 ("android-toold-adbd: Fix inconsistency between selinux configurations") Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Raghuvarya S <quic_raghuvar@quicinc.com> Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service2
1 files changed, 1 insertions, 1 deletions
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 ddf8d7f74e..b6661f2e39 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 @@
1[Unit] 1[Unit]
2Description=Android Debug Bridge 2Description=Android Debug Bridge
3ConditionPathExists=/var/usb-debugging-enabled 3ConditionPathExists=/etc/usb-debugging-enabled
4Before=android-system.service 4Before=android-system.service
5 5
6[Service] 6[Service]