From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CC4361A1DFA for ; Fri, 29 Jul 2016 09:44:37 -0700 (PDT) Received: by mail-wm0-x22f.google.com with SMTP id o80so160052215wme.1 for ; Fri, 29 Jul 2016 09:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=DAs6dAOqCS3BFj1++eVQ0xfBYsD0ns0TBso56HQ0d5M=; b=aAxUeEzj/B268crdbdx0MJAIyKK6Cb4m1cSDwweilLc8hZmg/S+cc9TbwZAVGQHMqt 0+y+U3JqGPePpDwp8HpJVSvpmB9fvvLQ5Rzf7p3MsL4TabqXHSM5lCsax1Bc4zlHmrgV YxMlpfGAwlouucMYT4P7BZlTP8bIXabyAbnug= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=DAs6dAOqCS3BFj1++eVQ0xfBYsD0ns0TBso56HQ0d5M=; b=TRl3xuMouiX3xjKqojqDas0oWQ+zGC62Swa7vp4Ltgda2lnupYquNKs+ul2At/MYSr db+ay/N/jL2bNjXAjA18J4/BhknoP5I9j4hv4RTrpdqOIsaAsYujGNhJ/8mvaEnpSrl2 zszPxUpPueRhPGrFDUZQ9o3hNOjXY/acRnxY4ViHO58xcVDIlLJl4ZMw79UIZZXm4JPk vhvcxAzlzI1RNw736YtMP7EduoBzrE2xg8r1FPhynOPdfQqEIjkQr6rBXNLssMaJAIuD CHBVPqm5u1AecEfwB1TFhx5dL9kXFaZIW68Urvv2WEM9wrF1EyxWbIRjDJXQhXSX992g YVZQ== X-Gm-Message-State: AEkoousB/0aGtr/X2GSUjgBKHBNHSVWoOV3R5Diah/bI9LKp2Ga6bwFY0MD8zghrIyiFnY4x X-Received: by 10.28.26.69 with SMTP id a66mr1995139wma.8.1469810675922; Fri, 29 Jul 2016 09:44:35 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id p83sm3827749wma.18.2016.07.29.09.44.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jul 2016 09:44:35 -0700 (PDT) Date: Fri, 29 Jul 2016 17:44:33 +0100 From: Leif Lindholm To: Laszlo Ersek Cc: edk2-devel@ml01.01.org, michael.d.kinney@intel.com, Jordan Justen , Andrew Fish Message-ID: <20160729164433.GO31760@bivouac.eciton.net> References: <1467901459-18840-1-git-send-email-leif.lindholm@linaro.org> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH] add top-level .gitattributes file, dealing with .depex X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jul 2016 16:44:38 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jul 07, 2016 at 05:03:13PM +0200, Laszlo Ersek wrote: > On 07/07/16 16:24, Leif Lindholm wrote: > > Git tends to see .depex files as text, causing hideous patches being > > generated (and breaking PatchCheck.py). > > > > Add a .gitattributes file instructing git to treat them as binary. > > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Leif Lindholm > > --- > > .gitattributes | 1 + > > 1 file changed, 1 insertion(+) > > create mode 100644 .gitattributes > > > > diff --git a/.gitattributes b/.gitattributes > > new file mode 100644 > > index 0000000..2d8a45b > > --- /dev/null > > +++ b/.gitattributes > > @@ -0,0 +1 @@ > > +*.depex binary > > > > What generates .depex files? I've never seen any. > > Also, unless you add .depex files with "git add" to the set of tracked files, no patches / diffs should cover them. What am I missing? :) > > ... Hm, after > > $ find . -iname "*.depex" > > I see .depex files in Build/ (which should be ignored altogether), and > > ./Vlv2TbltDevicePkg/IntelGopDepex/IntelGopDriver.depex > > Why does that file exist in the tree? Let me see... git log says nothing relevant (the file dates back to commit 3cbfba02fef9, "Upload BSD-licensed Vlv2TbltDevicePkg and Vlv2DeviceRefCodePkg to"). > > Grepping the tree for the filename itself leads to: > > Vlv2TbltDevicePkg/PlatformPkg.fdf: DXE_DEPEX DXE_DEPEX Optional $(WORKSPACE)/$(PLATFORM_PACKAGE)/IntelGopDepex/IntelGopDriver.depex > Vlv2TbltDevicePkg/PlatformPkgGcc.fdf: DXE_DEPEX DXE_DEPEX Optional $(WORKSPACE)/$(PLATFORM_PACKAGE)/IntelGopDepex/IntelGopDriver.depex > > Do these rules exist to override the DEPEX sections of binary-only modules? If so: that's horrible. > > Anyway, given that edk2 contains at least one .depex file, and your patch is correct according to : > > Reviewed-by: Laszlo Ersek Thanks! I had hoped for comments from someone else on cc, since we don't have any Maintainers.txt entry for the top level directory :) But if I don't hear anything before Monday, I'll push it then. Regards, Leif