From patchwork Mon Feb 25 01:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 1236 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 C1E5416CAD; Mon, 25 Feb 2019 01:16:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable 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 5E09416CAA for ; Mon, 25 Feb 2019 01:16:08 +0000 (GMT) Received: from localhost ([127.0.0.1]:58252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gy4sJ-0006ga-Vx for patchwork@mira.cbaines.net; Sun, 24 Feb 2019 20:16:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gy4sE-0006gQ-Vj for guix-patches@gnu.org; Sun, 24 Feb 2019 20:16:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gy4sD-0000XE-Vs for guix-patches@gnu.org; Sun, 24 Feb 2019 20:16:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37151) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gy4sD-0000X9-Pu for guix-patches@gnu.org; Sun, 24 Feb 2019 20:16:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gy4sD-0007pk-L1 for guix-patches@gnu.org; Sun, 24 Feb 2019 20:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34643] [PATCH 2/2] gnu: Add linux-libre with WireGuard. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Feb 2019 01:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 34643@debbugs.gnu.org Received: via spool by 34643-submit@debbugs.gnu.org id=B34643.155105731630056 (code B ref 34643); Mon, 25 Feb 2019 01:16:01 +0000 Received: (at 34643) by debbugs.gnu.org; 25 Feb 2019 01:15:16 +0000 Received: from localhost ([127.0.0.1]:50693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gy4rT-0007oh-T4 for submit@debbugs.gnu.org; Sun, 24 Feb 2019 20:15:16 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gy4rR-0007oJ-Fj for 34643@debbugs.gnu.org; Sun, 24 Feb 2019 20:15:13 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 69AA221A84; Sun, 24 Feb 2019 20:15:08 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 24 Feb 2019 20:15:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=KrBpqMs6h8 NDTbEQzGJIL7d4i05iwRltsUEPawJ+7rA=; b=VNAUh0pJ9vmtgnYdkp8JcJIgPJ CxEzF/vESsXX+wbMivoh5UjEy2fl9gdqWL/TLvz1sSdj8RWIOO9yCPJwNneSuLhy wrVWE9bXf3v95aVajMZOCLIWWg3ZGlXGtENcDGf5UnjrwN0wHfib1YTDGA6VmsUh JDuO7acMz9sBWwhaA= 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=KrBpqMs6h8NDTbEQzGJIL7d4i05iwRltsUEPawJ+7rA=; b=Fko8eWR4 fqnlvaRHd+g6ei3OTXUY/G1lciDPLQpsTyus12o8FAiWUGOTVE1lLNBVhoxuuG7b Pjwh4tMAFcX9e3EiiAHpc1ijoBf6dIM8g94U8HU1mP3h8uAbmkqc7yCboptlrSQd oxLuUZWIbrj/uLlHZGCywEp0WPvUpVVToiU0xztVahFNUYnVearZwsdX7U+I483m rJDLeVQ3XvjdrKFMSD1Dv73dZGc1Oq6epnorX+H6HaL0+m2i9k/m2XKkfYUxJdfB WNUwsO42SgkWSOZKbYEucrFDsR/bR5avGQaGcYpijsnOaOQ6HeoZP/ComIdD/Xjn J5Au4hZsv3YZJA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrudehgddvleculddtuddrgedtledrtddtmd cutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecukfhppeejuddruddthedrvddttddrjedvnecurfgrrhgrmhepmh grihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgvnecuvehluhhsthgvrhfu ihiivgeptd X-ME-Proxy: Received: from jasmine.lan (pool-71-105-200-72.nycmny.fios.verizon.net [71.105.200.72]) by mail.messagingengine.com (Postfix) with ESMTPA id 0B5B6E4240 for <34643@debbugs.gnu.org>; Sun, 24 Feb 2019 20:15:08 -0500 (EST) From: Leo Famulari Date: Sun, 24 Feb 2019 20:15:03 -0500 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: <9b27f8b284f9f92f7bbc8c8edc7dbadd54a5035d.1551057302.git.leo@famulari.name> References: <9b27f8b284f9f92f7bbc8c8edc7dbadd54a5035d.1551057302.git.leo@famulari.name> MIME-Version: 1.0 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 This is a demonstration patch. We don't need to actually include it in Guix. * gnu/packages/linux.scm (linux-libre-with-wireguard): New variable. --- gnu/packages/linux.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 983e335e30..816c920e48 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5180,3 +5180,20 @@ retrieving configuration of WireGuard network tunnel interfaces, and a patch that can be applied to a Linux kernel source tree in order to build it with WireGuard support.") (license license:gpl2))) + +(define-public linux-libre-with-wireguard + (package + (inherit linux-libre) + (name "linux-libre-with-wireguard") + (native-inputs + `(("wireguard-patch" ,wireguard "kernel-patch") + ,@(package-native-inputs linux-libre))) + (arguments + (substitute-keyword-arguments (package-arguments linux-libre) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'patch-source-shebangs 'add-wireguard + (lambda* (#:key inputs #:allow-other-keys) + (let* ((wireguard-patch (string-append (assoc-ref inputs "wireguard-patch") + "/wireguard.patch"))) + (invoke "patch" "-p1" "-i" wireguard-patch))))))))))