On Thursday 27 August 2015 15:19:57 Patrick Ohly wrote: > On Tue, 2015-07-14 at 20:07 +0000, > > [email protected] wrote: > > From: Leonardo Sandoval <[email protected]> > > > > These patches include: > > 1. iasl recipe taken from luv-yocto repository into OE-Core (the only > > > > change done was the LICENSE, from Intel-ACPI to BSD | GPLv2) > > > > 2. OVMF recipe (taken from luv-yocto repository) into OE-Core > > 3. Boot script: Instrumenting runqemu to include > > OECORE_MACHINE_SYSROOT, > > so the OVMF BIOS can be found. > > I've tried out these patches. Mostly it worked as advertised and I'd > love to use EFI with qemu, so I'd like to see this merged. > > I noticed that "git format-patches" from your branch followed by "git > am" mangles the > meta/recipes-core/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-too > lchain.patch because it is a mixture of Unix line ends (patch boiler plate) > and DOS line ends (actual patches). The file ended up with all Unix line > ends, which then failed during do_patch. I solved that by checking out your > branch and copying the file. Whoever merges needs to be careful here. This > might also be a problem for combo-layer, so perhaps a solution not based on > patching the makefiles may be needed.
Good to note this - FYI the --keep-cr option is what you need to add to your "git am" command line in order to avoid this problem. combo-layer does this already (we hit this same problem with patches to files with DOS line endings a while back). This is one reason why using the branch is usually a lot easier and safer than applying emails as patches (assuming the submitter sends a pull request with a branch - I'd encourage everyone sending series of more than a couple of patches to do this using the create-pull-request/send-pull-request scripts if they aren't already). Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
