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 uEmiBuSWT1+YTAAA0tVLHw (envelope-from ) for ; Wed, 02 Sep 2020 12:58:12 +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 kCpmAuSWT187KQAA1q6Kng (envelope-from ) for ; Wed, 02 Sep 2020 12:58: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 C46F2940215 for ; Wed, 2 Sep 2020 12:58:11 +0000 (UTC) Received: from localhost ([::1]:41264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSL4-0003xz-Kz for larch@yhetil.org; Wed, 02 Sep 2020 08:58:10 -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 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 (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=JKJXoY/O; 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: 4.09 X-TUID: 6Pel6uvZ5knG 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")) -- 2.27.0