Commit Graph

14 Commits

Author SHA1 Message Date
Dmitry Baryshkov 145ae5af9e 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: 2a3d4be999 ("android-tools: create flag flag file for adbd at a proper location")
Fixes: a29c6386d5 ("android-toold-adbd: Fix inconsistency between selinux configurations")
Fixes: 8106cfe769 ("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>
2024-10-06 07:15:08 -04:00
Raghuvarya S ebad6c98e2 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: a29c6386d5 ("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>
2024-10-06 07:14:36 -04:00
Dmitry Baryshkov 90976455c1 android-tools: remove two Debianisms
If the build happens on a Debian system, android-tools build will hang
forever, filling the log files (and the disk) with the following
messages:

make: dpkg-architecture: No such file or directory
make: dpkg-architecture: No such file or directory
make: dpkg-architecture: No such file or directory
make: dpkg-architecture: No such file or directory
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files

Fix two places which include dpkg makefile fragments from the host
system.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-12-12 08:56:54 -08:00
Martin Jansa c51df28a4d meta-oe/dynamic-layers: add Upstream-Status where missing
* I was using openembedded-core/scripts/contrib/patchreview.py to find
  missing Upstream-Status, but that doesn't find .patch files in dynamic-layers

* now with openembedded-core/scripts/yocto-check-layer it reported couple more missing:

INFO: test_patches_upstream_status (common.CommonCheckLayer.test_patches_upstream_status)
INFO:  ... expected failure
INFO: Traceback (most recent call last):
  File "/OE/build/oe-core/openembedded-core/scripts/lib/checklayer/cases/common.py", line 87, in test_patches_upstream_status
    self.assertEqual(len(patches), 0 , \
AssertionError: 47 != 0 : Found following patches with malformed or missing upstream status:
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch
/OE/build/oe-core/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-09-29 09:50:43 -07:00
Sourav Kumar Pramanik 3da59b8a8a meta-oe-components: Avoid usage of nobranch=1
The usage of nobranch=1 in SRC_URI allows using unprotected branches.

This change updates the real branch name in place of nobranch=1 for these components.

Signed-off-by: Sourav Kumar Pramanik <pramanik.souravkumar@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-09-07 08:22:43 -07:00
Chen Qi c126f16db2 android-tools: fix systemd service setting
The service file belongs to ${PN}-adbd instead of ${PN}.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-04-06 13:45:10 -07:00
Etienne Cordonnier 3add35fa2d android-tools: update to 29.0.6.r14
Note: the adbd makefile can't be upstreamed to debian, because there is
already an open PR upstream:
https://salsa.debian.org/android-tools-team/android-platform-tools/-/merge_requests/4/diffs

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-22 10:47:55 -07:00
Etienne Cordonnier b71b1eedb4 android-tools: fix TMPDIR
Remove the TMPDIR environment variable from adb which is used by commands like
mktemp (set to /data/local/tmp in android but vanilla linux uses /tmp per
default).

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-17 07:06:56 -07:00
Etienne Cordonnier 545c524c11 android-tools 10: port some patches from version 5
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-14 09:39:58 -07:00
Etienne Cordonnier b65453d5bc android-tools 10: various fixes
- fix img2simg which was broken in the original recipe (wrong rpath and missing linking to libbase)
- remove clang dependency and make it compile with gcc
- fix installation of img2simg and simg2img which was broken in the original recipe
- backport patch https://github.com/nmeum/android-tools/blob/master/patches/adb/0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch
  The license is MIT, so it can be used.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-14 09:39:58 -07:00
Etienne Cordonnier b85ae59968 android-tools 10: Add flag to enable adbd service
android-tools-adbd service can be enabled in the image using
USB_DEBUGGING_ENABLED = "1" in local.conf.

See commit 4271cc2827 of meta-openembedded.

The existing ConditionPathExists line in the service file checks for the
existence of this file.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-14 09:39:58 -07:00
Etienne Cordonnier 28636f3d3f android-tools 10: move adbd to its own package
This is consistent with the existing recipe in meta-openembedded, and will make
it easier for users of the recipe to switch between versions.

Also prepend the list of packages instead of appending.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-14 09:39:58 -07:00
Etienne Cordonnier 34794d8870 android-tools 10: remove dead code
This is a copy-paste leftover from the original meta-openembedded recipe (version 5).

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-14 09:39:58 -07:00
Etienne Cordonnier d3f4e68512 android-tools 10: import version from meta-clang
Imported from:
https://github.com/kraj/meta-clang.git
Commit 87d41f7dd7a69bbf159

This version is on the one hand newer than the version currently in meta-openembedded (version 10 vs 5)
and on the other hand based on the debian sources, which already contain some
makefiles added by debian (android normally compiles with Android.bp files) and should
thus be easier to maintain than current version.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-14 09:39:58 -07:00