diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2018-10-02 17:33:58 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-10-02 17:17:10 -0700 |
| commit | ff5549841c5c5debae0180574643281d25d4c037 (patch) | |
| tree | f0ad36c7a5cebe52b8ac64a3be9747c4172280ee /meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch | |
| parent | 934a034e0ece3527652b6fa84c1590e6f5847073 (diff) | |
| download | meta-openembedded-contrib-ff5549841c5c5debae0180574643281d25d4c037.tar.gz | |
android-tools: use patchdir parameter to apply patches
* helps to apply the patches for correct git repo
* split remove-selinux-android.patch into 2, because devtool modify fails to apply
it across 2 different git repositories:
ERROR: Command Error: 'sh -c 'PATCHFILE="remove-selinux-android.patch" git -c user.name="OpenEmbedded" -c user.email="oe.patch@oe" commit -F /tmp/tmpvn7yf20j --author="Sergio Schvezov <sergio.schvezov@canonical.com>" --date="Wed, 7 Sep 2016 12:58:47 +0300"'' exited with 0 Output:
On branch devtool
Changes not staged for commit:
modified: system/core (modified content)
modified: system/extras (modified content)
no changes added to commit
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /OE/build/owpb/webos-ports/tmp-glibc/work/aarch64-webos-linux/android-tools/5.1.1.r37-r0/devtooltmp-7qrccor9/temp/log.do_patch.8643
NOTE: Tasks Summary: Attempted 3 tasks of which 0 didn't need to be rerun and 1 failed.
NOTE: Writing buildhistory
ERROR: Extracting source for android-tools failed
* similarly with remove-bionic-android.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch b/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch index 64db6168c6..f26e5d0cfc 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch @@ -3,13 +3,13 @@ Author: Fathi Boudra <fabo@debian.org> Upstream-Status: Inappropriate --- - system/core/adb/adb.c | 1 + - system/core/fs_mgr/fs_mgr_fstab.c | 2 +- - system/core/include/cutils/sockets.h | 2 +- + adb/adb.c | 1 + + fs_mgr/fs_mgr_fstab.c | 2 +- + include/cutils/sockets.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---- a/system/core/fs_mgr/fs_mgr_fstab.c -+++ b/system/core/fs_mgr/fs_mgr_fstab.c +--- a/fs_mgr/fs_mgr_fstab.c ++++ b/fs_mgr/fs_mgr_fstab.c @@ -17,7 +17,7 @@ #include <ctype.h> #include <stdio.h> @@ -19,8 +19,8 @@ Upstream-Status: Inappropriate #include <sys/mount.h> #include "fs_mgr_priv.h" ---- a/system/core/include/cutils/sockets.h -+++ b/system/core/include/cutils/sockets.h +--- a/include/cutils/sockets.h ++++ b/include/cutils/sockets.h @@ -19,7 +19,7 @@ #include <errno.h> @@ -30,8 +30,8 @@ Upstream-Status: Inappropriate #include <stdbool.h> #ifdef HAVE_WINSOCK ---- a/system/core/adb/adb.c -+++ b/system/core/adb/adb.c +--- a/adb/adb.c ++++ b/adb/adb.c @@ -41,6 +41,7 @@ #include <sys/prctl.h> #include <getopt.h> |