From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Christian Stewart <christian@paral.in>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Buildroot Mailing List <buildroot@buildroot.org>
Subject: Re: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18
Date: Tue, 22 Mar 2022 18:05:45 +0100 [thread overview]
Message-ID: <20220322170545.GA3355310@scaer> (raw)
In-Reply-To: <CA+h8R2qzrqF-1i9w1T0aCOp5MJCk_fPxPQFC+Uj7CsF9pgc3uA@mail.gmail.com>
On 2022-03-21 22:18 -0700, Christian Stewart spake thusly:
> On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart <christian@paral.in> wrote:
> > The latest Go release, version 1.18, is a significant release, including changes
> > to the language, implementation of the toolchain, runtime, and libraries.
> I should note that this upgrade also will change a lot of the Go
> package hashes...
>
> Due to the way the "go mod vendor" step works, there's some
> incompatibility with the go 1.17 vendor format:
>
> go: inconsistent vendoring in /build/containerd-1.5.9:
> github.com/containerd/containerd: is marked as replaced in
> vendor/modules.txt, but not replaced in go.mod
>
> To ignore the vendor directory, use -mod=readonly or -mod=mod.
> To sync the vendor directory, run:
> go mod vendor
>
> We will need to update the hashes and the archives for these packages.
This is a no-go. We can't change hashes, otherwise there will be a
conflict with the hashes of the backup download we store on
sources.buildroot.org.
Probably, the best solution forward would be to introduce a version
suffix for the post-process. I quickly hacked something around:
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index a15e21e110..74369fc946 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -22,6 +22,7 @@ export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
# download backend:
BR_FMT_VERSION_git = -br1
BR_FMT_VERSION_svn = -br2
+BR_FMT_POST_PROCESS_go = -brgo1
DL_WRAPPER = support/download/dl-wrapper
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 7d1aea7710..e317750967 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -43,7 +43,7 @@ pkgname = $(lastword $(subst /, ,$(pkgdir)))
# Helper to build the extension for a package archive, based on various
# conditions.
# $(1): upper-case package name
-pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD)).tar.gz
+pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD))$(BR_FMT_POST_PROCESS_$($(1)_DOWNLOAD_POST_PROCESS)).tar.gz
# Define extractors for different archive suffixes
INFLATE.bz2 = $(BZCAT)
So, basically, we would need a series that does:
1. introduces the post-process versionning as shown above, and update
the hashes accordingly
2. update go to 1.18, which at the same time updates the newly
introduced post-process versionning, and update the hashes yet
again.
Regards,
Yann E. MORIN.
> Unfortunately I don't know of any way to avoid this, other than
> re-running "go mod vendor" if there's any conflict.
>
> Thanks & best regards,
> Christian Stewart
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2022-03-22 17:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 5:14 [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 Christian Stewart via buildroot
2022-03-22 5:18 ` Christian Stewart via buildroot
2022-03-22 5:38 ` Christian Stewart via buildroot
2022-03-22 5:46 ` Christian Stewart via buildroot
2022-03-22 17:05 ` Yann E. MORIN [this message]
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=20220322170545.GA3355310@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=christian@paral.in \
--cc=thomas.petazzoni@bootlin.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.