From patchwork Wed Sep 2 12:56:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 23864 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 B6AD927BBE8; Wed, 2 Sep 2020 13:58:10 +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 7CB1127BBE7 for ; Wed, 2 Sep 2020 13:58:10 +0100 (BST) Received: from localhost ([::1]:41264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSL3-0003xz-Hi for patchwork@mira.cbaines.net; Wed, 02 Sep 2020 08:58:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSKw-0003tW-ER for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDSKw-0006sh-4T for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDSKw-0005h9-49 for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43160] [PATCH v2 1/4] gnu: linux-libre: Use Python 3 in make-linux-libre-source. 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: Wed, 02 Sep 2020 12:58: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.159905145421835 (code B ref 43160); Wed, 02 Sep 2020 12:58:02 +0000 Received: (at 43160) by debbugs.gnu.org; 2 Sep 2020 12:57:34 +0000 Received: from localhost ([127.0.0.1]:58625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKU-0005fz-7r for submit@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:34 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:33237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKR-0005fd-Mu for 43160@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:32 -0400 Received: by mail-qk1-f176.google.com with SMTP id p4so4189496qkf.0 for <43160@debbugs.gnu.org>; Wed, 02 Sep 2020 05:57:31 -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=XAPyFqDOD7yG2j14fM/LDQHFcpQfsvT52QyQy3AteNY=; b=JKJXoY/OUoaffUj2h/S+WI9BaQPGFLJ+JUYg4gmqZuCO36G5zMsF73lnTe5r7vFdIr jhjtRswxb0qSrjwSQnGrJMHSKB2raVx92Kpg+o6Fo+GpbRa/X2yiKc8LSKyrxX354D8r ctvVZ5zq7VOtPUytHsDFE4NVNoi2zI/DalS2Zdwl+uK2PvuHPViGkFtOnTtWCwDqQIw9 uT8DzSGNXDdPN1XSdVcb9zHQlUok/J/VjgraWcQLburJJ8vPaB3af6v36F9C7FVrHkQw +xaE25V5zmuTeyMbc8nGJNCFykrKf9SlBasHZo5CG6Bx0ObfNXXBfC61ybqYAPusKL/T BZ3Q== 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=XAPyFqDOD7yG2j14fM/LDQHFcpQfsvT52QyQy3AteNY=; b=uBibHvirYE08GKOHaJ4VYcup/Mvsxg3sGZhu4YnulMcHnSPNm+t7VKWppLYKb7kIb4 qSFYBnC1lWiDdz2TbIlEnO2AY2V4n9At7krl3vmqdCExJQJcbagGQo62Y2veqBxSobZR JYZW6bYc6/z87GBZR3RR+vRJOPJhLccO1e3BpB8h6+OSnAVDq7WewFac+Ny9bKb++JiO 6zSus73wLrfR4S0CZjT60Aa0DLCotzZCxMMlpow6YjYuMHtSf+O080n3yPSkaZ7orFH2 KNg53CIGUXNDN8EaKN0MnAyApthucBcC4M5Nf97eDTIN/QaL6ESmU17Qwcp2ITVuj8XS tTTA== X-Gm-Message-State: AOAM533LJf9sDqm1CTqDua8bGQnHc9d3Nhbwz9QxVDDbVO4s/LBrcniU 2zsY/BOvurz3PLZNX6F/5bekTwiFnWhfaQ== X-Google-Smtp-Source: ABdhPJx5TloxkTBOdQX5zVgVUvAbzp6/CBYSTUNWJuaO+woASqn9Wjnzlj3gdjmG9SXlfOCS0IYhgg== X-Received: by 2002:a05:620a:141a:: with SMTP id d26mr6652059qkj.217.1599051445849; Wed, 02 Sep 2020 05:57:25 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-254.b2b2c.ca. [72.10.133.254]) by smtp.gmail.com with ESMTPSA id x6sm4712553qke.54.2020.09.02.05.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 05:57:24 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 2 Sep 2020 08:56:40 -0400 Message-Id: <20200902125643.27201-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 Successfully tested with all of the linux-libre versions we carry in Guix: 4.4.234, 4.9.234, 4.14.195, 4.19.142, 5.4.61 and 5.8.5. * gnu/packages/linux.scm (make-linux-libre-source): Replace python-2 by python-wrapper. Do not set the PYTHON environment variable, which is not required when using python-wrapper. --- gnu/packages/linux.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d3b3f4de9c..8edbe4e7e4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -296,11 +296,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." #+(canonical-package bzip2) #+(canonical-package gzip) #+(canonical-package tar) - ;; The comments in the 'deblob-check' script - ;; claim that it supports Python 2 and 3, but - ;; in fact it fails when run in Python 3 as - ;; of version 5.1.3. - #+python-2)) + #+python-wrapper)) (with-directory-excursion "/tmp/bin" @@ -337,7 +333,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (error "multiple directories found" dirs))))) (with-directory-excursion dir - (setenv "PYTHON" (which "python")) (format #t "Running deblob script...~%") (force-output) (invoke "/tmp/bin/deblob")) From patchwork Wed Sep 2 12:56:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 23865 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 2543727BBE8; Wed, 2 Sep 2020 13:58:12 +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 74B9D27BBE7 for ; Wed, 2 Sep 2020 13:58:11 +0100 (BST) Received: from localhost ([::1]:41332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSL4-00040w-K3 for patchwork@mira.cbaines.net; Wed, 02 Sep 2020 08:58:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSKw-0003vC-VT for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDSKw-0006sp-LR for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDSKw-0005hH-Hv for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43160] [PATCH v2 2/4] gnu: make-linux-libre-source: Set output port buffering to line mode. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 12:58: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.159905145521845 (code B ref 43160); Wed, 02 Sep 2020 12:58:02 +0000 Received: (at 43160) by debbugs.gnu.org; 2 Sep 2020 12:57:35 +0000 Received: from localhost ([127.0.0.1]:58628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKU-0005g7-Id for submit@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:34 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:32803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKS-0005ff-Dd for 43160@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:33 -0400 Received: by mail-qk1-f195.google.com with SMTP id p4so4189535qkf.0 for <43160@debbugs.gnu.org>; Wed, 02 Sep 2020 05:57:32 -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=ewHS0xlJAVa09tfUmlNl6YSVI0wEpLUI0mQUZvNxeWU=; b=Ng015Gdlz0s7negaMIFxJVyW9RAWAGH8Gm4GKp0DTqbcr/xnabv+3j7k2NGdqByZrb cdFLle95H3EIiH25iRhVaNowzEkS/hxJxam6UlgtXtVGiewEQyo785AUP8ysbmeM5bQN /aKxQkHZx6uwkzO3e1C0V18fAATAF6zeB7x4JGf9+lf/SSTodZpEAPIlPZ9+srK0Jw5v RBozXRWGkOd0QQ9swTjaa1+/Yi8mOeepYccWaFcMQtP19C69Pa419iJw0wS+TEZXMWVn HP26r0EbfO3wXtIbIMBRzQXOm5hjY+ctzE5/gbsD+OUOlVVvJTxnKvRKLSxIEIPD4wBd 5cRA== 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=ewHS0xlJAVa09tfUmlNl6YSVI0wEpLUI0mQUZvNxeWU=; b=kr5Q3CVzGKDvAR36hbqmB1sziJuen/ztYsS/QhX7ukPX9hVasjyvNlZXtX01NTsJWs rfc28nsR9yO5HBRqvdx8P9y09ROwh/ESPY3C0+fmN5F4UxoPAug7bDWmqwxRMz8qwaZD hMqHBQEkL/9ERVNqf6g5cdLJgbXhOeVQ6HD/cvlU5XphREhMDuMvrMtOw2wdvaY31fFM uVKt7zITJBQXlj2BAXjpctYdJ6QG1TRrRjIh+zKP4SXYtiaFMPy9yBdYnt0PV+XHBOm+ 0KLWWSQHorMtquLlHj4hocOClZLW7jocIEHuAHqLGakuCDCVs/VOgZLQrfesbi5TCIVB 5UUg== X-Gm-Message-State: AOAM531VxtKRd/h0fvCqRC1D7sY5ZlMQpIgL9Sr3XRG5SGD3p+BQGgJY dU6DEZgqpDpiSJVMN+d47yp3ct7o6kwVRA== X-Google-Smtp-Source: ABdhPJxx9DEeFPdhw/GPJ3XMU6lEqoFmyvgIDqGOUkSxK0Fb/FNPpJpOXfADx9J2H203aL2fEeUxtg== X-Received: by 2002:a37:6481:: with SMTP id y123mr6801232qkb.464.1599051446696; Wed, 02 Sep 2020 05:57:26 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-254.b2b2c.ca. [72.10.133.254]) by smtp.gmail.com with ESMTPSA id x6sm4712553qke.54.2020.09.02.05.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 05:57:26 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 2 Sep 2020 08:56:41 -0400 Message-Id: <20200902125643.27201-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200902125643.27201-1-maxim.cournoyer@gmail.com> References: <20200902125643.27201-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): 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 8edbe4e7e4..1b923f0c0a 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) @@ -334,11 +335,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (with-directory-excursion dir (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 Wed Sep 2 12:56:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 23867 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 B778927BBE8; Wed, 2 Sep 2020 13:58:42 +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 7323327BBE7 for ; Wed, 2 Sep 2020 13:58:42 +0100 (BST) Received: from localhost ([::1]:44182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSLZ-0005Nx-MX for patchwork@mira.cbaines.net; Wed, 02 Sep 2020 08:58:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSKx-0003w0-8P for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDSKw-0006sv-Un for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDSKw-0005hO-Ui for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43160] [PATCH v2 3/4] 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: Wed, 02 Sep 2020 12:58: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.159905145521853 (code B ref 43160); Wed, 02 Sep 2020 12:58:02 +0000 Received: (at 43160) by debbugs.gnu.org; 2 Sep 2020 12:57:35 +0000 Received: from localhost ([127.0.0.1]:58630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKU-0005gG-W0 for submit@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:35 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:32805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKT-0005fh-9l for 43160@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:34 -0400 Received: by mail-qk1-f196.google.com with SMTP id p4so4189582qkf.0 for <43160@debbugs.gnu.org>; Wed, 02 Sep 2020 05:57:33 -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=iqcYTgmCDczmSBP6e7yXP0c4RIybBrQzuVkQdoBZUOw=; b=V00Uo4iB0z2wZtvJw452Nynm0om/aWfXlmgYBBO5+0gLNgUo9eIfibM4ZEUo/0RsuP txQglYSi53uQkeC0iI5uJCBJV/Td5VTZ9ruGgrjgyIjGt+TNl/q/Pcw/KPGfZ/tUlK3C eq3YYFUCjfAjbLeKXdE4STZgFS27K1T6ZLccplOKj6O4Y2mKyNS0OoZC3r13068xctsX ZPSaYg7R96ftWqSb3UOMdABqQf1fhMfATyP9CpdstBtwqxGSgLNYuvj3n5unbx5g1fhM IEg92LRlNk9aTOmLZvbC9eFb6FHXfUTGR+bx18LX5RKxcyfHpklFFed4Yabu0FkJXpeI OcOg== 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=iqcYTgmCDczmSBP6e7yXP0c4RIybBrQzuVkQdoBZUOw=; b=PcxAe3qPWh/B57ECapJa1KC8oaJqcRA44mPZsEOJT4dqvuWNn5ha5ra6lTVw2gWgMj xuOee1UsJVlYZHRZkPQnVQvU6cp3u1tJbF4FTNYLNHN/vx30QA4G4PceISUSh4bePiSc 2v7VlArex4wRWRcOokVyOGfcEUyXm7y+6AHb3lGfQLrpTQaPLxRwzWv5r36cbOzXBaPU 5EDcQPTGAExDidh1HLKbpxaGcV1Z3w2nd6/7heeg7GJzOGgHjd4mjf7cGCz1AvYc+LTf /4buo60ejnVA5lOog+eZIMOyC+tJ9FC7YC7edEATxre6sJlSS66pI96yC8WnRLTOFHAj ygCA== X-Gm-Message-State: AOAM531XFhEEX1wD/+nLBGey7lQulaFRvBh+MP9zwYv/v944wz2tNvXh 0c+6NIOYytGHAdVd/2r67hzhFoIlAGMWGg== X-Google-Smtp-Source: ABdhPJyz948oGb66aP+kzIEZ8cYGuwrPvOfh05zwxnkvYTXrkG+8wqU+UTXRndVozuQoT3tLTU3X+Q== X-Received: by 2002:a37:814:: with SMTP id 20mr847853qki.142.1599051447592; Wed, 02 Sep 2020 05:57:27 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-254.b2b2c.ca. [72.10.133.254]) by smtp.gmail.com with ESMTPSA id x6sm4712553qke.54.2020.09.02.05.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 05:57:26 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 2 Sep 2020 08:56:42 -0400 Message-Id: <20200902125643.27201-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200902125643.27201-1-maxim.cournoyer@gmail.com> References: <20200902125643.27201-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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1b923f0c0a..e177386312 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) @@ -299,6 +301,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." #+(canonical-package bzip2) #+(canonical-package gzip) #+(canonical-package tar) + #+(canonical-package gawk) #+python-wrapper)) (with-directory-excursion "/tmp/bin" @@ -345,7 +348,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "--group=root:0" "--sort=name" "--hard-dereference" - dir)))))))))) + dir) + + (format #t "~%Scanning the generated tarball for blobs...~%") + (invoke "/tmp/bin/deblob-check" "--use-awk" "--list-blobs" + #$output)))))))))) ;;; From patchwork Wed Sep 2 12:56:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 23866 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 14BBB27BBE8; Wed, 2 Sep 2020 13:58:18 +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 66AB027BBE7 for ; Wed, 2 Sep 2020 13:58:17 +0100 (BST) Received: from localhost ([::1]:42068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSLA-0004Lw-Il for patchwork@mira.cbaines.net; Wed, 02 Sep 2020 08:58:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSKx-0003wu-Lh for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDSKx-0006sz-By for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDSKx-0005hW-Bi for guix-patches@gnu.org; Wed, 02 Sep 2020 08:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43160] [PATCH v2 4/4] gnu: linux-libre: Compare generated sources against Linux-libre releases. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 12:58:03 +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.159905145621862 (code B ref 43160); Wed, 02 Sep 2020 12:58:03 +0000 Received: (at 43160) by debbugs.gnu.org; 2 Sep 2020 12:57:36 +0000 Received: from localhost ([127.0.0.1]:58632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKW-0005gX-Bl for submit@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:36 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:45726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDSKU-0005fj-7T for 43160@debbugs.gnu.org; Wed, 02 Sep 2020 08:57:34 -0400 Received: by mail-qk1-f196.google.com with SMTP id o5so4159315qke.12 for <43160@debbugs.gnu.org>; Wed, 02 Sep 2020 05:57:34 -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=dgOGVMxgG3sYhr5w+yMcGGVaP1v70ZAUL/3C9ZrYKhI=; b=hP8lFua4ojpBwvBi9aI3/CIeh4JuFzyIwA9R3TlnoeZ2K4n2zp2/miFemjBvdHyipD uH6D8W7GVp6MGrrUXFvg2WvGLsy/kAWRRy2Q/fZk3XCwInPRvkVjRQ5X878dn13IkckL LwCn1p8Jx+sCvXY5sQMqDud8XDeu3uQKGjemYyB0Ri+PyBtKWqSlRxKfeLIiqN/WuNmX bCIuCQgjKPGFJ+8TktZzS6suPhoCiYdvOUw8FEJewlGQvPTv+Jrivy34gjjqOhrOgeEV Vc62oxXPPAP2sPx+p12P7DpXVWTEt/GXz59RfFwiFn+XSwvQPPdwwr5PrPqpWwhpT5zP lcmQ== 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=dgOGVMxgG3sYhr5w+yMcGGVaP1v70ZAUL/3C9ZrYKhI=; b=Ir0NlJyIZDPQZwSFOTJaNoT+mXluJYiOSD/fqw02N6LJHn1ZGhcD7lgxDDN/cR2zh1 4RU0H16Y3EmBjBu2pCHIa7l9bcKEuoaIpP6V0MXe/IYIvretHYdMN1xui3yD6Bb+8wjO v/vzRvXIDyoNPwKuwTEnwNKfjPvVcEEBceJy7JsII/CAMWq4LHWb6dBqJqHTN/3JEXY3 MtCgo3pEt8vC0uZdAAGEFZR/Qq8RDZvPdShVQvxUbTYgXNgq7XwgEGEq10ShfGQlDjsI z+6u39BMbtIbbdNFR9EMAwq7TGF5Zt92AeRI3wd1xkze13nIJ/DrQMTR3iXBVxDy7EsV PV+g== X-Gm-Message-State: AOAM532hkDX1Z1zz/J5bEXVulmkF02DFkNL1AIe4pMjR3ivQVTYHOBp2 S4VCarHKqH8Z2i6uEkx/p0/YWgwOXs8ueg== X-Google-Smtp-Source: ABdhPJw3sLm6dB1oXje8zU1cyfz8kkwweTgLabUf7AAdnBcgC3YhpyH7kuaSw4tVHgWgsd/NaI2bGA== X-Received: by 2002:a05:620a:134e:: with SMTP id c14mr718763qkl.223.1599051448376; Wed, 02 Sep 2020 05:57:28 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-254.b2b2c.ca. [72.10.133.254]) by smtp.gmail.com with ESMTPSA id x6sm4712553qke.54.2020.09.02.05.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 05:57:27 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 2 Sep 2020 08:56:43 -0400 Message-Id: <20200902125643.27201-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200902125643.27201-1-maxim.cournoyer@gmail.com> References: <20200902125643.27201-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): Rename the UPSTREAM-SOURCE parameter to LINUX-UPSTREAM-SOURCE. Add a new LINUX-LIBRE-UPSTREAM-SOURCE parameter. Update doc. Adjust variable names. Capitalize "Linux" in the user messages. Remove empty directories from the generated sources, then invoke diff between these sources and those of the corresponding Linux-libre release. (%upstream-linux-source): Convert the hash as base32 inside the definition, to simplify its use. (%upstream-linux-libre-source): New procedure. (linux-libre-5.8-pristine-source): Add a LIBRE-HASH binding and use it with %UPSTREAM-LINUX-LIBRE-SOURCE to provide the Linux-libre release origin to the make-linux-libre-source procedure call. (linux-libre-5.4-pristine-source): Likewise. (linux-libre-4.19-pristine-source): Likewise. (linux-libre-4.14-pristine-source): Likewise. (linux-libre-4.9-pristine-source): Likewise. (linux-libre-4.4-pristine-source): Likewise. --- gnu/packages/linux.scm | 63 ++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e177386312..020eb1670c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -258,10 +258,14 @@ from forcing GEXP-PROMISE." #:guile-for-build guile))) (define (make-linux-libre-source version - upstream-source + linux-upstream-source + linux-libre-upstream-source deblob-scripts) "Return a 'computed' origin that generates a Linux-libre tarball from the -corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." +corresponding LINUX-UPSTREAM-SOURCE (an origin), using the given +DEBLOB-SCRIPTS. The generated Linux-libre source is compared against the +corresponding LINUX-LIBRE-UPSTREAM-SOURCE upstream release (an origin), to +ensure correctness." (match deblob-scripts ((deblob-version (? origin? deblob) (? origin? deblob-check)) (unless (string=? deblob-version (version-major+minor version)) @@ -318,14 +322,14 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (("/bin/sed") (which "sed")) (("/usr/bin/python") (which "python")))) - (if (file-is-directory? #+upstream-source) + (if (file-is-directory? #+linux-upstream-source) (begin - (format #t "Copying upstream linux source...~%") - (invoke "cp" "--archive" #+upstream-source dir) + (format #t "Copying upstream Linux source...~%") + (invoke "cp" "--archive" #+linux-upstream-source dir) (invoke "chmod" "--recursive" "u+w" dir)) (begin - (format #t "Unpacking upstream linux tarball...~%") - (invoke "tar" "xf" #$upstream-source) + (format #t "Unpacking upstream Linux tarball...~%") + (invoke "tar" "xf" #$linux-upstream-source) (match (scandir "." (lambda (name) (and (not (member name '("." ".."))) @@ -352,7 +356,16 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (format #t "~%Scanning the generated tarball for blobs...~%") (invoke "/tmp/bin/deblob-check" "--use-awk" "--list-blobs" - #$output)))))))))) + #$output) + + (format #t "~%Comparing with the upstream Linux-libre \ +release...~%") + ;; Git doesn't track empty directories, so remove them from + ;; our local tree for the sake of comparison. + (invoke "find" dir "-type" "d" "-empty" "-delete") + (invoke "diff" "-ur" + dir + #+linux-libre-upstream-source)))))))))) ;;; @@ -381,55 +394,75 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (uri (string-append "mirror://kernel.org" "/linux/kernel/v" (version-major version) ".x/" "linux-" version ".tar.xz")) - (sha256 hash))) + (sha256 (base32 hash)))) +(define (%upstream-linux-libre-source version hash) + (origin + (method git-fetch) + (uri (git-reference + (url "git://linux-libre.fsfla.org/releases.git") + (commit (string-append "sources/v" version "-gnu")))) + (file-name (git-file-name "linux-libre-source" version)) + (sha256 (base32 hash)))) (define-public linux-libre-5.8-version "5.8.5") (define-public linux-libre-5.8-pristine-source (let ((version linux-libre-5.8-version) - (hash (base32 "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx"))) + (hash "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx") + (libre-hash "0blgkbfvl5p6y6fj0xkdnd0dk2qla02pc37gj7dc3ha0asxv4mp8")) (make-linux-libre-source version (%upstream-linux-source version hash) + (%upstream-linux-libre-source version libre-hash) deblob-scripts-5.8))) (define-public linux-libre-5.4-version "5.4.61") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"))) + (hash "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6") + (libre-hash "1ycbalnlmgbaq3yh7yc7l8gw7c8d2x4jbwildf04zgfq9g0lv78m")) (make-linux-libre-source version (%upstream-linux-source version hash) + (%upstream-linux-libre-source version libre-hash) deblob-scripts-5.4))) (define-public linux-libre-4.19-version "4.19.142") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "19372sri4962dqf5rbr211lrfpckmj11kxsginfcwwid4hfdn4k9"))) + (hash "19372sri4962dqf5rbr211lrfpckmj11kxsginfcwwid4hfdn4k9") + (libre-hash "1281d0rx17yiy9723ig381jq3bww59xqggisbxhdrxvfbxv0vvp4")) (make-linux-libre-source version (%upstream-linux-source version hash) + (%upstream-linux-libre-source version libre-hash) deblob-scripts-4.19))) (define-public linux-libre-4.14-version "4.14.195") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "08d08la3h48fbdlr3h8zbvdghydx3x9cwb4yrnm0n93hhrwjhkrr"))) + (hash "08d08la3h48fbdlr3h8zbvdghydx3x9cwb4yrnm0n93hhrwjhkrr") + (libre-hash "0vgfw8jv3mnn6d9pvccqvx4v143ck02inivnhmxylq0nqfxb7nj4")) (make-linux-libre-source version (%upstream-linux-source version hash) + (%upstream-linux-libre-source version libre-hash) deblob-scripts-4.14))) (define-public linux-libre-4.9-version "4.9.234") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1qw26x2qc29yr094c7scw68m9yz4j0b2c4f92rvi3s31s928avvm"))) + (hash "1qw26x2qc29yr094c7scw68m9yz4j0b2c4f92rvi3s31s928avvm") + (libre-hash "1p7dpsqad9vra22r00ha6vg2fap4jjplfkcaskz9fvih6m4m7wgp")) (make-linux-libre-source version (%upstream-linux-source version hash) + (%upstream-linux-libre-source version libre-hash) deblob-scripts-4.9))) (define-public linux-libre-4.4-version "4.4.234") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "123354h05fip161rzlxc8h0cn5lh0d1gz06gc5b7zyz9i2lxv539"))) + (hash "123354h05fip161rzlxc8h0cn5lh0d1gz06gc5b7zyz9i2lxv539") + (libre-hash "07adliis6kln7531jwwl0h2v9wkzn2j3jn2zjlyashxd9p85kywm")) (make-linux-libre-source version (%upstream-linux-source version hash) + (%upstream-linux-libre-source version libre-hash) deblob-scripts-4.4))) (define %boot-logo-patch