diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-10-02 13:10:17 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-24 16:42:15 +0000 |
commit | bc6f77df76b6f0efc31b299bfa7971d3eab067ef (patch) | |
tree | 5fc730ea78ed8a40ebe7a72183aaaad339e1e8b6 /meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | |
parent | f3018013ffbf7277ecc618787eca92455285f667 (diff) | |
download | meta-openembedded-contrib-bc6f77df76b6f0efc31b299bfa7971d3eab067ef.tar.gz |
android-tools: upgrade to 9.0.0-r10jansa/android
* build it with ninja like Arch does in:
https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/android-tools&id=21f3ef02af9b2252129bee4d11b7740ce4b1d88f
and import the patches from Arch
* import few more patches from debian, Nonnull.patch, stdatomic.patch from
https://salsa.debian.org/android-tools-team/android-platform-system-core/tree/e80c68d02a2fde9f351ac26e9feb984da1e8841a/debian/patches
* and switch to boringssl, because with openssl10 it cannot be really
used by anything, because openssl.cnf from openssl10-native will conflict
with openssl.cnf installed to RSS by openssl-native, e.g.:
DEBUG: Executing python function sstate_task_prefunc
DEBUG: Python function sstate_task_prefunc finished
DEBUG: Executing python function extend_recipe_sysroot
NOTE: Direct dependencies are ['virtual:native:/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb:do_populate_sysroot', '/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.65.bb:do_populate_sysroot', '/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_8.2.bb:do_populate_sysroot', '/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_8.2.bb:do_populate_sysroot', '/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-core/glibc/glibc_2.28.bb:do_populate_sysroot', 'virtual:native:/OE/build/owpb/webos-ports/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb:do_populate_sysroot', 'virtual:native:/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-devtools/rpm/rpm_4.14.2.bb:do_populate_sysroot', 'virtual:native:/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb:do_populate_sysroot', 'virtual:native:/OE/build/owpb/webos-ports/openembedded-core/meta/recipes-devtools/pseudo/pseudo_git.bb:do_populate_sysroot']
ERROR: Error executing a python function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
0001:
*** 0002:extend_recipe_sysroot(d)
0003:
File: '/OE/build/owpb/webos-ports/openembedded-core/meta/classes/staging.bbclass', lineno: 553, function: extend_recipe_sysroot
0549: dest = newmanifest[l]
0550: if l.endswith("/"):
0551: staging_copydir(l, targetdir, dest, seendirs)
0552: continue
*** 0553: staging_copyfile(l, targetdir, dest, postinsts, seendirs)
0554:
0555: bb.note("Installed into sysroot: %s" % str(msg_adding))
0556: bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists))
0557:
File: '/OE/build/owpb/webos-ports/openembedded-core/meta/classes/staging.bbclass', lineno: 151, function: staging_copyfile
0147: os.symlink(linkto, dest)
0148: #bb.warn(c)
0149: else:
0150: try:
*** 0151: os.link(c, dest)
0152: except OSError as err:
0153: if err.errno == errno.EXDEV:
0154: bb.utils.copyfile(c, dest)
0155: else:
Exception: FileExistsError: [Errno 17] File exists: '/OE/build/owpb/webos-ports/tmp-glibc/sysroots-components/x86_64/openssl-native/etc/ssl/openssl.cnf' -> '/OE/build/owpb/webos-ports/tmp-glibc/work/tissot-webos-linux/android-system-image-tissot/20180914-22-r0/recipe-sysroot-native/etc/ssl/openssl.cnf'
DEBUG: Python function extend_recipe_sysroot finished
ERROR: Function failed: extend_recipe_sysroot
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb')
-rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 168 |
1 files changed, 0 insertions, 168 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 deleted file mode 100644 index e09cd829d7..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ /dev/null @@ -1,168 +0,0 @@ -DESCRIPTION = "Different utilities from Android" -SECTION = "console/utils" -LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" -LIC_FILES_CHKSUM = " \ - file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ - file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378 \ - file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ -" -DEPENDS = "libbsd libpcre zlib libcap" -DEPENDS_append_class-target = " openssl" - -ANDROID_MIRROR = "android.googlesource.com" - -# matches with android-5.1.1_r37 -SRCREV_core = "2314b110bdebdbfd2d94c502282f9e57c849897e" -SRCREV_extras = "3ecbe8d841df96127d7855661293e5ab6ba6c205" -SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b" -SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb" -SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc" - -SRC_URI = " \ - git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/system/core \ - git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \ - git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \ - git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \ - git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=git/build \ - file://core/0001-adb-remove-selinux-extensions.patch;patchdir=system/core \ - file://core/0002-adb-Use-local-sockets-where-appropriate.patch;patchdir=system/core \ - file://core/0003-adb-define-shell-command.patch;patchdir=system/core \ - file://core/0004-adb-Fix-build-on-big-endian-systems.patch;patchdir=system/core \ - file://core/0005-adb-add-base64-implementation.patch;patchdir=system/core \ - file://core/0006-adb-Musl-fixes.patch;patchdir=system/core \ - file://core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch;patchdir=system/core \ - file://core/0008-adb-Allow-adbd-to-be-ran-as-root.patch;patchdir=system/core \ - file://core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch;patchdir=system/core \ - file://core/0010-Use-linux-capability.h-on-linux-systems-too.patch;patchdir=system/core \ - file://core/0011-Remove-bionic-specific-calls.patch;patchdir=system/core \ - file://core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch;patchdir=system/core \ - file://core/adb_libssl_11.diff;patchdir=system/core \ - file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \ - file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \ - file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \ - file://android-tools-adbd.service \ - file://gitignore \ - file://adb.mk;subdir=${BPN} \ - file://adbd.mk;subdir=${BPN} \ - file://ext4_utils.mk;subdir=${BPN} \ - file://fastboot.mk;subdir=${BPN} \ - file://mkbootimg.mk;subdir=${BPN} \ -" - - -S = "${WORKDIR}/git" -B = "${WORKDIR}/${BPN}" - -# http://errors.yoctoproject.org/Errors/Details/133881/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -COMPATIBLE_HOST_powerpc = "(null)" -COMPATIBLE_HOST_powerpc64 = "(null)" - -inherit systemd - -SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" - -# Find libbsd headers during native builds -CC_append_class-native = " -I${STAGING_INCDIR}" -CC_append_class-nativesdk = " -I${STAGING_INCDIR}" - -TOOLS = "adb fastboot ext4_utils mkbootimg adbd" - -# Adb needs sys/capability.h, which is not available for native* -TOOLS_class-native = "fastboot ext4_utils mkbootimg" -TOOLS_class-nativesdk = "fastboot ext4_utils mkbootimg" - -do_compile() { - cp ${WORKDIR}/gitignore ${S}/.gitignore - - # Setting both variables below causing our makefiles to not work with - # implicit make rules - unset CFLAGS - unset CPPFLAGS - - export SRCDIR=${S} - - case "${HOST_ARCH}" in - arm) - export android_arch=linux-arm - ;; - aarch64) - export android_arch=linux-arm64 - ;; - mips|mipsel) - export android_arch=linux-mips - ;; - mips64|mips64el) - export android_arch=linux-mips64 - ;; - powerpc|powerpc64) - export android_arch=linux-ppc - ;; - i586|x86_64) - export android_arch=linux-x86 - ;; - esac - - for tool in ${TOOLS}; do - mkdir -p ${B}/${tool} - oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool} - done -} - -do_install() { - if echo ${TOOLS} | grep -q "ext4_utils" ; then - install -D -p -m0755 ${S}/system/core/libsparse/simg_dump.py ${D}${bindir}/simg_dump - install -D -p -m0755 ${S}/system/extras/ext4_utils/mkuserimg.sh ${D}${bindir}/mkuserimg - - install -m0755 ${B}/ext4_utils/ext2simg ${D}${bindir} - install -m0755 ${B}/ext4_utils/ext4fixup ${D}${bindir} - install -m0755 ${B}/ext4_utils/img2simg ${D}${bindir} - install -m0755 ${B}/ext4_utils/make_ext4fs ${D}${bindir} - install -m0755 ${B}/ext4_utils/simg2img ${D}${bindir} - install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir} - fi - - if echo ${TOOLS} | grep -q "adb " ; then - install -d ${D}${bindir} - install -m0755 ${B}/adb/adb ${D}${bindir} - fi - - if echo ${TOOLS} | grep -q "adbd" ; then - install -d ${D}${bindir} - install -m0755 ${B}/adbd/adbd ${D}${bindir} - fi - - # Outside the if statement to avoid errors during do_package - install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ - ${D}${systemd_unitdir}/system/android-tools-adbd.service - - if echo ${TOOLS} | grep -q "fastboot" ; then - install -d ${D}${bindir} - install -m0755 ${B}/fastboot/fastboot ${D}${bindir} - fi - - if echo ${TOOLS} | grep -q "mkbootimg" ; then - install -d ${D}${bindir} - install -m0755 ${B}/mkbootimg/mkbootimg ${D}${bindir} - fi -} - -PACKAGES += "${PN}-fstools" - -RDEPENDS_${BPN} = "${BPN}-conf bash" - -FILES_${PN}-fstools = "\ - ${bindir}/ext2simg \ - ${bindir}/ext4fixup \ - ${bindir}/img2simg \ - ${bindir}/make_ext4fs \ - ${bindir}/simg2img \ - ${bindir}/simg2simg \ - ${bindir}/simg_dump \ - ${bindir}/mkuserimg \ -" - -BBCLASSEXTEND = "native" |