From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#35223] [PATCH] gnu: linux-libre: Set DEVPTS_MULTIPLE_INSTANCES only where needed. Resent-Message-ID: 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 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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35223@debbugs.gnu.org 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 -- 2.21.0