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/core/0006-adb-Musl-fixes.patch | |
parent | f3018013ffbf7277ecc618787eca92455285f667 (diff) | |
download | meta-openembedded-contrib-jansa/android.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/core/0006-adb-Musl-fixes.patch')
-rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch deleted file mode 100644 index b5d383f383..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 62d957a1271c88ec08d67984fbe31601f0bd41a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 15 Sep 2017 15:50:57 -0700 -Subject: [PATCH] adb: Musl fixes - -__nonnull is gcc specific -include sys/types.h for size_t -Do not redefine close() and lseek() - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - adb/adb.h | 2 ++ - adb/disable_verity_service.c | 13 ++++++++----- - adb/framebuffer_service.c | 7 ++++--- - adb/sysdeps.h | 12 ++++++------ - 4 files changed, 20 insertions(+), 14 deletions(-) - -diff --git a/adb/adb.h b/adb/adb.h -index 44e5981bdc..bcdc49f63c 100644 ---- a/adb/adb.h -+++ b/adb/adb.h -@@ -18,7 +18,9 @@ - #define __ADB_H - - #include <limits.h> -+#include <sys/types.h> - -+#include "fdevent.h" - #include "adb_trace.h" - #include "transport.h" /* readx(), writex() */ - -diff --git a/adb/disable_verity_service.c b/adb/disable_verity_service.c -index ed3da52108..29fa3d65a9 100644 ---- a/adb/disable_verity_service.c -+++ b/adb/disable_verity_service.c -@@ -14,25 +14,28 @@ - * limitations under the License. - */ - --#include "sysdeps.h" - - #define TRACE_TAG TRACE_ADB - #include "adb.h" -+#include "sysdeps.h" -+#include "cutils/properties.h" -+#include "ext4_sb.h" -+#include <fs_mgr.h> - - #include <stdio.h> - #include <stdarg.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <inttypes.h> -+#include <unistd.h> -+#include <errno.h> -+#include <stdbool.h> - --#include "cutils/properties.h" --#include "ext4_sb.h" --#include <fs_mgr.h> - - #define FSTAB_PREFIX "/fstab." - struct fstab *fstab; - --__attribute__((__format__(printf, 2, 3))) __nonnull((2)) -+__attribute__((__format__(printf, 2, 3))) __attribute__((nonnull((2)))) - static void write_console(int fd, const char* format, ...) - { - char buffer[256]; -diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c -index 8cbe8403cc..8f0ccfb7aa 100644 ---- a/adb/framebuffer_service.c -+++ b/adb/framebuffer_service.c -@@ -14,6 +14,10 @@ - * limitations under the License. - */ - -+#include "fdevent.h" -+#include "adb.h" -+#include "sysdeps.h" -+ - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> -@@ -23,9 +27,6 @@ - #include <sys/types.h> - #include <sys/wait.h> - --#include "fdevent.h" --#include "adb.h" -- - #include <linux/fb.h> - #include <sys/ioctl.h> - #include <sys/mman.h> -diff --git a/adb/sysdeps.h b/adb/sysdeps.h -index cc1f839e9f..ea39ac39cc 100644 ---- a/adb/sysdeps.h -+++ b/adb/sysdeps.h -@@ -123,8 +123,8 @@ static __inline__ int unix_close(int fd) - { - return close(fd); - } --#undef close --#define close ____xxx_close -+//#undef close -+//#define close ____xxx_close - - static __inline__ int unix_read(int fd, void* buf, size_t len) - { -@@ -369,8 +369,8 @@ static __inline__ int adb_close(int fd) - { - return close(fd); - } --#undef close --#define close ____xxx_close -+//#undef close -+//#define close ____xxx_close - - - static __inline__ int adb_read(int fd, void* buf, size_t len) -@@ -392,8 +392,8 @@ static __inline__ int adb_lseek(int fd, int pos, int where) - { - return lseek(fd, pos, where); - } --#undef lseek --#define lseek ___xxx_lseek -+//#undef lseek -+//#define lseek ___xxx_lseek - - static __inline__ int adb_unlink(const char* path) - { |