[Buildroot] [PATCH 1/1] support/dependencies: bump minimal tar version to 1.35
Arnout Vandecappelle
arnout at mind.be
Mon Oct 23 07:45:06 UTC 2023
On 21/10/2023 22:36, Yann E. MORIN wrote:
> Vincent, Arnout, All,
>
> On 2023-10-21 22:25 +0200, Yann E. MORIN spake thusly:
>> On 2023-10-18 19:43 +0200, Arnout Vandecappelle via buildroot spake thusly:
>>> On 18/10/2023 16:11, Vincent Fazio wrote:
>>>> GNU tar 1.35 includes a breaking change [0] that changes the tar header
>>>> created for each regular file even for "stable" formats like pax (which
>>>> we use in support/download/helpers::mk_tar_gz).
> [--SNIP--]
>>>> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
>>>> index e5cd83d859..d33eb2d811 100644
>>>> --- a/package/pkg-download.mk
>>>> +++ b/package/pkg-download.mk
>>>> @@ -20,8 +20,8 @@ export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
>>>> # Version of the format of the archives we generate in the corresponding
>>>> # download backend:
>>>> -BR_FMT_VERSION_git = -br1
>>>> -BR_FMT_VERSION_svn = -br3
>>>> +BR_FMT_VERSION_git = -br2
>>>> +BR_FMT_VERSION_svn = -br4
>>> Vendored cargo and go packages will have the same issue, no? Those will
>>> need to be updated as well...
>> Good catch, indeed. I'll try and resurect my patch to add a -br suffix
>> to those...
>
> I think it was basically just that:
>
> b/package/pkg-download.mk | 1 1 0 0 +
> b/package/pkg-utils.mk | 2 1 1 0 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index e5cd83d859..5ad3f2baaf 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 = -br3
> +BR_FMT_VERSION_cargo = -cargo1
>
> DL_WRAPPER = support/download/dl-wrapper
>
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> index 7c670ee615..95a8452db8 100644
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -48,7 +48,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_VERSION_$($(1)_DOWNLOAD_POST_PROCESS)).tar.gz
When POST_PROCESS is used, the SITE_METHOD is not actually relevant (we don't
actually make a tarball of the git, or at least we don't hash it). So maybe:
pkg_source_ext = $(or
$(BR_FMT_VERSION_$($(1)_DOWNLOAD_POST_PROCESS)),$(BR_FMT_VERSION_$($(1)_SITE_METHOD))).tar.gz
Then we an also make BR_FMT_VERSION_cargo = -br4 (not -br1 or -br3 to avoid
conflict with already existing git or svn based tarballs).
Regards,
Arnout
>
> # Define extractors for different archive suffixes
> INFLATE.bz2 = $(BZCAT)
>
> Toally untested.
>
> Regards,
> Yann E. MORIN.
>
More information about the buildroot
mailing list