From d89cb5f03a8d4951590cee276daee6f9a269b6d0 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 10 Apr 2019 09:02:41 -0400 Subject: poky: refresh master: 8217b477a1..4e511f0abc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update poky to master HEAD. Adrian Bunk (1): bind: upgrade 9.11.5 -> 9.11.5-P4 Alexey Brodkin (1): busybox: Enable domain search list support Andre Rosa (2): lib/oe/utils: Make prune_suffix prune a suffix bitbake: utils: Make prune_suffix prune a suffix Andreas Müller (1): patch/insane: Rework patch fuzz handling Bruce Ashfield (8): poky-tiny: set 5.0 as the preferred kernel linux-yocto-rt/4.19: fix duplicate TIF_NEED_RESCHED_LAZY linux-yocto/5.0: update CGL audit configuration fragment linux-yocto-tiny/4.18: point KBRANCH to 4.18 linux-yocto/4.18: update to v4.18.33 qemumips: Enable the poweroff driver linux-yocto/5.0: tweak qemuarm -tiny configuration linux-yocto/4.18: remove versioned recipes Gianfranco Costamagna (1): kernel-dev, sdk-manual: Unified question spacing Khem Raj (2): libgcc: Create linux-musleabihf and linux-gnueabihf symlinks Revert "mdadm: fix gcc8 maybe-uninitialized/format-overflow warning" Mark Asselstine (2): go.bbclass: Export more GO* environment variables goarch.bbclass: use MACHINEOVERRIDES and simplify go_map_arm() Nathan Rossi (3): cmake-native: Enable ccmake by default and depend on ncurses ccmake.bbclass: Create a cml1 style class for the CMake curses UI devtool: standard: Handle exporting generated config fragments Nikhil Pal Singh (1): cmake: Support Eclipse and other cmake generators Ovidiu Panait (2): xf86-video-vesa: Refuse to run on UEFI machines ghostscript: Fix 3 CVEs Randy MacLeod (1): autoconf: update runtime perl module dependencies Richard Purdie (4): openssh/util-linux/python*: Ensure ptest output is unbuffered ptest-runner: Add several logging fixes oeqa/utils/qemurunner: Fix typo in previous commit linux-yocto: Drop 4.18 kernel Robert Yang (1): sstate.bbclass: Use bb.utils.to_boolean() for BB_NO_NETWORK Ross Burton (2): sanity: clarify error message if TMPDIR moves insane: fix gettext dependency warning Scott Rifenbark (2): ref-manual: Updated BB_GENERATE_MIRROR_TARBALLS overview-manual: Fixed broken link to pseudo. Tomasz Meresiński (1): systemd: fix predictable network interface names in initrd Yeoh Ee Peng (2): resulttool/manualexecution: Enable configuration options selection resulttool/manualexecution: Enable creation of configuration option file Change-Id: I988df9d6bf0dfdeaa517960fb744c7388f791cf6 Signed-off-by: Brad Bishop --- poky/meta/lib/oe/patch.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'poky/meta/lib/oe/patch.py') diff --git a/poky/meta/lib/oe/patch.py b/poky/meta/lib/oe/patch.py index 7dd31d9d4..f43cf047c 100644 --- a/poky/meta/lib/oe/patch.py +++ b/poky/meta/lib/oe/patch.py @@ -38,21 +38,10 @@ def runcmd(args, dir = None): if exitstatus != 0: raise CmdError(cmd, exitstatus >> 8, output) if " fuzz " in output: - bb.warn(""" -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 - devtool finish --force-patch-refresh - -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: -{}""".format(output)) + # Drop patch fuzz info with header and footer to log file so + # insane.bbclass can handle to throw error/warning + bb.note("--- Patch fuzz start ---\n%s\n--- Patch fuzz end ---" % format(output)) + return output finally: -- cgit v1.2.3