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 <[email protected]> > > --- > > .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 > <https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes>: > > Reviewed-by: Laszlo Ersek <[email protected]>
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 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
