diff mbox series

[v2,next] package/tar: bump target version to 1.32 (host is kept at 1.29)

Message ID 20191119011656.23740-1-unixmania@gmail.com
State Superseded, archived
Headers show
Series [v2,next] package/tar: bump target version to 1.32 (host is kept at 1.29) | expand

Commit Message

Carlos Santos Nov. 19, 2019, 1:16 a.m. UTC 
From: LUC CRETI <luc.creti@atos.net>

The host tar is used to create the archives in the VCS download backends
(git, cvs, svn, hg...) and tar 1.30 and forward have changed the way
they generate the archives.

So, all the archives that have been generated before 1.30 was released
are not bit-for-bit reproducible (even though the extracted content
would be), so the hashes we have for those archives would not match.

Hence host-tar must be kept at version 1.29.

For the target variant, this is less important, so bump it to the latest
version.

Fixes: https://bugs.busybox.net/show_bug.cgi?id=12256

Signed-off-by: LUC CRETI <luc.creti@atos.net>
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Commit message rewritten based on comment from Yann E. MORIN
---
 package/tar/tar.hash | 1 +
 package/tar/tar.mk   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

Comments

Thomas Petazzoni Nov. 19, 2019, 8:18 a.m. UTC | #1 
Hello,

On Mon, 18 Nov 2019 22:16:56 -0300
unixmania@gmail.com wrote:

> From: LUC CRETI <luc.creti@atos.net>

Would be nicer to have a author name capitalized in a more traditional
way, i.e "Luc Creti"

> diff --git a/package/tar/tar.hash b/package/tar/tar.hash
> index 60309bab8f..c87be596b1 100644
> --- a/package/tar/tar.hash
> +++ b/package/tar/tar.hash
> @@ -1,4 +1,5 @@
>  # Locally calculated after checking signature
>  sha256	402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024	tar-1.29.tar.xz

This hash is no longer needed I believe.

> +sha256	d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8	tar-1.32.tar.xz
>  sha256	9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1	tar-1.29.cpio.gz
>  sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
> diff --git a/package/tar/tar.mk b/package/tar/tar.mk
> index 6f609d7a02..87af8073f2 100644
> --- a/package/tar/tar.mk
> +++ b/package/tar/tar.mk
> @@ -4,7 +4,8 @@
>  #
>  ################################################################################
>  
> -TAR_VERSION = 1.29
> +HOST_TAR_VERSION=1.29

Spaces around = sign.

Maybe we should take this opportunity (or the opportunity of another
commit) to add a comment in the .mk file that explains why the host-tar
package is kept at 1.29 and not bumped to any higher version ?

Best regards,

Thomas
Carlos Santos Nov. 19, 2019, 11:38 a.m. UTC | #2 
On Tue, Nov 19, 2019 at 5:18 AM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello,
>
> On Mon, 18 Nov 2019 22:16:56 -0300
> unixmania@gmail.com wrote:
>
> > From: LUC CRETI <luc.creti@atos.net>
>
> Would be nicer to have a author name capitalized in a more traditional
> way, i.e "Luc Creti"

I left leave the name as it was in the original patch, since I don't
know the author and maybe he prefers his name written that way. There
are other caes, e.g. Yann E. MORIN.

> > diff --git a/package/tar/tar.hash b/package/tar/tar.hash
> > index 60309bab8f..c87be596b1 100644
> > --- a/package/tar/tar.hash
> > +++ b/package/tar/tar.hash
> > @@ -1,4 +1,5 @@
> >  # Locally calculated after checking signature
> >  sha256       402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024        tar-1.29.tar.xz
>
> This hash is no longer needed I believe.
>
> > +sha256       d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8        tar-1.32.tar.xz
> >  sha256       9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1        tar-1.29.cpio.gz
> >  sha256       8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903        COPYING
> > diff --git a/package/tar/tar.mk b/package/tar/tar.mk
> > index 6f609d7a02..87af8073f2 100644
> > --- a/package/tar/tar.mk
> > +++ b/package/tar/tar.mk
> > @@ -4,7 +4,8 @@
> >  #
> >  ################################################################################
> >
> > -TAR_VERSION = 1.29
> > +HOST_TAR_VERSION=1.29
>
> Spaces around = sign.

Hum, shouldn't check-package detect this?

> Maybe we should take this opportunity (or the opportunity of another
> commit) to add a comment in the .mk file that explains why the host-tar
> package is kept at 1.29 and not bumped to any higher version ?

Sure, I will add the comment.

> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
diff mbox series

Patch

diff --git a/package/tar/tar.hash b/package/tar/tar.hash
index 60309bab8f..c87be596b1 100644
--- a/package/tar/tar.hash
+++ b/package/tar/tar.hash
@@ -1,4 +1,5 @@ 
 # Locally calculated after checking signature
 sha256	402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024	tar-1.29.tar.xz
+sha256	d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8	tar-1.32.tar.xz
 sha256	9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1	tar-1.29.cpio.gz
 sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index 6f609d7a02..87af8073f2 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -4,7 +4,8 @@ 
 #
 ################################################################################
 
-TAR_VERSION = 1.29
+HOST_TAR_VERSION=1.29
+TAR_VERSION = 1.32
 TAR_SOURCE = tar-$(TAR_VERSION).tar.xz
 TAR_SITE = $(BR2_GNU_MIRROR)/tar
 # busybox installs in /bin, so we need tar to install as well in /bin
@@ -31,13 +32,13 @@  $(eval $(autotools-package))
 
 # host-tar: use cpio.gz instead of tar.gz to prevent chicken-egg problem
 # of needing tar to build tar.
-HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz
+HOST_TAR_SOURCE = tar-$(HOST_TAR_VERSION).cpio.gz
 define HOST_TAR_EXTRACT_CMDS
 	mkdir -p $(@D)
 	cd $(@D) && \
 		$(call suitable-extractor,$(HOST_TAR_SOURCE)) $(TAR_DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i --preserve-modification-time
-	mv $(@D)/tar-$(TAR_VERSION)/* $(@D)
-	rmdir $(@D)/tar-$(TAR_VERSION)
+	mv $(@D)/tar-$(HOST_TAR_VERSION)/* $(@D)
+	rmdir $(@D)/tar-$(HOST_TAR_VERSION)
 endef
 
 HOST_TAR_CONF_OPTS = --without-selinux