[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Minios-devel] [PATCH ARM v10 2/2] arm: build system
On Thu, 2015-08-13 at 09:43 +0100, Thomas Leonard wrote: Sorry for the delay, I've been travelling then on vacation > On 11 August 2015 at 15:39, Ian Campbell <ian.campbell@xxxxxxxxxx> wrote: > > On Mon, 2015-08-10 at 16:11 +0100, Thomas Leonard wrote: > > > Hi Ian, > > > > > > I'm happy to have it imported. > > > > > > I assume you'd prefer to import it yourself from the git submodule > > > (only the libfdt subdirectory is required), and don't want me posting > > > a patch with the entire source of libfdt to the mailing list... > > > > It wouldn't actually be the largest patch in the world, but still > > probably > > better to avoid it I think. We could do this with a git pull request, > > or by > > someone sending me a precise set of runes to use to construct the > > commit on > > the fly. > > > > Either way the commit message should end up containing the upstream git > > sha1sum as a reference point for future resyncing. It'd probably be > > wise to > > use a tagged release rather than current master too. > > OK: > > git pull https://github.com/talex5/mini-os.git bundle-libfdt > > (https://github.com/mirage/mini-os/compare/master...talex5:bundle-libfdt) > > The only difference (in libfdt) between this revision of dtc and the > last release is a couple of bug-fixes, which it probably makes sense > to keep. Thanks. Looking at the commit: @@ -0,0 +1,4 @@ +This code was imported from https://git.kernel.org/cgit/utils/dtc/dtc.git, +commit 64c46b098b969502a74c8b0fd97e6f5e4aa07e21. To save space, the DTC code +has been removed. The libfdt directory is unmodified, and the directory +structure unchanged, to simplify future merging. I was expecting this to be essentially the result of: mkdir mini-os.git/libfdt cp dtc.git/libfdt/* mini-os.git/libfdt git add -r mini-os.git/libfdt But it seems you did something else a bit more complex? IMHO this has actually made future merging more difficult, not easier, since the person doing the merge now needs to consider what out of dtc.git/* they need to copy over as well as just updating the libfdt directory but repeating the cp and looking at git status. Also, there seems to be two copies of libfdt_env.h now, one in include and one in dtc/libfdt. Not sure if that is intentional or a problem? Lastly I'm afraid the build rune supplied in the commit message doesn't work for me, lots of -Werror=int-to-pointer-cast, see attached output from: $ make XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- \ > CONFIG_TEST=y CONFIG_START_NETWORK=n CONFIG_BLKFRONT=n \ > CONFIG_NETFRONT=n CONFIG_FBFRONT=n CONFIG_KBDFRONT=n \ > CONFIG_CONSFRONT=n CONFIG_XC=n -k |& tee ~/mini-os.log $ arm-linux-gnueabihf-gcc --version arm-linux-gnueabihf-gcc (crosstool-NG linaro-1.13.1-4.8-2014.04 - Linaro GCC 4.8-2014.04) 4.8.3 20140401 (prerelease) Copyright (C) 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ That's a slightly older compiler but its not so old I think it shouldn't be usable, and it's what I use for everything else.... Ian. Attachment:
mini-os.log _______________________________________________ Minios-devel mailing list Minios-devel@xxxxxxxxxxxxxxxxxxxx http://lists.xenproject.org/cgi-bin/mailman/listinfo/minios-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |