From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB215138359 for ; Thu, 30 Jul 2020 15:08:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0C5EE09E7; Thu, 30 Jul 2020 15:08:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6F4FE09E7 for ; Thu, 30 Jul 2020 15:08:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD28434F2AA for ; Thu, 30 Jul 2020 15:08:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 932C9275 for ; Thu, 30 Jul 2020 15:08:21 +0000 (UTC) From: "Jason A. Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" Message-ID: <1596121697.11c0cf5d42363856a3b587fbbff7ade95c1a53ea.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard-modules/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild net-vpn/wireguard-modules/wireguard-modules-9999.ebuild X-VCS-Directories: net-vpn/wireguard-modules/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: 11c0cf5d42363856a3b587fbbff7ade95c1a53ea X-VCS-Branch: master Date: Thu, 30 Jul 2020 15:08:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c5b645f-36a3-402a-b1aa-ef1288357e6c X-Archives-Hash: 3565a8ebc588f9f49304e82f6f5752c5 commit: 11c0cf5d42363856a3b587fbbff7ade95c1a53ea Author: Jason A. Donenfeld gentoo org> AuthorDate: Thu Jul 30 15:07:43 2020 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Thu Jul 30 15:08:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c0cf5d net-vpn/wireguard-modules: detect other kernels that already have wireguard With WireGuard being added to gentoo-sources, we now generalize the detection, so that people use the built-in WireGuard instead of the hacky compatibility module. Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Jason A. Donenfeld gentoo.org> net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild | 6 +++--- net-vpn/wireguard-modules/wireguard-modules-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild index 16df945c1ab..85fe87ad3b4 100644 --- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild +++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild @@ -33,13 +33,13 @@ CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI" pkg_setup() { if use module; then linux-mod_pkg_setup - if kernel_is -ge 5 6 0; then + if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then eerror - eerror "WireGuard has been merged upstream in Linux 5.6. Therefore," + eerror "WireGuard has been merged upstream into this kernel. Therefore," eerror "you no longer need this compatibility ebuild. Instead, simply" eerror "enable CONFIG_WIREGUARD=y in your kernel configuration." eerror - die "Use CONFIG_WIREGUARD=y for kernels >= 5.6, and do not use this package." + die "Use CONFIG_WIREGUARD=y for this kernel, and do not use this package." elif kernel_is -lt 3 10 0; then die "This version of ${PN} requires Linux >= 3.10." fi diff --git a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild index 16df945c1ab..85fe87ad3b4 100644 --- a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild +++ b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild @@ -33,13 +33,13 @@ CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI" pkg_setup() { if use module; then linux-mod_pkg_setup - if kernel_is -ge 5 6 0; then + if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then eerror - eerror "WireGuard has been merged upstream in Linux 5.6. Therefore," + eerror "WireGuard has been merged upstream into this kernel. Therefore," eerror "you no longer need this compatibility ebuild. Instead, simply" eerror "enable CONFIG_WIREGUARD=y in your kernel configuration." eerror - die "Use CONFIG_WIREGUARD=y for kernels >= 5.6, and do not use this package." + die "Use CONFIG_WIREGUARD=y for this kernel, and do not use this package." elif kernel_is -lt 3 10 0; then die "This version of ${PN} requires Linux >= 3.10." fi