From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id OIHcANmyTl82LQAA0tVLHw (envelope-from ) for ; Tue, 01 Sep 2020 20:45:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id RmdFONiyTl9cYAAA1q6Kng (envelope-from ) for ; Tue, 01 Sep 2020 20:45:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8D4F29403EC for ; Tue, 1 Sep 2020 20:45:12 +0000 (UTC) Received: from localhost ([::1]:41494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDD9T-0005hJ-Cc for larch@yhetil.org; Tue, 01 Sep 2020 16:45:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDD9L-0005gL-1r for guix-patches@gnu.org; Tue, 01 Sep 2020 16:45:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDD9K-0006jV-PO for guix-patches@gnu.org; Tue, 01 Sep 2020 16:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDD9K-0002nd-Nz for guix-patches@gnu.org; Tue, 01 Sep 2020 16:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43160] [PATCH 2/2] gnu: linux-libre: Validate that the cleaned up tarball is free of blobs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Sep 2020 20:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43160@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 43160-submit@debbugs.gnu.org id=B43160.159899307010674 (code B ref 43160); Tue, 01 Sep 2020 20:45:02 +0000 Received: (at 43160) by debbugs.gnu.org; 1 Sep 2020 20:44:30 +0000 Received: from localhost ([127.0.0.1]:57484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDD8n-0002m5-OY for submit@debbugs.gnu.org; Tue, 01 Sep 2020 16:44:30 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:36722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDD8m-0002ls-6x for 43160@debbugs.gnu.org; Tue, 01 Sep 2020 16:44:28 -0400 Received: by mail-qk1-f196.google.com with SMTP id f2so2338705qkh.3 for <43160@debbugs.gnu.org>; Tue, 01 Sep 2020 13:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eTeY0nM6CHr7KqlYh7NRh3Rr1F4RBnkBJ5cwLs2L/LQ=; b=uEmpu1o4dnA+MPo3SgzEL34p6OgOK35sTM51ZUnbbppGenzTHkrfpZuOKTQGoo2C6P ECiLpn2LuJ/qUp8HLoxHWqlYfFw8/SH9tf0Z5TzbB/oTg2BnMIKhBkvDoywGs+3YeEzS hnkwOau0vd7IiqNk+TTwxbVHU2cfVic6deu/HXJckdZPpQYeFyjGQ58pu+ypffWULArC Sw9u5/EhrvBfgETJPEa4J2gMMqAxRt//xXMQW2BzKy5WRTZ1opv2nVjRcu8pOMbwZuDw 6FW2MYxbdMvcyZYMHHJbGZrkQThEzw43g9D4SRP2Spj46/+xAIUsV/eFyre993+TuFin YnoA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=eTeY0nM6CHr7KqlYh7NRh3Rr1F4RBnkBJ5cwLs2L/LQ=; b=oxuOAowhmOfIZ9J6feNY5wDrSfU0tJ1aBa70+40u7E5plo7M9+QUvVkO88Kb4uM7IG 5USR5roMmOy8kNjgQIZeiuKibBld72HFBrzbAAM38hlsOtnMogE0aqxk1oG2rf9ypCs3 Wq9nNq52uPu/UEGFgiDwcdkyi10EuNBQz9twGkEYCye+QaSLrLQAGRjuF85tqqdCDnR8 feMwhnK4CMo+WCPu+1htnuG1hcSxBQl27vXkOeQQKiylf5Z55GxcNukO2E7BkA/zYJBP cYfhoBD43I6ti+jPDX4dN6F5OyR/pPUCxw0qln5gxjw6cem6w9rnD06tiyzCcOchyCcC VoXA== X-Gm-Message-State: AOAM533yddthycZ3oN7yPkHgYOmnlZFuKwCvI7Vdp0CWgJH6Nwy8y5t9 /5FYmEXcL2rL9Q/xxx2JZTKk5deoWujUEw== X-Google-Smtp-Source: ABdhPJy2f4J+IpLbqhDUJWDLS8I2UylF+vMgCIih8mDLM4tcecNb74Zv9ZBDfs+usyVaKrnYVs21yw== X-Received: by 2002:a05:620a:1085:: with SMTP id g5mr3751826qkk.32.1598993062332; Tue, 01 Sep 2020 13:44:22 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-254.b2b2c.ca. [72.10.133.254]) by smtp.gmail.com with ESMTPSA id g4sm2681820qtp.89.2020.09.01.13.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 13:44:21 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 1 Sep 2020 16:41:52 -0400 Message-Id: <20200901204152.4802-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200901204152.4802-1-maxim.cournoyer@gmail.com> References: <20200901204152.4802-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=yes Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=gmail.com header.s=20161025 header.b=uEmpu1o4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: wY9LpMTwgPaV * gnu/packages/linux.scm (make-linux-libre-source): Call the deblob-check script on the generated tarball archive with the --use-awk and --list-blobs options. --- gnu/packages/linux.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9507178fb6..cd9c3a18fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Anders Thuné +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -346,7 +348,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "--group=root:0" "--sort=name" "--hard-dereference" - dir)))))))))) + dir) + + (format #t "~%Validating the generated tarball...~%") + (invoke "/tmp/bin/deblob-check" "--use-awk" "--list-blobs" + #$output)))))))))) ;;; -- 2.27.0