[oe-commits] [meta-openembedded] 23/72: android-tools: fix issue with missing files in eSDK updates

git at git.openembedded.org git at git.openembedded.org
Wed Aug 9 23:55:53 UTC 2017


This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 638ca9a191c124f894955704d999d3a9a075faff
Author: Andrea Galbusera <gizero at gmail.com>
AuthorDate: Fri Jul 28 15:40:56 2017 +0200

    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 at gmail.com>
---
 meta-oe/recipes-devtools/android-tools/android-tools/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore b/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore
index b8a08f8..b034c10 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore
@@ -3,6 +3,8 @@
 !*.indirectionsymlink
 !*.[ch]
 !*.mk
+!*.patch
+!*.service
 !NOTICE
 !MODULE_LICENSE_*
 !/system/

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list