diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2018-04-08 20:14:39 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-05-01 18:12:49 -0700 |
| commit | 81736797cbfafa874bc40458bb65aaf4f2e85762 (patch) | |
| tree | 8d2d9d36ec62b41b115b40e2f0e1cd780060ca36 /meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | |
| parent | 9ea20e3fd15cda3ee64c63fc8263fff26190ffba (diff) | |
| download | meta-openembedded-contrib-81736797cbfafa874bc40458bb65aaf4f2e85762.tar.gz | |
android-tools: refresh patch
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb')
| -rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 |
1 files changed, 1 insertions, 1 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 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 \ |