diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-10-02 17:33:59 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-10-02 17:17:10 -0700 |
commit | 7ea8156eeaebd845321dd2189ef0c9c6b408acd5 (patch) | |
tree | 7826818d7fb7b893f19eb4d2acd40002fecdcbff /meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch | |
parent | ff5549841c5c5debae0180574643281d25d4c037 (diff) | |
download | meta-openembedded-contrib-7ea8156eeaebd845321dd2189ef0c9c6b408acd5.tar.gz |
android-tools: refresh patches with devtool
* devtool isn't able to regenerate them completely, it generates only
top level commit which says that submodules were changed, like this:
From c8fa114325e4e532657499b9bb6fd23cb6536eaa Mon Sep 17 00:00:00 2001
From: OpenEmbedded <oe.patch@oe>
Date: Tue, 2 Oct 2018 16:46:55 +0000
Subject: [PATCH] Committing changes from do_patch
---
external/libselinux | 2 +-
system/core | 2 +-
system/extras | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
..
but it still creates relatively good commits in each submodule and
after small manual cleanup they can be exported with
git format-patch --no-numbered --no-signature
* rename .gitignore to prevent git ignoring the changes in .patch files
in meta-oe already (we want to use it only later during the build)
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/core/0010-Use-linux-capability.h-on-linux-systems-too.patch')
-rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch new file mode 100644 index 0000000000..2c607ff67c --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch @@ -0,0 +1,23 @@ +From ef743c9c3c7452ae904a5c343ee2b759ab3a87cb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@ubuntu.com> +Date: Wed, 7 Sep 2016 12:58:47 +0300 +Subject: [PATCH] Use linux/capability.h on linux systems too + +Upstream-Status: Inappropriate +--- + include/private/android_filesystem_config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h +index 2f528b95c8..3e0b00928e 100644 +--- 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" |