Message ID | 20170608132826.GB11167@ubuntu.windy (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1dIxUJ-0004U9-Gx; Thu, 08 Jun 2017 13:28:35 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.89/mailfrontend-6) with esmtp id 1dIxUH-00080p-3t; Thu, 08 Jun 2017 15:28:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673AbdFHN2V (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Thu, 8 Jun 2017 09:28:21 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34417 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751662AbdFHN2T (ORCPT <rfc822; linux-media@vger.kernel.org>); Thu, 8 Jun 2017 09:28:19 -0400 Received: by mail-pg0-f66.google.com with SMTP id v14so4619325pgn.1 for <linux-media@vger.kernel.org>; Thu, 08 Jun 2017 06:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=JEQgcDHTIC9dBjDtbcnahMtvIud30TVIJczj3sdGJDk=; b=AnvUAqfkZ+UcqiUWPW5aiwjwDYwHDU2yjcp5T+NhhxIyn5T9A9+mR4ZmSPWSCRzqEn bpLugdhSwyUlf1mJ+Tv5O3McgyqdLZqxfB6NbTA+7Yr8MkL3WCRaoxZvY3OhgFzWZtgD 5K4e973xVcEgJN9qRX8quQSS1slMT5T4MQ7kPmAt0Jw/uJALFUCzPZQgegbTdk831V0E W0QILtxpvjgzEVAe0CzkpwL3LcI8Shwy04nUC+2TE8JrlBSAU1M4BGH0AjtQ5Kq4lPDf x4OD8pNRwCx94N9Wv/KqbuR5tbn+ZarIy1HJ4RdYX+WNshtait612Qr4jneculRZ7PPT TZuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=JEQgcDHTIC9dBjDtbcnahMtvIud30TVIJczj3sdGJDk=; b=A7Zi79o7Joww97V9JryFO0EN5nBj3UXAMx4rhiEmZcNRfbPrIjKgC8fC9jDbgGFjRm D5Z4+1Gtt6sLLCv342i3tayV0D+fINThgAcfWCd6tLkh7qkEe49s1WetAfcT8NNSbAvf mYA2BW0g625bO3GotOglyicnUGQ79J3Iv8PV9x3SUtiODv3m8XiJqxlPshMheRWUFlpo 6wHgKvYe4+Kw5C0Z5kTWxIvBF8eKZUbqu22fqZBwoKqu+EVN1bZNgfFtCP5H4vA5aQIg EQxMYwG2Xq3lzYuDwU9M1XgZDP+486yHL6NaxTyZdU1p9/xc6TQZsBkttiCotJq4uWtC oZqA== X-Gm-Message-State: AODbwcBLOUmPEYFRvXgFbGrcyoHp4i+Yh4sOLr+raMZFZUCuqRLwMJmz eWk6S6WXtHt78ic/ X-Received: by 10.84.164.165 with SMTP id w34mr8037705pla.54.1496928488546; Thu, 08 Jun 2017 06:28:08 -0700 (PDT) Received: from ubuntu.windy (c122-106-153-7.carlnfd1.nsw.optusnet.com.au. [122.106.153.7]) by smtp.gmail.com with ESMTPSA id h84sm10443154pfh.45.2017.06.08.06.28.06 for <linux-media@vger.kernel.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 06:28:07 -0700 (PDT) Date: Thu, 8 Jun 2017 23:28:28 +1000 From: Vincent McIntyre <vincent.mcintyre@gmail.com> To: linux-media@vger.kernel.org Subject: Re: [media_build] regression at 3a17e11 "update v4.10_sched_signal.patch" Message-ID: <20170608132826.GB11167@ubuntu.windy> References: <20170608131339.GA11167@ubuntu.windy> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170608131339.GA11167@ubuntu.windy> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.6.8.132116 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CD 0, __CT 0, __CT_TEXT_PLAIN 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __NO_HTML_TAG_RAW 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_MAILTO 0, __URI_NO_WWW 0, __USER_AGENT 0, __YOUTUBE_RCVD 0' |
Commit Message
Vincent McIntyre
June 8, 2017, 1:28 p.m. UTC
I managed to find the failing patch, not sure what the fix is. $ cd linux/ $ patch -f -N -p1 -i ../backports/v4.10_sched_signal.patch patching file drivers/media/dvb-core/dvb_ca_en50221.c Hunk #1 succeeded at 35 (offset 1 line). patching file drivers/media/dvb-core/dvb_demux.c Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line). patching file drivers/media/dvb-core/dvb_frontend.c Hunk #1 succeeded at 30 (offset 1 line). patching file drivers/media/pci/cx18/cx18-driver.h patching file drivers/media/pci/ivtv/ivtv-driver.c patching file drivers/media/pci/ivtv/ivtv-driver.h Hunk #1 succeeded at 39 (offset 1 line). patching file drivers/media/pci/pt1/pt1.c patching file drivers/media/pci/pt3/pt3.c patching file drivers/media/pci/solo6x10/solo6x10-i2c.c patching file drivers/media/pci/zoran/zoran_device.c patching file drivers/media/platform/vivid/vivid-radio-rx.c patching file drivers/media/platform/vivid/vivid-radio-tx.c patching file drivers/media/rc/lirc_dev.c Hunk #1 FAILED at 18. 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/rc/lirc_dev.c.rej patching file drivers/media/usb/cpia2/cpia2_core.c patching file drivers/media/usb/gspca/cpia1.c Hunk #1 succeeded at 28 (offset 1 line). patching file drivers/media/v4l2-core/videobuf-dma-sg.c patching file drivers/staging/media/lirc/lirc_zilog.c patching file include/media/v4l2-ioctl.h $ cat drivers/media/rc/lirc_dev.c.rej
Comments
> > $ cat drivers/media/rc/lirc_dev.c.rej > --- drivers/media/rc/lirc_dev.c > +++ drivers/media/rc/lirc_dev.c > @@ -18,7 +18,7 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include <linux/module.h> > -#include <linux/sched/signal.h> > +#include <linux/sched.h> > #include <linux/ioctl.h> > #include <linux/poll.h> > #include <linux/mutex.h> > A bit of staring brings this to light: The file that is being patched has extra lines relative to the patch 18 #undef pr_fmt 19 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 20 21 #include <linux/module.h> ** 22 #include <linux/kernel.h> 23 #include <linux/sched/signal.h> ** 24 #include <linux/errno.h> 25 #include <linux/ioctl.h> 26 #include <linux/fs.h> 27 #include <linux/poll.h> 28 #include <linux/completion.h> 29 #include <linux/mutex.h> 30 #include <linux/wait.h> This hunk applies cleanly, and seems to match up with recent kernel code (eg 174cd4b1e5fbd0d74c68cf3a74f5bd4923485512 sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>) @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/sched/signal.h> +#include <linux/sched.h> #include <linux/errno.h> #include <linux/ioctl.h> #include <linux/fs.h> HTH Vince
On 08/06/17 15:28, Vincent McIntyre wrote: > I managed to find the failing patch, not sure what the fix is. > > $ cd linux/ > $ patch -f -N -p1 -i ../backports/v4.10_sched_signal.patch > patching file drivers/media/dvb-core/dvb_ca_en50221.c > Hunk #1 succeeded at 35 (offset 1 line). > patching file drivers/media/dvb-core/dvb_demux.c > Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line). > patching file drivers/media/dvb-core/dvb_frontend.c > Hunk #1 succeeded at 30 (offset 1 line). > patching file drivers/media/pci/cx18/cx18-driver.h > patching file drivers/media/pci/ivtv/ivtv-driver.c > patching file drivers/media/pci/ivtv/ivtv-driver.h > Hunk #1 succeeded at 39 (offset 1 line). > patching file drivers/media/pci/pt1/pt1.c > patching file drivers/media/pci/pt3/pt3.c > patching file drivers/media/pci/solo6x10/solo6x10-i2c.c > patching file drivers/media/pci/zoran/zoran_device.c > patching file drivers/media/platform/vivid/vivid-radio-rx.c > patching file drivers/media/platform/vivid/vivid-radio-tx.c > patching file drivers/media/rc/lirc_dev.c > Hunk #1 FAILED at 18. > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/rc/lirc_dev.c.rej > patching file drivers/media/usb/cpia2/cpia2_core.c > patching file drivers/media/usb/gspca/cpia1.c > Hunk #1 succeeded at 28 (offset 1 line). > patching file drivers/media/v4l2-core/videobuf-dma-sg.c > patching file drivers/staging/media/lirc/lirc_zilog.c > patching file include/media/v4l2-ioctl.h > > $ cat drivers/media/rc/lirc_dev.c.rej > --- drivers/media/rc/lirc_dev.c > +++ drivers/media/rc/lirc_dev.c > @@ -18,7 +18,7 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include <linux/module.h> > -#include <linux/sched/signal.h> > +#include <linux/sched.h> > #include <linux/ioctl.h> > #include <linux/poll.h> > #include <linux/mutex.h> > Odd, it applies cleanly here. But don't bother, the media_build totally broke after the latest round of commits to the master. We're looking into that, but it might take a bit of time before it is resolved. Regards, Hans
On Thu, Jun 08, 2017 at 04:42:30PM +0200, Hans Verkuil wrote: > On 08/06/17 15:28, Vincent McIntyre wrote: > > I managed to find the failing patch, not sure what the fix is. > > > > $ cd linux/ > > $ patch -f -N -p1 -i ../backports/v4.10_sched_signal.patch > > patching file drivers/media/dvb-core/dvb_ca_en50221.c > > Hunk #1 succeeded at 35 (offset 1 line). > > patching file drivers/media/dvb-core/dvb_demux.c > > Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line). > > patching file drivers/media/dvb-core/dvb_frontend.c > > Hunk #1 succeeded at 30 (offset 1 line). > > patching file drivers/media/pci/cx18/cx18-driver.h > > patching file drivers/media/pci/ivtv/ivtv-driver.c > > patching file drivers/media/pci/ivtv/ivtv-driver.h > > Hunk #1 succeeded at 39 (offset 1 line). > > patching file drivers/media/pci/pt1/pt1.c > > patching file drivers/media/pci/pt3/pt3.c > > patching file drivers/media/pci/solo6x10/solo6x10-i2c.c > > patching file drivers/media/pci/zoran/zoran_device.c > > patching file drivers/media/platform/vivid/vivid-radio-rx.c > > patching file drivers/media/platform/vivid/vivid-radio-tx.c > > patching file drivers/media/rc/lirc_dev.c > > Hunk #1 FAILED at 18. > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/rc/lirc_dev.c.rej > > patching file drivers/media/usb/cpia2/cpia2_core.c > > patching file drivers/media/usb/gspca/cpia1.c > > Hunk #1 succeeded at 28 (offset 1 line). > > patching file drivers/media/v4l2-core/videobuf-dma-sg.c > > patching file drivers/staging/media/lirc/lirc_zilog.c > > patching file include/media/v4l2-ioctl.h > > > > $ cat drivers/media/rc/lirc_dev.c.rej > > --- drivers/media/rc/lirc_dev.c > > +++ drivers/media/rc/lirc_dev.c > > @@ -18,7 +18,7 @@ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > > > #include <linux/module.h> > > -#include <linux/sched/signal.h> > > +#include <linux/sched.h> > > #include <linux/ioctl.h> > > #include <linux/poll.h> > > #include <linux/mutex.h> > > > > Odd, it applies cleanly here. > > But don't bother, the media_build totally broke after the latest round of > commits to the master. We're looking into that, but it might take a bit > of time before it is resolved. > Just to follow up on this. The build still fell over during patching if I ran build --main-git --depth 1 -v 1 but did not if I ran build -v 1 (which causes the tarball to download instead) This suggests an inconsistency between the two, which is surprising and likely unintended. I poked around a bit and found that the media subdir was out of date and the build script was not updating it; --depth 1 appears to suppress that. Once I did a manual update, the patching succeeded. I'll try to work out a patch so 'build' avoids this issue in future. Vince
--- drivers/media/rc/lirc_dev.c +++ drivers/media/rc/lirc_dev.c @@ -18,7 +18,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/module.h> -#include <linux/sched/signal.h> +#include <linux/sched.h> #include <linux/ioctl.h> #include <linux/poll.h> #include <linux/mutex.h>