[Toybox] patch to disable scripts/make.sh GITHASH=...

Rob Landley rob at landley.net
Sun Aug 6 18:44:17 PDT 2017



On 08/06/2017 12:58 AM, Thomas wrote:
>> Wait, your git --describe is finding a random tarball in some other
>> directory?
>>
>> That's really broken.
> ...
>> That's a pretty clear yocto bug (one I can't reproduce), but if you're
>> adding a workaround for this yocto bug the easy thing to do is keep
>> GITHASH if it's already be set, not add a second special case variable.
> 
> Replace "yocto" with "project using git + building toybox"

Is finding a random tarball in some other directory?

> make.sh sets GITHASH because the "." directory is "under" git.
> /proj/whatever/ ... was checked out of git and contains:
> /proj/whatever/things/toybox/download-build-toybox.sh
> ... "git describe --tags --abbrev=12" prints out the tag/hash
> for parent project whatever ... not for toybox.tgz.

Ah, so you're saying you're building from a tarball under some _other_
project's git repository, so git is finding a ../../../.git directory
that has nothing to do with toybox.

That wasn't how I read the description in that email, my bad.

> GITHASH is technically correct, but annoyingly unhelpful.
> 
> How shall I force "toybox --version" to print "toybox 0.7.4"
> instead of "toybox whatever-16.0.0-222-ge7bb9e918200"
> just because the toybox build dir is "under" a git dir?

By checking for a .git directory at the top of the toybox source directory.

Rob



More information about the Toybox mailing list