The patches by Raghuvarya changed the location of the file that systemd
uses to check whether to start the adbd or not. However those patches
completely ignored creating those two flag files, as done by the
android-tools recipes.
Make the android-tools create the /etc/usb-debugging-enabled file so
that it's possible to enable the adbd automatically.
Fixes: a29c6386d5 ("android-toold-adbd: Fix inconsistency between selinux configurations")
Fixes: 8106cfe769 ("android-tools-adbd.service: Change /var to /etc in ConditionPathExists")
Cc: Raghuvarya S <quic_raghuvar@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
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
The android-tools package doesn't include the systemd units. Instead
adbd unit is a part of the android-tools-adbd package. Set the
SYSTEMD_PACKAGES variable accordingly.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Fix the warning by pointing S to ${WORKDIR}/sources and UNPACKDIR to ${S}. Since recent UNPACKDIR work, default S directory is not created anymore. By setting UNPACKDIR to S, S in indirectly created in do_unpack.
Signed-off-by: alperak <alperyasinak1@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
android-tools-configfs doesn't have any checked out source files, which
results in a warning regarding S not existing. Fix the warning by
pointing S to ${WORKDIR}/sources and UNPACKDIR to ${S}.
Fix the warning for the selinux-enabled recipe.
The warning text:
WARNING: android-tools-conf-configfs-1.0-r0 do_unpack:
android-tools-conf-configfs: the directory ${WORKDIR}/${BP} (<scrubbed>)
pointed to by the S variable doesn't exist - please set S within the
recipe to point to where the source has been unpacked to
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
With the intruction of the UNPACKDIR the remount script is placed in the
UNPACKDIR and not in S.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
libstdc++ in GCC 14 has dropped several nested includes. Include the
<algorithms> header to fix build error:
system/core/fs_mgr/liblp/utility.cpp: In function 'bool android::fs_mgr::UpdateMetadataForInPlaceSnapshot(LpMetadata*, uint32_t, uint32_t)':
system/core/fs_mgr/liblp/utility.cpp:264:28: error: no matching function for call to 'find(std::vector<LpMetadataPartitionGroup*>::iterator, std::vector<LpMetadataPartitionGroup*>::iterator, __gnu_cxx::__alloc_traits<std::allocator<LpMetadataPartitionGroup>, LpMetadataPartitionGroup>::value_type*)'
264 | auto it = std::find(new_group_ptrs.begin(), new_group_ptrs.end(),
| ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
265 | &metadata->groups[partition.group_index]);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Replace references of WORKDIR with UNPACKDIR where it makes sense to do
so in preparation for changing the default value of UNPACKDIR.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
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>
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>
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>
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>
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>
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>
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>
Dmitry Baryshkov
quic-raghuvar
alperak
Khem Raj
Martin Jansa
Sourav Kumar Pramanik
Chen Qi
Etienne Cordonnier