diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2024-09-24 12:02:32 +0530 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2024-10-06 07:15:08 -0400 |
| commit | 145ae5af9ef45f566f07751a2c2ea6c224e71a24 (patch) | |
| tree | cd1f64e5076093ea6de9205afaf4656be4e914eb | |
| parent | ebad6c98e2bde6ed770b4ae9dd074f760b917be4 (diff) | |
| download | meta-openembedded-145ae5af9ef45f566f07751a2c2ea6c224e71a24.tar.gz | |
android-tools: Create flag file /etc/usb-debugging-enabled
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 <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_29.0.6.r14.bb | 2 | ||||
| -rw-r--r-- | meta-oe/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 fbad5e1368..e9b0c97e96 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/*" | |||
| 188 | BBCLASSEXTEND = "native" | 188 | BBCLASSEXTEND = "native" |
| 189 | 189 | ||
| 190 | android_tools_enable_devmode() { | 190 | android_tools_enable_devmode() { |
| 191 | touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled | 191 | touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" | 194 | 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 1c66ea4997..9f02d703ba 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 = "\ | |||
| 189 | BBCLASSEXTEND = "native" | 189 | BBCLASSEXTEND = "native" |
| 190 | 190 | ||
| 191 | android_tools_enable_devmode() { | 191 | android_tools_enable_devmode() { |
| 192 | touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled | 192 | touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" | 195 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" |