From patchwork Wed Apr 10 23:19:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 3267 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 992F116E38; Thu, 11 Apr 2019 00:24:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 84BC116E36 for ; Thu, 11 Apr 2019 00:24:10 +0100 (BST) Received: from localhost ([127.0.0.1]:39065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMZc-000352-Uu for patchwork@mira.cbaines.net; Wed, 10 Apr 2019 19:24:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMWg-0000kv-E4 for guix-patches@gnu.org; Wed, 10 Apr 2019 19:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEMWd-0007hp-Na for guix-patches@gnu.org; Wed, 10 Apr 2019 19:21:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEMWc-0007gc-As for guix-patches@gnu.org; Wed, 10 Apr 2019 19:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEMWc-0006Jj-2k for guix-patches@gnu.org; Wed, 10 Apr 2019 19:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35223] [PATCH] gnu: linux-libre: Set DEVPTS_MULTIPLE_INSTANCES only where needed. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Apr 2019 23:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35223 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35223@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155493840924192 (code B ref -1); Wed, 10 Apr 2019 23:21:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Apr 2019 23:20:09 +0000 Received: from localhost ([127.0.0.1]:53659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEMVk-0006I6-N6 for submit@debbugs.gnu.org; Wed, 10 Apr 2019 19:20:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEMVh-0006HU-7Y for submit@debbugs.gnu.org; Wed, 10 Apr 2019 19:20:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:36184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEMVb-0006z7-Ru for submit@debbugs.gnu.org; Wed, 10 Apr 2019 19:19:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMVa-0008Bl-M8 for guix-patches@gnu.org; Wed, 10 Apr 2019 19:19:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEMVY-0006xb-RN for guix-patches@gnu.org; Wed, 10 Apr 2019 19:19:58 -0400 Received: from tobias.gr ([2001:470:7405::1]:35266) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEMVY-0006w5-Et for guix-patches@gnu.org; Wed, 10 Apr 2019 19:19:56 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 1664202e; Wed, 10 Apr 2019 23:19:52 +0000 (UTC) Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id f7f5f1df (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 10 Apr 2019 23:19:52 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Thu, 11 Apr 2019 01:19:36 +0200 Message-Id: <20190410231936.15275-1-somebody@not-sent-or-endorsed-by.tobias.gr> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 From: Tobias Geerinckx-Rice * gnu/packages/linux.scm (%default-extra-linux-options): Move obsolete CONFIG_DEVPTS_MULTIPLE_INSTANCES option… (linux-libre-4.4): …here. --- gnu/packages/linux.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 710fd2d299..c80cee6422 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -264,9 +264,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (search-auxiliary-file file))) (define %default-extra-linux-options - `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html - ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t) - ;; Modules required for initrd: + `(;; Modules required for initrd: ("CONFIG_NET_9P" . m) ("CONFIG_NET_9P_VIRTIO" . m) ("CONFIG_VIRTIO_BLK" . m) @@ -471,7 +469,13 @@ It has been modified to remove all non-free binary blobs.") (make-linux-libre "4.4.178" "1lgsd760md6b32qb5ng3anfq1n754a9d0c4xnf2mjxkimncb1jpp" '("x86_64-linux" "i686-linux") - #:configuration-file kernel-config)) + #:configuration-file kernel-config + #:extra-options + (append + `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html + ;; This option was removed upstream in version 4.7. + ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)) + %default-extra-linux-options))) (define-public linux-libre-arm-generic (make-linux-libre %linux-libre-version