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/adb.mk | |
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/adb.mk')
-rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools/adb.mk | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk deleted file mode 100644 index 0687c22c17..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk +++ /dev/null @@ -1,72 +0,0 @@ -# Makefile for adb - -SRCDIR ?= $(S) - -VPATH += $(SRCDIR)/system/core/adb -adb_SRC_FILES += adb.c -adb_SRC_FILES += console.c -adb_SRC_FILES += transport.c -adb_SRC_FILES += transport_local.c -adb_SRC_FILES += transport_usb.c -adb_SRC_FILES += commandline.c -adb_SRC_FILES += adb_client.c -adb_SRC_FILES += adb_auth_host.c -adb_SRC_FILES += sockets.c -adb_SRC_FILES += services.c -adb_SRC_FILES += file_sync_client.c -adb_SRC_FILES += get_my_path_linux.c -adb_SRC_FILES += usb_linux.c -adb_SRC_FILES += usb_vendors.c -adb_SRC_FILES += fdevent.c -adb_OBJS := $(adb_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/libcutils -libcutils_SRC_FILES += atomic.c -libcutils_SRC_FILES += hashmap.c -libcutils_SRC_FILES += native_handle.c -libcutils_SRC_FILES += config_utils.c -libcutils_SRC_FILES += cpu_info.c -libcutils_SRC_FILES += load_file.c -# libcutils_SRC_FILES += open_memstream.c -# libcutils_SRC_FILES += strdup16to8.c -# libcutils_SRC_FILES += strdup8to16.c -# libcutils_SRC_FILES += record_stream.c -# libcutils_SRC_FILES += process_name.c -# libcutils_SRC_FILES += threads.c -# libcutils_SRC_FILES += sched_policy.c -# libcutils_SRC_FILES += iosched_policy.c -libcutils_SRC_FILES += str_parms.c -libcutils_SRC_FILES += fs.c -libcutils_SRC_FILES += multiuser.c -libcutils_SRC_FILES += socket_inaddr_any_server.c -libcutils_SRC_FILES += socket_local_client.c -libcutils_SRC_FILES += socket_local_server.c -libcutils_SRC_FILES += socket_loopback_client.c -libcutils_SRC_FILES += socket_loopback_server.c -libcutils_SRC_FILES += socket_network_client.c -libcutils_SRC_FILES += sockets.c -libcutils_SRC_FILES += ashmem-host.c -libcutils_SRC_FILES += dlmalloc_stubs.c -libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o) - -CFLAGS += -DANDROID -CFLAGS += -DWORKAROUND_BUG6558362 -CFLAGS += -DADB_HOST=1 -CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -CFLAGS += -DANDROID_SMP=0 -CFLAGS += -I$(SRCDIR)/system/core/adb -CFLAGS += -I$(SRCDIR)/system/core/include -CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h - -LIBS += libcutils.a -lpthread -lcrypto - -all: adb - -adb: libcutils.a $(adb_OBJS) - $(CC) -o $@ $(LDFLAGS) $(adb_OBJS) $(LIBS) - -libcutils.a: $(libcutils_OBJS) - $(AR) rcs $@ $(libcutils_OBJS) - -clean: - $(RM) $(adb_OBJS) $(libcutils_OBJS) adb *.a |