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: Armin Kuster <[email protected]> --- .../android-tools/preserve-ownership.patch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 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 85af81f..fc350fb 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 @@ -9,11 +9,13 @@ Upstream-Status: Inappropriate system/extras/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; +Index: git/system/extras/ext4_utils/make_ext4fs_main.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs_main.c ++++ git/system/extras/ext4_utils/make_ext4fs_main.c +@@ -47,13 +47,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 +30,7 @@ Upstream-Status: Inappropriate fprintf(stderr, " <filename> [<directory>]\n"); } -@@ -81,7 +83,7 @@ int main(int argc, char **argv) +@@ -79,7 +81,7 @@ int main(int argc, char **argv) struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } }; #endif @@ -37,7 +39,7 @@ Upstream-Status: Inappropriate switch (opt) { case 'l': info.len = parse_num(optarg); -@@ -144,6 +146,10 @@ int main(int argc, char **argv) +@@ -142,6 +144,10 @@ int main(int argc, char **argv) } #endif break; @@ -48,8 +50,10 @@ Upstream-Status: Inappropriate case 'v': verbose = 1; break; ---- a/system/extras/ext4_utils/make_ext4fs.c -+++ b/system/extras/ext4_utils/make_ext4fs.c +Index: git/system/extras/ext4_utils/make_ext4fs.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs.c ++++ git/system/extras/ext4_utils/make_ext4fs.c @@ -67,6 +67,8 @@ #endif -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
