On Mon, Jun 01, 2015 at 04:06:07PM +0200, Vladimir 'phcoder' Serbinenko wrote: > Go ahead
Thanks, done. Apologies for the delay, caused by some toolchains issues I encountered when doing a test build before pushing. I will follow up regarding these later. > On Jun 1, 2015 3:33 PM, "Leif Lindholm" <leif.lindh...@linaro.org> wrote: > > > On Sat, May 30, 2015 at 09:00:00AM +0300, Andrei Borzenkov wrote: > > > Leif, any comments? You are the author of it, was GRUB_MOD_LICENSE > > > omission intentional or by accident? > > > > Apologies - entirely accidental. > > > > Can I push Dann's fix? > > > > > В Thu, 21 May 2015 10:28:48 -0600 > > > dann frazier <dann.fraz...@canonical.com> пишет: > > > > > > > Including the setjmp module in an arm64-efi image will cause it to > > > > immediately exit with an "incompatible license" error. > > > > > > > > The source file includes a GPLv3+ boilerplate, so fix this by > > declaring a > > > > GPLv3+ license using the GRUB_MOD_LICENSE macro. > > > > > > > > Signed-off-by: dann frazier <dann.fraz...@canonical.com> > > > > --- > > > > grub-core/lib/arm64/setjmp.S | 2 ++ > > > > 1 file changed, 2 insertions(+) > > > > > > > > diff --git a/grub-core/lib/arm64/setjmp.S > > b/grub-core/lib/arm64/setjmp.S > > > > index adaafe4..eabfd99 100644 > > > > --- a/grub-core/lib/arm64/setjmp.S > > > > +++ b/grub-core/lib/arm64/setjmp.S > > > > @@ -17,8 +17,10 @@ > > > > */ > > > > > > > > #include <grub/symbol.h> > > > > +#include <grub/dl.h> > > > > > > > > .file "setjmp.S" > > > > +GRUB_MOD_LICENSE "GPLv3+" > > > > .text > > > > > > > > /* > > > > > > > _______________________________________________ > > Grub-devel mailing list > > Grub-devel@gnu.org > > https://lists.gnu.org/mailman/listinfo/grub-devel > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
