From 4bea80956f7b740647aa557486bc2c6043e295ad Mon Sep 17 00:00:00 2001 From: Dariusz Pelowski Date: Sun, 5 Nov 2017 12:06:39 +0100 Subject: 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 Signed-off-by: Armin Kuster (cherry picked from commit d2be40d2d907d0db304f44dde20a1c878a2f974c) Signed-off-by: Armin Kuster --- .../android-tools/android-tools_5.1.1.r37.bb | 18 ------------------ 1 file changed, 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 SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" -# Get rid of files uneeded to build Android tools -do_unpack_extra() { - cd ${S} - rm -rf \ - system/core/.git \ - system/extras/.git \ - hardware/libhardware/.git \ - external/libselinux/.git \ - build/.git - git init - git add . - git commit -m \ - "Initial import - committed ${ANDROID_TAG}" - git clean -fdx -} - -addtask unpack_extra after do_unpack before do_patch - # Find libbsd headers during native builds CC_append_class-native = " -I${STAGING_INCDIR}" CC_append_class-nativesdk = " -I${STAGING_INCDIR}" -- cgit 1.2.3-korg