Skip to contentSkip to conversation

package/tar: bump target version to 1.32 (host is kept at 1.29)

PATCH Superseded unixmania at gmail.com 2 participants 3 messages Nov 19, 2019

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/tar: bump target version to 1.32 (host is kept at 1.29)

From: LUC CRETI <[email protected]>

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.

---
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(-)
package/tar/tar.hash +1 -0
index 60309bab8f..c87be596b1 100644
@@ -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
package/tar/tar.mk +5 -4
index 6f609d7a02..87af8073f2 100644
@@ -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
Signature · 1 line
2.18.1
#1 lore raw

PATCH v2 1/1 package/tar: bump target version to 1.32 (host is kept at 1.29)

Hello,

Quoted 1 line · On Mon, 18 Nov 2019 22:16:56 -0300 unixmania at gmail.com wrote:

From: LUC CRETI <[email protected]>

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

package/tar/tar.hash line 2

Quoted 7 lines
package/tar/tar.hash +0 -0
index 60309bab8f..c87be596b1 100644
@@ -1,4 +1,5 @@
 # Locally calculated after checking signature
 sha256	402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024	tar-1.29.tar.xz

This hash is no longer needed I believe.

package/tar/tar.mk line 7

Quoted 13 lines
package/tar/tar.hash +1 -0
+sha256	d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8	tar-1.32.tar.xz
 sha256	9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1	tar-1.29.cpio.gz
 sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
package/tar/tar.mk +1 -1
index 6f609d7a02..87af8073f2 100644
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/tar: bump target version to 1.32 (host is kept at 1.29)

Quoted 10 lines · Thomas Petazzoni

Hello,

Quoted 1 line · On Mon, 18 Nov 2019 22:16:56 -0300 unixmania at gmail.com wrote:

From: LUC CRETI <[email protected]>

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.

Quoted 21 lines

package/tar/tar.hash line 2

Quoted 7 lines
package/tar/tar.hash +0 -0
index 60309bab8f..c87be596b1 100644
@@ -1,4 +1,5 @@
 # Locally calculated after checking signature
 sha256       402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024        tar-1.29.tar.xz

This hash is no longer needed I believe.

Quoted 11 lines
package/tar/tar.hash +1 -0
+sha256       d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8        tar-1.32.tar.xz
 sha256       9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1        tar-1.29.cpio.gz
 sha256       8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903        COPYING
package/tar/tar.mk +0 -0
index 6f609d7a02..87af8073f2 100644
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
Quoted 4 lines

package/tar/tar.mk line 7

Quoted 2 lines
package/tar/tar.mk +1 -1
-TAR_VERSION = 1.29
+HOST_TAR_VERSION=1.29

Spaces around = sign.

Hum, shouldn't check-package detect this?

Quoted 3 lines

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.

Quoted 7 lines

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Signature · 1 line
Carlos Santos <[email protected]>