[meta-oe][PATCH] android-tools: do_unpack_extra task removed

[meta-oe][PATCH] android-tools: do_unpack_extra task removed

[Dariusz Pelowski]

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>
---
 .../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 75f5b9e26..d3ccd1d06 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}"
-- 
2.14.3

Re: [meta-oe][PATCH] android-tools: do_unpack_extra task removed

[Martin Jansa]

If you care about android-tools then can you please fix also this one:
http://errors.yoctoproject.org/Errors/Details/158219/

it's broken since android-tools were imported from meta-android to meta-oe.

On Sun, Nov 5, 2017 at 12:06 PM, Dariusz Pelowski <
dariusz.pelowski@gmail.com> wrote:

> 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>
> ---
>  .../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 75f5b9e26..d3ccd1d06 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}"
> --
> 2.14.3
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>