Commit Graph

9 Commits

Author SHA1 Message Date
Martin Jansa
81736797cb android-tools: refresh patch
WARNING: android-tools-5.1.1.r37-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch preserve-ownership.patch
patching file system/extras/ext4_utils/make_ext4fs_main.c
Hunk #1 succeeded at 47 with fuzz 2 (offset -2 lines).
Hunk #2 succeeded at 81 (offset -2 lines).
Hunk #3 succeeded at 144 (offset -2 lines).
patching file system/extras/ext4_utils/make_ext4fs.c

Now at patch preserve-ownership.patch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-05-01 18:12:49 -07:00
Dariusz Pelowski
d2be40d2d9 android-tools: do_unpack_extra task removed
When user don't have properly configured git user.email and user.name
compilation fails on do_unpack_extra step when executing "git commit" command.

This patch removes whole do_unpack_extra task as it's unusual operation
for the recipe to remove .git directories and initialize new git repository
after do_unpack task.

Signed-off-by: Dariusz Pelowski <dariusz.pelowski@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2017-11-15 16:34:05 -08:00
Khem Raj
cff46fec3b android-tools: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-09-22 22:50:42 +00:00
Andrea Galbusera
e406d4f5ae android-tools: fix issue with missing files in eSDK updates
If this recipe was included in an eSDK and then eSDK incremental updates were
generated by repeatedly running the oe-publish-sdk script, after installing the
first of such updates, and any following as well, with 'devtool sdk-updates' the
eSDK gets corrupted. Indeed some of the files listed in SRC_URI (namely anything
in *.patch and *.service) get deleted by those updates, with bitbake that starts
warning with 'Unable to get checksum for android-tools* SRC_URI entry' at every
parse. Since the files are missing, such warnings turn into errors if trying to
bake android-tools.

The root cause is the somewhat unusual presence of android-tools/.gitignore,
indeed ignore everything not explicitly excepted. When oe-publish-sdk creates
the git repo it relies on to feed eSDK updates, the .gitignore gets honored,
leading to the buggy behaviour above.

This patch adds *.patch and *.service to the excepted patterns in .gitignore
Note that, although this solves the issue, it does not prevent from it popping
up again if new files get added to android-tools/ without explicitly excluding
them from .gitignore.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-13 13:19:41 +02:00
Ming Liu
ebd31fd8d5 meta: do not prepend/append to BBCLASSEXTEND
Replace some "+=/=+" with "=" when setting BBCLASSEXTEND, they are
redundant and inconsistent with the same setting in other recipes.

Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-16 23:34:32 +01:00
Martin Jansa
f7326128b8 android-tools: add libcap dependency and fix build on big endian systems
* add dependency on libcap to fix:
  android-tools/5.1.1.r37-r0/git/system/core/adb/adb.c:39:28: fatal error: sys/capability.h: No such file or directory
   #include <sys/capability.h>
                            ^
* add patch from buildroot to fix build with newer glibc and on
  bit-endian systems
  android-tools/5.1.1.r37-r0/git/system/core/adb/usb_linux_client.c:38:25: error: initializer element is not constant
    #define cpu_to_le32(x)  htole32(x)
                            ^

* and also disable thumb to fix:
  http://errors.yoctoproject.org/Errors/Details/133881/

* drop default apply=yes for the .patch files

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-22 13:17:07 +01:00
Koen Kooi
4cd27df21d android-tools: fix do_install
The previous patch introduced 2 bugs that made packaging fail:

1) Always failing grep
2) Conditionally install systemd files

Systemd.bbclass doesn't handle conditional installation and will throw an error.

Tested with -native and regular cross builds.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-11-23 15:29:55 +01:00
Koen Kooi
3587696e11 android-tools: fix native build
* Find libbsd headers when building natively
* Disable tools that needs sys/capability.h when building natively
* Enhance do_install to work when some tools are disabled

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-10-26 10:28:40 +02:00
Fathi Boudra
a231c431a5 android-tools: add recipe from AOSP tag android-5.1.1_r37
Android tools offer filsystem tools for creating sparse images,
so package them in package of its own.

This recipe is re-worked and not a straight import from meta-shr.

It's built from AOSP source. I've dropped the ubuntu-ism which will
never be upstreamed.

The intent is to be closer to the upstream AOSP source code and be able
to update the recipe regularly.

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-09-15 10:22:46 +02:00