From patchwork Tue Nov 19 12:18:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1197420 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u+8BuOg1"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47HPxg2qCFz9sR6 for ; Tue, 19 Nov 2019 23:18:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6E757875BF; Tue, 19 Nov 2019 12:18:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fa-J2cGLMKVt; Tue, 19 Nov 2019 12:18:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5636A8757F; Tue, 19 Nov 2019 12:18:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E7BE61BF836 for ; Tue, 19 Nov 2019 12:18:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E08B7858B5 for ; Tue, 19 Nov 2019 12:18:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F-YsF3jxQtuC for ; Tue, 19 Nov 2019 12:18:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 131D1857FB for ; Tue, 19 Nov 2019 12:18:41 +0000 (UTC) Received: by mail-qt1-f171.google.com with SMTP id o49so24326215qta.7 for ; Tue, 19 Nov 2019 04:18:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ru1JghxnI+twWF86RBgbzDqd8bExauhXPWBBGqO+9cY=; b=u+8BuOg11fZIMpx5rbc39/1CM0u5pRU5OCJcLAnseMUe8J2k1l99Pg26iwTJzB5LMv 73usN4YEJ+umZrWInE7Q3PxbavaY8khxARgRTVtWmimAIHUwl972GfpxUgjZiSWmu4Hz 0cb8z+KktVloEG0HCJ38hWxMkkl0Pa4ullLLLixIqoqbkJG7Uf9W6cL1/YBCHpu/cw7K FUQGrFs09EA2AH9TGiv0lLWhLATxSkKRhNA4BP8Wx4Ui3OaoXXnSM2zjEE0FDsl1o8mx oa2cxvTeFscDAyqnPXskqOSgOL6myBpuP61L/Ckz62Q/hsxNEw5ckzOZ6O/ZXpg9mSm/ h8bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ru1JghxnI+twWF86RBgbzDqd8bExauhXPWBBGqO+9cY=; b=HFP5/cj47FARxYDEPpoK0x0XQzCMDJWF54ns36PVvAkddROWw1irtrEWmoow/tc0JE yvMdx57BRe2RtEUslKv6H3XS7Qt/ygow1Xzg0qzADS7djDblBlwwQb5vR2qmKDT+xFYQ d337fushfN0ZJl5g0j/6d9fEUA5l+yMIysF5V6qnlk5wB424PxHcXrT5xfP73ze2Xqmo /Gpi41uuTbT99c1BYG1q/yHylqkL3DL4Gl9PZPQXNNPpj1vF9qZcxjnq3p28iiQ3yF48 VS/+xWRSSNd+8PFNAqkIZUZ0ZXeynGP4uQoVJNM/XAMIzrGsjFOlfUfQE0moign4VdIV cBTQ== X-Gm-Message-State: APjAAAVwCSfWo19QB+VayK3LmsQ1j6SaIvfazEVjHp17+EXTFSGDQgju iwDB7VgGFdM6pddlJDLJgyHUkzlb X-Google-Smtp-Source: APXvYqxkCfgI0BmGEr2gYoBeBso2XVtad1taFDOGIkKdYQ3WjSUllkDKwQHVydCVtB37uvSdEeq6lg== X-Received: by 2002:ac8:7253:: with SMTP id l19mr32971700qtp.363.1574165919667; Tue, 19 Nov 2019 04:18:39 -0800 (PST) Received: from casantos.remote.csb (179.187.67.133.dynamic.adsl.gvt.net.br. [179.187.67.133]) by smtp.gmail.com with ESMTPSA id b135sm9953897qkg.91.2019.11.19.04.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 04:18:38 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Tue, 19 Nov 2019 09:18:31 -0300 Message-Id: <20191119121831.2329-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH v3 next] package/tar: bump target version to 1.32 (host is kept at 1.29) X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luc Creti MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Luc Creti 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 Signed-off-by: Carlos Santos --- Changes v0->v1: - Commit message rewritten based on comment from Yann E. MORIN Changes v1->v2: - Title modified to enphasize that host-tar is kept at 1.29 Changes v2->v3 - 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 - Add missing spaces around '=' - Spell Author name as 'Luc Creti' --- package/tar/tar.hash | 2 +- package/tar/tar.mk | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/tar/tar.hash b/package/tar/tar.hash index 60309bab8f..90beb26094 100644 --- a/package/tar/tar.hash +++ b/package/tar/tar.hash @@ -1,4 +1,4 @@ # 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..e79e26f8c4 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -4,7 +4,12 @@ # ################################################################################ -TAR_VERSION = 1.29 +# host-tar is used to create the archives in the VCS download backends and tar +# 1.30 and forward have changed the archive format. So archives generated with +# earlier versions are not bit-for-bit reproducible and the hashes would not +# match. Hence host-tar must be kept at 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 +36,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