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 CB04B138334 for ; Fri, 27 Dec 2019 15:25:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 299CAE09CB; Fri, 27 Dec 2019 15:25:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 F3D99E09CB for ; Fri, 27 Dec 2019 15:25:20 +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 D09A834DBDD for ; Fri, 27 Dec 2019 15:25:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CC9234 for ; Fri, 27 Dec 2019 15:25:18 +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: <1577460310.bda5207741e4e1ae4513f51b7fc1162b39cb4101.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-0.0.20191226.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: bda5207741e4e1ae4513f51b7fc1162b39cb4101 X-VCS-Branch: master Date: Fri, 27 Dec 2019 15:25:18 +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: 60b83c3e-a0cb-401c-809c-dff723cea584 X-Archives-Hash: 04421a60815d1c6b9f067836d89ed7d5 commit: bda5207741e4e1ae4513f51b7fc1162b39cb4101 Author: Jason A. Donenfeld gentoo org> AuthorDate: Fri Dec 27 15:20:54 2019 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Fri Dec 27 15:25:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda52077 net-vpn/wireguard-modules: allow out of tree kernel builds We also update the version situation description. Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Jason A. Donenfeld gentoo.org> .../wireguard-modules/wireguard-modules-0.0.20191226.ebuild | 13 ++++++++++--- net-vpn/wireguard-modules/wireguard-modules-9999.ebuild | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild b/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild index 2fe86edba28..dd0ff73d495 100644 --- a/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild +++ b/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild @@ -33,14 +33,21 @@ CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI" pkg_setup() { if use module; then linux-mod_pkg_setup - if kernel_is -lt 3 10 0 || kernel_is -ge 5 6 0; then - die "This version of ${PN} requires 3.10 <= Linux <= 5.5.y" + if kernel_is -ge 5 6 0; then + eerror + eerror "WireGuard has been merged upstream in Linux 5.6. 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." + elif kernel_is -lt 3 10 0; then + die "This version of ${PN} requires Linux >= 3.10." fi fi } src_compile() { - BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" + BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}" use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}" use module && linux-mod_src_compile } diff --git a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild index 2fe86edba28..dd0ff73d495 100644 --- a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild +++ b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild @@ -33,14 +33,21 @@ CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI" pkg_setup() { if use module; then linux-mod_pkg_setup - if kernel_is -lt 3 10 0 || kernel_is -ge 5 6 0; then - die "This version of ${PN} requires 3.10 <= Linux <= 5.5.y" + if kernel_is -ge 5 6 0; then + eerror + eerror "WireGuard has been merged upstream in Linux 5.6. 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." + elif kernel_is -lt 3 10 0; then + die "This version of ${PN} requires Linux >= 3.10." fi fi } src_compile() { - BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" + BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}" use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}" use module && linux-mod_src_compile }