From patchwork Thu Nov 19 21:23:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1403278 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=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=INjlnVqN; 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 4CcXkR3rFSz9sTR for ; Fri, 20 Nov 2020 08:24:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DF8DC84EED; Thu, 19 Nov 2020 21:24:29 +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 cevxi1clYUs3; Thu, 19 Nov 2020 21:24:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D6EA886F95; Thu, 19 Nov 2020 21:24:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8AF9A1BF32B for ; Thu, 19 Nov 2020 21:24:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7C58A27A60 for ; Thu, 19 Nov 2020 21:24:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GaiAazCjO1Jt for ; Thu, 19 Nov 2020 21:24:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by silver.osuosl.org (Postfix) with ESMTPS id 698CE2754C for ; Thu, 19 Nov 2020 21:23:59 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id s8so7899113wrw.10 for ; Thu, 19 Nov 2020 13:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eWzESuDI7OjCGuJi62GCWAgcnVtAk/tw/47jgFdLge4=; b=INjlnVqNKft822/c6aPIdG3NGJkK//7hX9zpo9mKtTHo60j1KZ9q0B9GlRdIugZhmX K2G4Mwy/01MJA9W7QSIsp4X7yjeITQdZzinFRTc6gOyQNO+Uw8UAi9RpQsWi1YLtiXLG XkxcFm9I+BuWZRXEIpJ97MeIMNLOJoSxxQ/XUScCZY5e7gUCV7Nt+gjYhIM+5FmiTlD1 2mUHzzgmS/CmMseiwuGRSmaCEqHd7k9482Axx9BahxI7XRE1wOhq/1ZY+O+D3/Qgch35 YcyW7fIfGtvpYKp2RDlQIXXY8Wvcfz55hPMsiT6fYye1RX/d+NQAhFNs8bB+3lftZriE 2wUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eWzESuDI7OjCGuJi62GCWAgcnVtAk/tw/47jgFdLge4=; b=T39DYiovV/uaDjgvcOVdd7I6UNNGhyK4UaUs1dGpA4GoITBMkIhMqZ6TS8gcw5fiWj 127Hzs9PJHDDGXTc3foer6mNSMNzFDNkrxkNcg7fJNvTVWvWFV4XlkMhWvtOcZ5gqY5+ D3XPhbTPe1/MurtWxZ1YMQRYGi61Svqd3FCFcquS4TEyrjxLV8MIkHSSm3nP4xyCKs90 LWn1lpZ9h6+bSH3zlIT2sOZG1jMnGAZ2aGGIZk9PU9kbRg60RTke7CGVHzJFaGkYKp/X a9tks3Cnj7BxU6nnMzOR+PCwUkIeUc/thrbKohvm4vYQemo9RQ8KtRcDK1yoJNzifl2R Zdhg== X-Gm-Message-State: AOAM533dSRUKqmLFvp3IrmdsJeskvp9P5Wzg6QDMvx2tVGRyBMkSOPUQ KNYbiqYECZrperD1IuarxjKeveAmV3U= X-Google-Smtp-Source: ABdhPJxzLXjMJ5dr/hkECGnC6bNx3FkEc+EsMQuAJC/ZuD7kbY2O9Il7lPeMG8tTc9HWDDb2v1OnaQ== X-Received: by 2002:adf:e4d1:: with SMTP id v17mr1030588wrm.325.1605821037669; Thu, 19 Nov 2020 13:23:57 -0800 (PST) Received: from scaer.home ([2a01:cb19:8b51:cb00:b94c:b327:ef3f:e064]) by smtp.gmail.com with ESMTPSA id l16sm1935392wrx.5.2020.11.19.13.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 13:23:57 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Thu, 19 Nov 2020 22:23:49 +0100 Message-Id: <999da6d23d25a51db60924c9fbfc5324f38c129e.1605821010.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/7] support/download: change format of archives generated from svn 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: "Yann E. MORIN" , Vincent Fazio Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Like we recently did for git, switch the archives generated from subversion to be reproducible whatever the tar version. This implies changing the compression to xz (and the extension accordingly). We have no in-tree users of the svn backend, that also has hashes. Signed-off-by: Yann E. MORIN Cc: Vincent Fazio --- package/pkg-generic.mk | 2 +- support/download/svn | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 115115a345..af259766ab 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -564,7 +564,7 @@ ifndef $(2)_DL_OPTS endif endif -ifneq ($$(filter git,$$($(2)_SITE_METHOD)),) +ifneq ($$(filter git svn,$$($(2)_SITE_METHOD)),) $(2)_SOURCE_EXT = .tar.xz else $(2)_SOURCE_EXT = .tar.gz diff --git a/support/download/svn b/support/download/svn index 012f286dd9..42307eb236 100755 --- a/support/download/svn +++ b/support/download/svn @@ -52,12 +52,16 @@ find "${basename}" -not -type d \ -and -not -path "./.svn/*" >"${output}.list" LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" -# Create GNU-format tarballs, since that's the format of the tarballs on -# sources.buildroot.org and used in the *.hash files +pax_options="delete=atime,delete=ctime,delete=mtime" +pax_options+=",exthdr.name=%d/PaxHeaders/%f,exthdr.mtime={${date}}" + +# Create POSIX tarballs, since that's the format the most reproducible tar cf - --transform="s#^\./#${basename}/#" \ - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ + --numeric-owner --owner=0 --group=0 --mtime="${date}" \ + --format=posix \ + --pax-option="${pax_options}" \ -T "${output}.list.sorted" >"${output}.tar" -gzip -6 -n <"${output}.tar" >"${output}" +xz -9 <"${output}.tar" >"${output}" rm -f "${output}.list" rm -f "${output}.list.sorted"