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"