From patchwork Tue Sep 1 20:41:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 23859 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 495FE27BBE7; Tue, 1 Sep 2020 21:43:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E61EB168AD for ; Tue, 1 Sep 2020 21:43:08 +0100 (BST) Received: from localhost ([::1]:40724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDD7U-0005HN-4E for patchwork@mira.cbaines.net; Tue, 01 Sep 2020 16:43:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDD7O-0005HE-VW for guix-patches@gnu.org; Tue, 01 Sep 2020 16:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDD7O-0006Uy-Mp for guix-patches@gnu.org; Tue, 01 Sep 2020 16:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDD7O-0002jj-Jb for guix-patches@gnu.org; Tue, 01 Sep 2020 16:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43160] [PATCH 1/2] gnu: make-linux-libre-source: Set output port buffering to line mode. References: <20200901203859.4695-1-maxim.cournoyer@gmail.com> In-Reply-To: <20200901203859.4695-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Sep 2020 20:43: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.159899293510460 (code B ref 43160); Tue, 01 Sep 2020 20:43:02 +0000 Received: (at 43160) by debbugs.gnu.org; 1 Sep 2020 20:42:15 +0000 Received: from localhost ([127.0.0.1]:57480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDD6d-0002ie-Ag for submit@debbugs.gnu.org; Tue, 01 Sep 2020 16:42:15 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:37267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDD6X-0002iE-13 for 43160@debbugs.gnu.org; Tue, 01 Sep 2020 16:42:13 -0400 Received: by mail-qk1-f194.google.com with SMTP id b14so2325884qkn.4 for <43160@debbugs.gnu.org>; Tue, 01 Sep 2020 13:42:08 -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:mime-version :content-transfer-encoding; bh=t3mkNNcjVZVcQwafZjWs344oZV3SUeAbAK+jz+lncak=; b=l2DOcIMUP4/ApqrV3M2vPrflRxPDSbcXV0BPP4o1zdiCyoWSpxyY3T+Axx56G1eZ2u gfnY1jckIpLzBSB1gYi2qfDVFxki07kHPcCnkAKfigJliU2J9GKEe/g5adEJVfTG4MVx r8hNBudTptRsWXi0lt+qpzVB16psIPhXjCfxakDBzXi6cdqg5OML/neJ/StNxU3pl7oK twuLYy9p4MN0xn0Y6ZsnZfH0AvlWcXbwVFRUFVqSIIpO/EZ3+7hm04Vo8BSZwQZtLLIx 3fHpJgLy878uGa4Lgs0s5MPcZxZFbR/qab6juVdE94kvYdC8jlCgpErtw9wCYdQCPnMB V/ow== 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:mime-version :content-transfer-encoding; bh=t3mkNNcjVZVcQwafZjWs344oZV3SUeAbAK+jz+lncak=; b=eeevJg1eQsSXJGqcchchx9PJmbVFmaUqJ99whOzonHpXRmSxF5lbQpLt1v7NxiYPpQ fhImhBCf0r42Apm6VaQRtJs+cVGfG+o9ZtQ8CNYoqV/vjXp2QO1iQ8rs0dYHPnSdwChk wmcoB7paUxhTN94xBq2RbGvToM49Ng2taoNQj3W6xdKEIdfOV2H4UJc/lSy+UFv7Whoq KSvnTFbp9DcOoUjZUlv0f9yyP46WdrynEExjxhN0iBFo37De9Qu37a2x4bZdR0M1IFjc sPA7nciw3DxlvDfIqFzRiwDg4cZ6J5v2hUyEuZpsFRsgrxPArmiUXlJh1o+FTAb1vlaG Iolg== X-Gm-Message-State: AOAM532t6A106NS+4DGN3CQRdh/DPvWQPRMmPLSRWbtfpi3QI4W5YE6k FoEZFPkrihOia+arhmuokUwLAOdixpv2Qg== X-Google-Smtp-Source: ABdhPJy/vfJ+WqI1fRadU5fXzLT/PsSKgG2tfy0vL425RsS1TIYkXWGf5CMlFWgqAteu/Zscbc/tyw== X-Received: by 2002:a05:620a:48:: with SMTP id t8mr3793630qkt.474.1598992923008; Tue, 01 Sep 2020 13:42:03 -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.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 13:42:02 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 1 Sep 2020 16:41:51 -0400 Message-Id: <20200901204152.4802-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (make-linux-libre-source): Set output port buffering to line mode via setvbuf. Remove the ad-hoc calls to force-output. --- gnu/packages/linux.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e9bfca25af..9507178fb6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -279,6 +279,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (srfi srfi-1) (ice-9 match) (ice-9 ftw)) + + (setvbuf (current-output-port) 'line) + (let ((dir (string-append "linux-" #$version))) (mkdir "/tmp/bin") @@ -315,12 +318,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (if (file-is-directory? #+upstream-source) (begin (format #t "Copying upstream linux source...~%") - (force-output) (invoke "cp" "--archive" #+upstream-source dir) (invoke "chmod" "--recursive" "u+w" dir)) (begin (format #t "Unpacking upstream linux tarball...~%") - (force-output) (invoke "tar" "xf" #$upstream-source) (match (scandir "." (lambda (name) @@ -335,11 +336,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (with-directory-excursion dir (setenv "PYTHON" (which "python")) (format #t "Running deblob script...~%") - (force-output) (invoke "/tmp/bin/deblob")) (format #t "~%Packing new Linux-libre tarball...~%") - (force-output) (invoke "tar" "cvfa" #$output ;; Avoid non-determinism in the archive. "--mtime=@0" From patchwork Tue Sep 1 20:41:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 23860 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7F22527BBE7; Tue, 1 Sep 2020 21:45:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1EE42168AD for ; Tue, 1 Sep 2020 21:45:11 +0100 (BST) Received: from localhost ([::1]:41494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDD9S-0005hJ-8c for patchwork@mira.cbaines.net; Tue, 01 Sep 2020 16:45:10 -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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)))))))))) ;;;