From patchwork Mon Sep 28 21:41:02 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: 1372907 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=YsdO21wn; 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 4C0bZ83dQnz9sSJ for ; Tue, 29 Sep 2020 07:41:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 919558669E; Mon, 28 Sep 2020 21:41:34 +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 rmKaQCaEQ2lk; Mon, 28 Sep 2020 21:41:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2F2F286669; Mon, 28 Sep 2020 21:41:24 +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 43D341BF2B0 for ; Mon, 28 Sep 2020 21:41:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2BD2920794 for ; Mon, 28 Sep 2020 21:41:19 +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 d3cPt6K4zXQK for ; Mon, 28 Sep 2020 21:41:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by silver.osuosl.org (Postfix) with ESMTPS id 9A69120774 for ; Mon, 28 Sep 2020 21:41:12 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id e2so2626613wme.1 for ; Mon, 28 Sep 2020 14:41:12 -0700 (PDT) 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=YsdO21wn/2sUpSe27KGGBG68fve+8ZHDUKVC6W4eRkPXQOrpN+wrVJs96RDdSpBgNh nVo7NNXH2FcH8+7c604Ml8Hj20dcP8nAr9uv8Ms6V4s0fI0X96Q/WXzGTknC7epSsFuH 86bW96jVaCm9SbmlAYJ8HLXODenlcYbhscMkQ/TN6ZtGDg6tynnGWGNkEml1oKUgXb8M ikQMmQAdzMXT349XOIr4mpEPsMqhslKgtcda4KqoPCLwCqvbegO09z4qXrG0b+ZoIkgj OTpp8/H3NCnDte/hwz73Ldy8bo6wPDXoGFfe30heZJP/VeVTjza21NuInkOurGQnYOuK reCA== 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=M/Z2UANBa8k9undVU8BSFCIFMxncHTbDCROIWKCVpWGb3apMipKK89B3F8TpxX9/Uh H/DqRDIXX8CO2bIh2v8r1612y3WiyJfkULofNkiz2/lKYuks8MBR6y+kv2ASgNM40I+v ty7CApdtFhvG3czewK06voNXTd5cI88fsfsmIqkhR20vkELBLR5jhcHQ1R/7yhWrWKij IiwG91tlfrgS8s22J4akaUyCnhJJ0y7Inwo8WAwHCxurejj+GkpkYbl8GKjSb49ln3v+ +EUSYx1GHzrRCm8O8GpMnOjp6fCdrqmFoMUhuH7yDKCs75HcuvRQ6F/U2TeRLJG+VXlW FUxg== X-Gm-Message-State: AOAM530ko8rfjCw9oSq7k2QUFLIV2lCPZivNaMSIvcOFtgze81gFG+iV oaHyNS4s5UZh2f2h6uYWtcM0peDdTQ4= X-Google-Smtp-Source: ABdhPJwT9A/VRv4XNKjVHQp6PhHvm9qqcFuSDjVmIXqLYOtxwJkXMH3r44hP4cnfEfsyA09+1VPzJQ== X-Received: by 2002:a05:600c:2742:: with SMTP id 2mr1082815wmw.136.1601329270622; Mon, 28 Sep 2020 14:41:10 -0700 (PDT) Received: from scaer.home ([2a01:cb19:8b51:cb00:5813:e43d:77fe:58e5]) by smtp.gmail.com with ESMTPSA id h76sm2950163wme.10.2020.09.28.14.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 14:41:10 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 28 Sep 2020 23:41:02 +0200 Message-Id: <0b91a78988ff3fe8259d1a75786f566937d334f4.1601329249.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 6/7 RFC] 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"