Re: [PATCH 1/1] Upgrade Gnulib; switch to bootstrap tool
On Wed, Jan 09, 2019 at 12:29:30PM +, Colin Watson wrote: > Upgrade Gnulib files to 20190105. > > It's much easier to maintain GRUB's use of portability support files > from Gnulib when the process is automatic and driven by a single > configuration file, rather than by maintainers occasionally running > gnulib-tool and committing the result. Removing these > automatically-copied files from revision control also removes the > temptation to hack the output in ways that are difficult for future > maintainers to follow. Gnulib includes a "bootstrap" program which is > designed for this. > > The canonical way to bootstrap GRUB from revision control is now > "./bootstrap", but "./autogen.sh" is still useful if you just want to > generate the GRUB-specific parts of the build system. > > GRUB now requires Autoconf >= 2.63 and Automake >= 1.11, in line with > Gnulib. Could you update INSTALL file too? Additionally, if you do such huge change could you move Gnulib from grub-core/gnulib to grub-core/lib/gnulib? Including all diffs which are currently outside of grub-core/gnulib directory. Well, maybe *.diff files should be renamed to *.patch... Could you add to the commit message how to exactly update Gnulib? Just list of steps like in the commit 461f1d8af (Import upstream zstd-1.3.6). Daniel ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH 1/1] Upgrade Gnulib; switch to bootstrap tool
Dear Colin, On 01/09/19 13:29, Colin Watson wrote: > Upgrade Gnulib files to 20190105. > > It's much easier to maintain GRUB's use of portability support files > from Gnulib when the process is automatic and driven by a single > configuration file, rather than by maintainers occasionally running > gnulib-tool and committing the result. Removing these > automatically-copied files from revision control also removes the > temptation to hack the output in ways that are difficult for future > maintainers to follow. Gnulib includes a "bootstrap" program which is > designed for this. > > The canonical way to bootstrap GRUB from revision control is now > "./bootstrap", but "./autogen.sh" is still useful if you just want to > generate the GRUB-specific parts of the build system. > > GRUB now requires Autoconf >= 2.63 and Automake >= 1.11, in line with > Gnulib. > > Signed-off-by: Colin Watson […] Thank you very, very much for tackling this and cleaning this up. I just wanted to report back, that I successfully tested this on Debian Sid/unstable, building GRUB as a coreboot payload. Kind regards, Paul smime.p7s Description: S/MIME Cryptographic Signature ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH 1/1] Upgrade Gnulib; switch to bootstrap tool
(Sorry for the slow response.) On Wed, Jan 16, 2019 at 09:03:40PM +0100, Daniel Kiper wrote: > Could you update INSTALL file too? Done. > Additionally, if you do such huge change could you move Gnulib from > grub-core/gnulib to grub-core/lib/gnulib? Ending up with grub-core/lib/gnulib/libgnu.a seems pretty repetitive, but on the other hand it does keep gnulib together with other (semi-)autogenerated things like libgcrypt, so OK. > Including all diffs which are currently outside of grub-core/gnulib > directory. Well, maybe *.diff files should be renamed to *.patch... These can't be in grub-core/lib/gnulib/; that whole directory should be regarded as being wiped out by gnulib-tool (it may not in fact be, but in my experience it's best to keep manually-maintained files separate from the directory that you give to gnulib-tool --source-base=). I agree that they should be collected in their own directory though. I've moved them to grub-core/lib/gnulib-patches/ instead, and renamed to .patch as you suggest. > Could you add to the commit message how to exactly update Gnulib? > Just list of steps like in the commit 461f1d8af (Import upstream > zstd-1.3.6). Commit messages aren't a good place for this sort of thing. (I mean, they're better than nothing, but they're still not great.) I've updated docs/grub-dev.texi instead, adding a "Gnulib" section under a new "Updating external code" chapter. I hope this will encourage people who know about the other bits of external code that GRUB imports to add corresponding sections there. I'll send a v2. Thanks, -- Colin Watson [cjwat...@ubuntu.com] ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
