From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-dev+bounces-59534-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3019D1381F3 for <garchives@archives.gentoo.org>; Sat, 6 Apr 2013 19:00:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25526E088A; Sat, 6 Apr 2013 18:59:55 +0000 (UTC) Received: from mail-oa0-f41.google.com (mail-oa0-f41.google.com [209.85.219.41]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 219DDE0884 for <gentoo-dev@lists.gentoo.org>; Sat, 6 Apr 2013 18:59:53 +0000 (UTC) Received: by mail-oa0-f41.google.com with SMTP id f4so5076557oah.0 for <gentoo-dev@lists.gentoo.org>; Sat, 06 Apr 2013 11:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=4RAfNEPoV67tyg66MXl8bpGDI8uaADW9tZbc/pJ9zQo=; b=pvAb4SG3tvyY1wqbZ/6lL1embrb81vSSmTzqFqgKfTPyCZyR9+qJgCuVbi5Y2gtc5A s9h4W0tcYt5aiAjNyEmLnRJdn0RMT+jbuiUOjvXQOBHKf8gylTMBjwNvrwXtCiSvH/Ar BKLVAdjm+9ffg/Jbv4QpQzo/4ecprCLK0j9d7giMr1OPE+DFs+99WZmU0/9uSa19dflD 9jyoLHEv/5Qrj3tVTyojpFe9F0UWkNh6xA0QI8kCYrTw8Dh0RrG2M8jMGjmhXm6ta9LL iGt3oxC7Hz2HAnllnH4cxphHL3IrVQcjm+dgQf14TukgAaoF/37vZZFanwqmQ4sK+xlP 531A== Precedence: bulk List-Post: <mailto:gentoo-dev@lists.gentoo.org> List-Help: <mailto:gentoo-dev+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org> X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 X-Received: by 10.182.158.234 with SMTP id wx10mr11358632obb.74.1365274793318; Sat, 06 Apr 2013 11:59:53 -0700 (PDT) Received: by 10.76.114.202 with HTTP; Sat, 6 Apr 2013 11:59:53 -0700 (PDT) Received: by 10.76.114.202 with HTTP; Sat, 6 Apr 2013 11:59:53 -0700 (PDT) In-Reply-To: <1365273347.9078.9.camel@rook> References: <20130406200843.6831c4fe@pomiocik.lan> <1365273347.9078.9.camel@rook> Date: Sat, 6 Apr 2013 14:59:53 -0400 Message-ID: <CA+czFiBK7iX-mWLqSJyDhqCvFiXz2ROw5Y7hk7CD1YDC-3ZvfQ@mail.gmail.com> Subject: Re: [gentoo-dev] [RFC] Establishing Gentoo patch policy to keep our patches consistent and clean From: Michael Mol <mikemol@gmail.com> To: gentoo-dev@lists.gentoo.org Content-Type: multipart/alternative; boundary=089e0141a93a13a22b04d9b5cf12 X-Archives-Salt: 0f7076e1-0a83-4639-961c-9b0457bbc709 X-Archives-Hash: a45f995cc7b56639075706285d6a1bfb --089e0141a93a13a22b04d9b5cf12 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Apr 6, 2013 2:36 PM, "Alexandre Rostovtsev" <tetromino@gentoo.org> wrote= : > > On Sat, 2013-04-06 at 20:08 +0200, Micha=C5=82 G=C3=B3rny wrote: > > 2. Patches have to apply to the top directory of the source tree with > > 'patch -p1'. If patches are applied to sub-directories, necessary '-p' > > argument shall be passed to 'epatch' explicitly. Developers are > > encouraged to create patches which are compatible with 'git am'. > > Please don't make -p1 into a hard requirement :/ > > There are upstreams who have different directory layouts in their scm > tree and in their source tarballs. If I clone an upstream git repository > to obtain a patch or to write a new patch that I will submit upstream, I > want to be able to apply that patch in an ebuild without having to > manually sed it to change the -p level. > > Specific examples of this among packages that I maintain: app-cdr/cdemu, > app-cdr/cdemu-daemon, sys-fs/vhba. These all use the same git tree, and > source tarballs for individual packages are created from different > subdirectories of that git tree. > > It wouldn't be; you pass the p level in as an argument, if necessary. --089e0141a93a13a22b04d9b5cf12 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <p dir=3D"ltr"><br> On Apr 6, 2013 2:36 PM, "Alexandre Rostovtsev" <<a href=3D"mai= lto:tetromino@gentoo.org">tetromino@gentoo.org</a>> wrote:<br> ><br> > On Sat, 2013-04-06 at 20:08 +0200, Micha=C5=82 G=C3=B3rny wrote:<br> > > 2. Patches have to apply to the top directory of the source tree = with<br> > > 'patch -p1'. If patches are applied to sub-directories, n= ecessary '-p'<br> > > argument shall be passed to 'epatch' explicitly. Develope= rs are<br> > > encouraged to create patches which are compatible with 'git a= m'.<br> ><br> > Please don't make -p1 into a hard requirement :/<br> ><br> > There are upstreams who have different directory layouts in their scm<= br> > tree and in their source tarballs. If I clone an upstream git reposito= ry<br> > to obtain a patch or to write a new patch that I will submit upstream,= I<br> > want to be able to apply that patch in an ebuild without having to<br> > manually sed it to change the -p level.<br> ><br> > Specific examples of this among packages that I maintain: app-cdr/cdem= u,<br> > app-cdr/cdemu-daemon, sys-fs/vhba. These all use the same git tree, an= d<br> > source tarballs for individual packages are created from different<br> > subdirectories of that git tree.<br> ><br> ></p> <p dir=3D"ltr">It wouldn't be; you pass the p level in as an argument, = if necessary.</p> --089e0141a93a13a22b04d9b5cf12--