mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
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>
This commit is contained in:
committed by
Armin Kuster
parent
23f1ed8d4e
commit
d2be40d2d9
@@ -54,24 +54,6 @@ inherit systemd
|
|||||||
|
|
||||||
SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service"
|
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
|
# Find libbsd headers during native builds
|
||||||
CC_append_class-native = " -I${STAGING_INCDIR}"
|
CC_append_class-native = " -I${STAGING_INCDIR}"
|
||||||
CC_append_class-nativesdk = " -I${STAGING_INCDIR}"
|
CC_append_class-nativesdk = " -I${STAGING_INCDIR}"
|
||||||
|
|||||||
Reference in New Issue
Block a user