From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E7E513832E for ; Sun, 21 Aug 2016 01:20:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E04A021C096; Sun, 21 Aug 2016 01:20:11 +0000 (UTC) Received: from resqmta-ch2-07v.sys.comcast.net (resqmta-ch2-07v.sys.comcast.net [69.252.207.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 04A9521C07F for ; Sun, 21 Aug 2016 01:20:10 +0000 (UTC) Received: from resomta-ch2-02v.sys.comcast.net ([69.252.207.98]) by resqmta-ch2-07v.sys.comcast.net with SMTP id bHQobWcotff8qbHQobhslo; Sun, 21 Aug 2016 01:20:10 +0000 Received: from [192.168.1.13] ([76.106.83.43]) by resomta-ch2-02v.sys.comcast.net with SMTP id bHQnbVbtLu1gJbHQnbUZxQ; Sun, 21 Aug 2016 01:20:10 +0000 Subject: Re: [gentoo-dev] [PATCH] kernel-2.eclass: introduce K_FROM_GIT for sources that derive from git repos To: gentoo-dev@lists.gentoo.org References: <40b687e0-4d53-9a84-aa05-dc34f72049a3@gentoo.org> <699594ea-6bf0-b83b-9d5f-7902407d0d08@gentoo.org> From: Joshua Kinard Message-ID: <974dc465-5e3c-d00a-3b0c-873f2dd0a54c@gentoo.org> Date: Sat, 20 Aug 2016 21:19:42 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 In-Reply-To: <699594ea-6bf0-b83b-9d5f-7902407d0d08@gentoo.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfAQrf2fZuh0HeTY2zsX4jJyu1dbhh4n1uJbg3P4x4ebuuTxhGovroeV2CCFAsyMCdy4s+u5HPCIbSLL72RKSlVh74TfNMxOyEJfZV1gBp15pAy+ZMwKK oQxLm6eQTZ78zrRFupxyPzx6x7OKPFvtvVhR4WZfNF5qkF8HUCHKH8vtTDylhsdrCWghlXxV8XjBLA== X-Archives-Salt: cccb56c0-873c-4827-9992-e0a1d13b1839 X-Archives-Hash: 10317e3e1c540955a28b1c28aae7796f On 08/20/2016 20:22, Daniel Campbell wrote: > On 08/20/2016 05:13 AM, Joshua Kinard wrote: >> All, >> >> It looks like that sometime around Linux 3.15, some kind of a quirk was >> introduced where a patch that contains the removal of a symlink followed by the >> addition of a file with the same name as the symlink causes patch's --dry-run >> phase to fail, which kills 'epatch'. See Bug #507656. >> >> A workaround was added to kernel-2.eclass, around line 1093, that hardcodes a >> check for sys-kernel/git-sources, to avoid this issue. Well, >> sys-kernel/mips-sources is also affected by the same issue. I'm close to >> releasing a newer mips-sources, having spent the last few months >> re-writing/refactoring chunks of old SGI IP27/BRIDGE code, and rather than add >> another hardcode to kernel-2, I instead created a new variable, K_FROM_GIT, >> that will replace the hardcode. >> >> When set to a value, it triggers the workaround, which still affects current >> kernels. This results in a cleaner implementation instead of a hardcoded >> ebuild, should future kernel packages sourced from a git repo get added. >> >> Patch is attached for review. >> >> Thanks! >> > > lgtm, but I'm curious over the targeting of -rc releases. Are the only > releases after 15 in the 3.x series -rc? If not, you're going to run > into problems where a kernel is >=3.15 but not an rc. > > Otherwise it seems better than hardcoding it imo. This bug smells more like a corner-case problem with patch itself, but I am not certain yet if it's been reported upstream to the GNU folks. Seems to affect sources built on top of, or pulled from, git repos. mips-sources is derived from periodic checkouts I do from the linux-mips.org git repo (ralf/linux.git), with custom patches stacked on top. Without this workaround, applying the base patches (either patch-x.y from kernel.org or the mipsgit-x.y.z-yyyymmdd* patch I diff myself) will fail, on both -rc or stable releases. -- Joshua Kinard Gentoo/MIPS kumba@gentoo.org 6144R/F5C6C943 2015-04-27 177C 1972 1FB8 F254 BAD0 3E72 5C63 F4E3 F5C6 C943 "The past tempts us, the present confuses us, the future frightens us. And our lives slip away, moment by moment, lost in that vast, terrible in-between." --Emperor Turhan, Centauri Republic