Location of the file that systemd uses to check whether to
start adbd or not has been updated from /var to /etc in
android-tools-adbd.service. This change changes the path
of creation of usb-debugging-enabled flag file in
android-tools recipes from /var/usb-debugging-enabled to
/etc/usb-debugging-enabled
Backport-of: 2a3d4be9994e ("android-tools: create flag flag file for adbd at a
proper location")
Fixes: a29c6386d576 ("android-toold-adbd: Fix inconsistency between selinux
configurations")
Fixes: 8106cfe769aa ("android-tools-adbd.service: Change /var to /etc in
ConditionPathExists")
Signed-off-by: Dmitry Baryshkov <[email protected]>
Signed-off-by: Raghuvarya S <[email protected]>
---
This is a backport of 2a3d4be9994e ("android-tools: create flag flag file for
adbd at a proper location")
from master to scarthgap.
.../recipes-devtool/android-tools/android-tools_29.0.6.r14.bb | 2 +-
.../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
index fbad5e136..e9b0c97e9 100644
---
a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
+++
b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
@@ -188,7 +188,7 @@ FILES:${PN} += "${libdir}/android ${libdir}/android/*"
BBCLASSEXTEND = "native"
android_tools_enable_devmode() {
- touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled
+ touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled
}
ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd +=
"${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1",
"android_tools_enable_devmode;", "", d)}"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 1c66ea499..9f02d703b 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -189,7 +189,7 @@ FILES:${PN}-fstools = "\
BBCLASSEXTEND = "native"
android_tools_enable_devmode() {
- touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled
+ touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled
}
ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd +=
"${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1",
"android_tools_enable_devmode;", "", d)}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#112398):
https://lists.openembedded.org/g/openembedded-devel/message/112398
Mute This Topic: https://lists.openembedded.org/mt/108555793/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
