From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 452F15E49; Sun, 11 Apr 2021 11:58:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 17E9B5BC5; Sun, 11 Apr 2021 11:58:11 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 434225B9F; Sun, 11 Apr 2021 11:58:08 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id CAC6F5B28 for ; Sun, 11 Apr 2021 11:57:56 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 412E45C0056 for ; Sun, 11 Apr 2021 07:57:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 11 Apr 2021 07:57:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=UVvM6teLs9oLQ BTYnAPN6irdGzDNtqpSzMxF6JVCaqY=; b=mgpUJB0xOaiq596mGB/bn4+miqhOp K+f+dLcQUJx/RLc5ytbK+MgYcEiB3YTJFTu9bp6Ffr5a4nhXrEVZB8H3CzBvEnp/ 5OLSCmyGzhVoTXR1uLt2NM1Fbi0zTmH30fNn2Ery526A7QM27TJG2jq3geMAGVqM I78YeF+fFRc9RUPFPh/AyC6bCRij/6rvKSrlfmC5fGRGt2Z08or0W9WgsUpqnpy2 9lAqSCJDP/Z1N0nuia/XbyFvF0Kp68TIKNIpbar77QnBWd2GGIOVbc1s1db1cUME LebdA8I6IZfG6Bog0at5tDgyafMrY/C7sUPRh9UWrn6acC2gwSZ/rjIXw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=UVvM6teLs9oLQBTYnAPN6irdGzDNtqpSzMxF6JVCaqY=; b=SnYSoerr j0b+niaSOBKdReGTFuFeNNKpmcvtqHAeY+tGOixYzkR+FCckBmYjusDmhLjbSise cB0GuDNEqdo1BiDgHkrLjM2tl9Jl2NaA4TEp2oKcnhoHMd0bwYulxp4ukzGTSOWQ nCRHrBygjAEI/gzbq3UIls9ce6HWC9+T0RIl8vth/sYzlhqUNrgzGUgPpxrVbhTP x9qyDtg17pFFYbvbZeXzmmmFjQ4hvV3jPPD8uN1ZIukRoisGIje+4MGq5nErK6Cq UxNy2lNqVIWTihT3YMOoJ1LWljYDrOVUjX6tyAMVWr7OkYjF5k+BGTgDTCM+hNEH TqG6R5AuOD+eNA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekgedgudejhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdr ihhsqeenucggtffrrghtthgvrhhnpeevjeeutdefleekgfffueeghedtheelfeduueegge dthfdvffehudeukeffjeekvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhp peejledrvdefhedrudduledruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p4feb776b.dip0.t-ipconnect.de [79.235.119.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 02B121080054 for ; Sun, 11 Apr 2021 07:57:56 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 428211992; Sun, 11 Apr 2021 11:57:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 01/16] linux: enable Xen everywhere it can be Date: Sun, 11 Apr 2021 11:57:25 +0000 Message-Id: <20210411115740.29615-2-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210411115740.29615-1-hi@alyssa.is> References: <20210411115740.29615-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: A6XCUVZPWAJ36W34LU6WFCDCNHSUNY4N X-Message-ID-Hash: A6XCUVZPWAJ36W34LU6WFCDCNHSUNY4N X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: I don't think there's any reason to have a seperate kernel variant because of this, with all the maintenance burden that imposes. Debian and Fedora both enable all these options on their normal kernels. Alias the Linux Xen attributes, so this change should be seemless for people who were using the Xen kernels up to now. All the Xen options are marked as optional anyway, so it should be fine to try to enable them on non-x86 platforms as well. Cherry-picking this for Spectrum because PVH is cloud-hypervisor's preferred boot entry point on x86, and it'll complain if our kernel doesn't support it. Fixes: https://github.com/NixOS/nixpkgs/issues/115182 (cherry picked from commit 5f24024de6f6405bb9ae9fc4c960b3fba84613b9) --- pkgs/os-specific/linux/kernel/common-config.nix | 13 ++++--------- pkgs/top-level/aliases.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 9 --------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e80e29aad3d..c0da19dd391 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -12,7 +12,7 @@ # Configuration { stdenv, version -, features ? { grsecurity = false; xen_dom0 = false; } +, features ? { grsecurity = false; } }: with stdenv.lib; @@ -505,13 +505,8 @@ let VBOXGUEST = option no; DRM_VBOXVIDEO = option no; - } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({ - XEN = option yes; - - # XXX: why isn't this in the xen-dom0 conditional section below? - XEN_DOM0 = option yes; - - } // optionalAttrs features.xen_dom0 { + XEN = option yes; + XEN_DOM0 = option yes; PCI_XEN = option yes; HVC_XEN = option yes; HVC_XEN_FRONTEND = option yes; @@ -530,7 +525,7 @@ let XEN_SELFBALLOONING = option yes; XEN_STUB = option yes; XEN_TMEM = option yes; - }); + }; media = { MEDIA_DIGITAL_TV_SUPPORT = yes; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b020d6fac55..75dd4ab76ca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -276,6 +276,12 @@ mapAliases ({ linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + # added 2021-04-04 + linuxPackages_xen_dom0 = linuxPackages; + linuxPackages_latest_xen_dom0 = linuxPackages_latest; + linuxPackages_xen_dom0_hardened = linuxPackages_hardened; + linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lttngTools = lttng-tools; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb0f87ab3f2..0003282d18a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17807,11 +17807,6 @@ in # Build a kernel with bcachefs module linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); - # Build a kernel for Xen dom0 - linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); - - linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: @@ -17835,10 +17830,6 @@ in linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { }); linux_latest_hardened = linuxPackages_latest_hardened.kernel; - linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { features.xen_dom0=true; }); - - linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { features.xen_dom0=true; }); - # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; -- 2.30.0