diff options
author | Dariusz Pelowski <dariusz.pelowski@gmail.com> | 2017-11-05 12:06:39 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-11-15 16:34:05 -0800 |
commit | d2be40d2d907d0db304f44dde20a1c878a2f974c (patch) | |
tree | 65395b69176c8c9b78f52d421d05229dc54db0b2 /meta-oe/recipes-devtools | |
parent | 23f1ed8d4e0c88334d95b2ea7b70932d461ad892 (diff) | |
download | meta-openembedded-d2be40d2d907d0db304f44dde20a1c878a2f974c.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 18 |
1 files changed, 0 insertions, 18 deletions
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 75f5b9e26d..d3ccd1d064 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 | |||
@@ -54,24 +54,6 @@ inherit systemd | |||
54 | 54 | ||
55 | SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" | 55 | SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" |
56 | 56 | ||
57 | # Get rid of files uneeded to build Android tools | ||
58 | do_unpack_extra() { | ||
59 | cd ${S} | ||
60 | rm -rf \ | ||
61 | system/core/.git \ | ||
62 | system/extras/.git \ | ||
63 | hardware/libhardware/.git \ | ||
64 | external/libselinux/.git \ | ||
65 | build/.git | ||
66 | git init | ||
67 | git add . | ||
68 | git commit -m \ | ||
69 | "Initial import - committed ${ANDROID_TAG}" | ||
70 | git clean -fdx | ||
71 | } | ||
72 | |||
73 | addtask unpack_extra after do_unpack before do_patch | ||
74 | |||
75 | # Find libbsd headers during native builds | 57 | # Find libbsd headers during native builds |
76 | CC_append_class-native = " -I${STAGING_INCDIR}" | 58 | CC_append_class-native = " -I${STAGING_INCDIR}" |
77 | CC_append_class-nativesdk = " -I${STAGING_INCDIR}" | 59 | CC_append_class-nativesdk = " -I${STAGING_INCDIR}" |