From: Arnout Vandecappelle <arnout@mind.be>
To: Peter Korsgaard <peter@korsgaard.com>
Cc: Marcus Hoffmann <marcus.hoffmann@othermo.de>, buildroot@buildroot.org
Subject: Re: [Buildroot] [git commit] package/containerd: security bump to version 1.5.11
Date: Tue, 12 Apr 2022 10:28:10 +0200 [thread overview]
Message-ID: <4fead5f8-95e6-6f88-6a8c-f62a32fcec9f@mind.be> (raw)
In-Reply-To: <874k2zgxzk.fsf@dell.be.48ers.dk>
On 11/04/2022 22:34, Peter Korsgaard wrote:
>>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
>
> Hi,
>
> > @@ -55,7 +55,7 @@ var (
> > // NOTE: The $Format strings are replaced during 'git archive' thanks to the
> > // companion .gitattributes file containing 'export-subst' in this same
> > // directory. See also https://git-scm.com/docs/gitattributes
> > - gitVersion string = "v0.0.0-master+3df54a85234"
> > + gitVersion string = "v0.0.0-master+3df54a8523"
> > gitCommit string = "3df54a852345ae127d1fa3092b95168e4a88e2f8"
> > // sha1 from git, output of $(git rev-parse HEAD)
> > gitTreeState string = "" // state of git tree, either "clean" or "dirty"
>
> > So the gitVersion field lost a digit. No idea how this could
> > happen. Looking at the file in the git repo I see that this is listed
> > as:
>
> > gitVersion string = "v0.0.0-master+$Format:%H$"
> > gitCommit string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
>
> > https://github.com/containerd/containerd/blob/main/vendor/k8s.io/client-go/pkg/version/base.go
>
> > So I guess something in github is wrongly expanding this $Format?
>
> The format logic itself is part of git, as the export-subst attibute has
> been set for base.go:
>
> https://git-scm.com/docs/gitattributes
>
> But why the two $Format:%H$ lines expand to different things and why it
> has changed over time is unclear to me.
>
> In any case, I've pushed a commit to 2022.02.x to adjust the hash to
> what Github is now serving.
As I've written in the mail that went concurrently with yours, this may change
again at any time. Therefore, please make sure that you update the tarball on
sources.buildroot.org so there's a fallback when the hash changes again.
Regards,
Arnout
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-04-12 8:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-05 17:28 [Buildroot] [git commit] package/containerd: security bump to version 1.5.11 Peter Korsgaard
2022-04-11 12:28 ` Marcus Hoffmann
2022-04-11 17:03 ` Arnout Vandecappelle
2022-04-11 18:33 ` Yann E. MORIN
2022-04-11 19:02 ` Peter Korsgaard
2022-04-11 20:27 ` Arnout Vandecappelle
2022-04-11 20:34 ` Peter Korsgaard
2022-04-12 8:28 ` Arnout Vandecappelle [this message]
2022-04-12 9:26 ` Peter Korsgaard
2022-04-14 19:15 ` Arnout Vandecappelle
2022-04-14 20:06 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4fead5f8-95e6-6f88-6a8c-f62a32fcec9f@mind.be \
--to=arnout@mind.be \
--cc=buildroot@buildroot.org \
--cc=marcus.hoffmann@othermo.de \
--cc=peter@korsgaard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.