* [meta-oe][PATCH 1/2] android-tools: refresh patch
@ 2018-04-08 20:14 Martin Jansa
2018-04-08 20:14 ` [meta-oe][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2018-04-08 20:14 UTC (permalink / raw)
To: openembedded-devel
WARNING: android-tools-5.1.1.r37-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch preserve-ownership.patch
patching file system/extras/ext4_utils/make_ext4fs_main.c
Hunk #1 succeeded at 47 with fuzz 2 (offset -2 lines).
Hunk #2 succeeded at 81 (offset -2 lines).
Hunk #3 succeeded at 144 (offset -2 lines).
patching file system/extras/ext4_utils/make_ext4fs.c
Now at patch preserve-ownership.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../android-tools/preserve-ownership.patch | 71 ++++++++++++----------
.../android-tools/android-tools_5.1.1.r37.bb | 2 +-
2 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch b/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch
index 85af81f0f9..5c90397194 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch
@@ -1,19 +1,50 @@
+From aa669312a380611d280d126cb509fa282080707e Mon Sep 17 00:00:00 2001
+From: Markus Mayer <mmayer@mmayer.net>
+Date: Wed, 7 Sep 2016 12:58:47 +0300
+Subject: [PATCH] android-tools: add recipe from AOSP tag android-5.1.1_r37
+
Description: add -o argument to preserve ownership
-Author: Markus Mayer <mmayer@mmayer.net>
See also https://android-review.googlesource.com/#/c/100312/
Upstream-Status: Inappropriate
+
---
- system/extras/ext4_utils/make_ext4fs.c | 6 ++++++
- system/extras/ext4_utils/make_ext4fs_main.c | 10 ++++++++--
+ ext4_utils/make_ext4fs.c | 6 ++++++
+ ext4_utils/make_ext4fs_main.c | 10 ++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
---- a/system/extras/ext4_utils/make_ext4fs_main.c
-+++ b/system/extras/ext4_utils/make_ext4fs_main.c
-@@ -49,13 +49,15 @@ extern struct fs_info info;
+diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
+index 2f89ae8a..cc41d623 100644
+--- a/ext4_utils/make_ext4fs.c
++++ b/ext4_utils/make_ext4fs.c
+@@ -68,6 +68,8 @@
+
+ #endif
+
++int preserve_owner = 0;
++
+ /* TODO: Not implemented:
+ Allocating blocks in the same block group as the file inode
+ Hash or binary tree directories
+@@ -186,6 +188,10 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
+ } else {
+ dentries[i].mtime = fixed_time;
+ }
++ if (preserve_owner) {
++ dentries[i].uid = stat.st_uid;
++ dentries[i].gid = stat.st_gid;
++ }
+ uint64_t capabilities;
+ if (fs_config_func != NULL) {
+ #ifdef ANDROID
+diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c
+index a6c5f616..7af0dddf 100644
+--- a/ext4_utils/make_ext4fs_main.c
++++ b/ext4_utils/make_ext4fs_main.c
+@@ -48,13 +48,15 @@ struct selabel_handle;
+ extern struct fs_info info;
- extern struct selabel_handle* selinux_android_file_context_handle(void);
+extern int preserve_owner;
+
@@ -28,7 +59,7 @@ Upstream-Status: Inappropriate
fprintf(stderr, " <filename> [<directory>]\n");
}
-@@ -81,7 +83,7 @@ int main(int argc, char **argv)
+@@ -80,7 +82,7 @@ int main(int argc, char **argv)
struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } };
#endif
@@ -37,7 +68,7 @@ Upstream-Status: Inappropriate
switch (opt) {
case 'l':
info.len = parse_num(optarg);
-@@ -144,6 +146,10 @@ int main(int argc, char **argv)
+@@ -143,6 +145,10 @@ int main(int argc, char **argv)
}
#endif
break;
@@ -48,25 +79,3 @@ Upstream-Status: Inappropriate
case 'v':
verbose = 1;
break;
---- a/system/extras/ext4_utils/make_ext4fs.c
-+++ b/system/extras/ext4_utils/make_ext4fs.c
-@@ -67,6 +67,8 @@
-
- #endif
-
-+int preserve_owner = 0;
-+
- /* TODO: Not implemented:
- Allocating blocks in the same block group as the file inode
- Hash or binary tree directories
-@@ -185,6 +187,10 @@ static u32 build_directory_structure(con
- } else {
- dentries[i].mtime = fixed_time;
- }
-+ if (preserve_owner) {
-+ dentries[i].uid = stat.st_uid;
-+ dentries[i].gid = stat.st_gid;
-+ }
- uint64_t capabilities;
- if (fs_config_func != NULL) {
- #ifdef ANDROID
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index d3ccd1d064..5d8f8a8435 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -26,7 +26,7 @@ SRC_URI = " \
file://remove-selinux-android.patch \
file://use-capability.patch \
file://use-local-socket.patch \
- file://preserve-ownership.patch \
+ file://preserve-ownership.patch;patchdir=system/extras \
file://mkbootimg-Add-dt-parameter-to-specify-DT-image.patch \
file://remove-bionic-android.patch \
file://define-shell-command.patch \
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-oe][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name
2018-04-08 20:14 [meta-oe][PATCH 1/2] android-tools: refresh patch Martin Jansa
@ 2018-04-08 20:14 ` Martin Jansa
2018-05-06 20:18 ` Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2018-04-08 20:14 UTC (permalink / raw)
To: openembedded-devel
* so that bitbake doesn't need to use git ls-remote during parsing to resolve tag name into SRCREV
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../android-tools/android-tools_5.1.1.r37.bb | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 5d8f8a8435..780ecaa11a 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = " \
"
DEPENDS = "libbsd libpcre openssl zlib libcap"
-ANDROID_TAG = "android-5.1.1_r37"
ANDROID_MIRROR = "android.googlesource.com"
CORE_REPO = "${ANDROID_MIRROR}/platform/system/core"
EXTRAS_REPO = "${ANDROID_MIRROR}/platform/system/extras"
@@ -17,12 +16,19 @@ LIBHARDWARE_REPO = "${ANDROID_MIRROR}/platform/hardware/libhardware"
LIBSELINUX_REPO = "${ANDROID_MIRROR}/platform/external/libselinux"
BUILD_REPO = "${ANDROID_MIRROR}/platform/build"
+# matches with android-5.1.1_r37
+SRCREV_core = "2314b110bdebdbfd2d94c502282f9e57c849897e"
+SRCREV_extras = "3ecbe8d841df96127d7855661293e5ab6ba6c205"
+SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b"
+SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb"
+SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
+
SRC_URI = " \
- git://${CORE_REPO};name=core;protocol=https;nobranch=1;destsuffix=git/system/core;tag=${ANDROID_TAG} \
- git://${EXTRAS_REPO};name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras;tag=${ANDROID_TAG} \
- git://${LIBHARDWARE_REPO};name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware;tag=${ANDROID_TAG} \
- git://${LIBSELINUX_REPO};name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux;tag=${ANDROID_TAG} \
- git://${BUILD_REPO};name=build;protocol=https;nobranch=1;destsuffix=git/build;tag=${ANDROID_TAG} \
+ git://${CORE_REPO};name=core;protocol=https;nobranch=1;destsuffix=git/system/core \
+ git://${EXTRAS_REPO};name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \
+ git://${LIBHARDWARE_REPO};name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \
+ git://${LIBSELINUX_REPO};name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \
+ git://${BUILD_REPO};name=build;protocol=https;nobranch=1;destsuffix=git/build \
file://remove-selinux-android.patch \
file://use-capability.patch \
file://use-local-socket.patch \
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name
2018-04-08 20:14 ` [meta-oe][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name Martin Jansa
@ 2018-05-06 20:18 ` Martin Jansa
0 siblings, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2018-05-06 20:18 UTC (permalink / raw)
To: openembedded-devel
ping
The other android-tools patch was merged now, is there some issue with this
one?
On Sun, Apr 8, 2018 at 10:14 PM, Martin Jansa <martin.jansa@gmail.com>
wrote:
> * so that bitbake doesn't need to use git ls-remote during parsing to
> resolve tag name into SRCREV
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../android-tools/android-tools_5.1.1.r37.bb | 18
> ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.
> 1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.
> 1.1.r37.bb
> index 5d8f8a8435..780ecaa11a 100644
> --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
> +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
> @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = " \
> "
> DEPENDS = "libbsd libpcre openssl zlib libcap"
>
> -ANDROID_TAG = "android-5.1.1_r37"
> ANDROID_MIRROR = "android.googlesource.com"
> CORE_REPO = "${ANDROID_MIRROR}/platform/system/core"
> EXTRAS_REPO = "${ANDROID_MIRROR}/platform/system/extras"
> @@ -17,12 +16,19 @@ LIBHARDWARE_REPO = "${ANDROID_MIRROR}/platform/
> hardware/libhardware"
> LIBSELINUX_REPO = "${ANDROID_MIRROR}/platform/external/libselinux"
> BUILD_REPO = "${ANDROID_MIRROR}/platform/build"
>
> +# matches with android-5.1.1_r37
> +SRCREV_core = "2314b110bdebdbfd2d94c502282f9e57c849897e"
> +SRCREV_extras = "3ecbe8d841df96127d7855661293e5ab6ba6c205"
> +SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b"
> +SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb"
> +SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
> +
> SRC_URI = " \
> - git://${CORE_REPO};name=core;protocol=https;nobranch=1;
> destsuffix=git/system/core;tag=${ANDROID_TAG} \
> - git://${EXTRAS_REPO};name=extras;protocol=https;
> nobranch=1;destsuffix=git/system/extras;tag=${ANDROID_TAG} \
> - git://${LIBHARDWARE_REPO};name=libhardware;protocol=
> https;nobranch=1;destsuffix=git/hardware/libhardware;tag=${ANDROID_TAG} \
> - git://${LIBSELINUX_REPO};name=libselinux;protocol=https;
> nobranch=1;destsuffix=git/external/libselinux;tag=${ANDROID_TAG} \
> - git://${BUILD_REPO};name=build;protocol=https;nobranch=
> 1;destsuffix=git/build;tag=${ANDROID_TAG} \
> + git://${CORE_REPO};name=core;protocol=https;nobranch=1;destsuffix=git/system/core
> \
> + git://${EXTRAS_REPO};name=extras;protocol=https;
> nobranch=1;destsuffix=git/system/extras \
> + git://${LIBHARDWARE_REPO};name=libhardware;protocol=
> https;nobranch=1;destsuffix=git/hardware/libhardware \
> + git://${LIBSELINUX_REPO};name=libselinux;protocol=https;
> nobranch=1;destsuffix=git/external/libselinux \
> + git://${BUILD_REPO};name=build;protocol=https;nobranch=1;destsuffix=git/build
> \
> file://remove-selinux-android.patch \
> file://use-capability.patch \
> file://use-local-socket.patch \
> --
> 2.15.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-06 20:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-08 20:14 [meta-oe][PATCH 1/2] android-tools: refresh patch Martin Jansa
2018-04-08 20:14 ` [meta-oe][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name Martin Jansa
2018-05-06 20:18 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.