mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-07-21 07:17:58 +02:00
ff5549841c
* 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>
20 lines
561 B
Diff
20 lines
561 B
Diff
Subject: use linux/capability.h on linux systems too
|
|
Author: Loïc Minier <loic.minier@ubuntu.com>
|
|
|
|
Upstream-Status: Inappropriate
|
|
---
|
|
include/private/android_filesystem_config.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/include/private/android_filesystem_config.h
|
|
+++ b/include/private/android_filesystem_config.h
|
|
@@ -27,7 +27,7 @@
|
|
#include <sys/types.h>
|
|
#include <stdint.h>
|
|
|
|
-#ifdef HAVE_ANDROID_OS
|
|
+#if defined(HAVE_ANDROID_OS) || defined(__linux__)
|
|
#include <linux/capability.h>
|
|
#else
|
|
#include "android_filesystem_capability.h"
|