From: "Jason A. Donenfeld" <zx2c4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard-modules/
Date: Fri, 27 Dec 2019 15:25:18 +0000 (UTC) [thread overview]
Message-ID: <1577460310.bda5207741e4e1ae4513f51b7fc1162b39cb4101.zx2c4@gentoo> (raw)
commit: bda5207741e4e1ae4513f51b7fc1162b39cb4101
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 15:20:54 2019 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> 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 <zx2c4 <AT> 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
}
next reply other threads:[~2019-12-27 15:25 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-27 15:25 Jason A. Donenfeld [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-05 13:16 [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard-modules/ Sam James
2023-12-07 17:25 Mike Pagano
2023-06-30 13:33 Sam James
2022-06-27 11:06 Jason A. Donenfeld
2021-12-26 0:20 Sam James
2021-12-08 16:31 Jason A. Donenfeld
2021-06-06 9:39 Jason A. Donenfeld
2021-04-24 20:53 Jason A. Donenfeld
2021-02-19 14:16 Jason A. Donenfeld
2021-02-19 14:14 Jason A. Donenfeld
2021-01-24 13:49 Jason A. Donenfeld
2020-12-28 16:01 Jason A. Donenfeld
2020-12-21 12:00 Jason A. Donenfeld
2020-11-18 19:38 Jason A. Donenfeld
2020-11-12 9:10 Jason A. Donenfeld
2020-10-18 16:02 Thomas Deutschmann
2020-09-08 16:26 Jason A. Donenfeld
2020-08-08 12:18 Mikle Kolyada
2020-07-31 12:12 Jason A. Donenfeld
2020-07-31 12:12 Jason A. Donenfeld
2020-07-30 15:08 Jason A. Donenfeld
2020-07-29 8:21 Jason A. Donenfeld
2020-07-13 3:34 Jason A. Donenfeld
2020-06-23 22:16 Jason A. Donenfeld
2020-06-11 8:23 Jason A. Donenfeld
2020-05-21 20:29 Jason A. Donenfeld
2020-05-06 23:00 Jason A. Donenfeld
2020-04-30 4:41 Jason A. Donenfeld
2020-04-27 1:26 Jason A. Donenfeld
2020-04-14 9:26 Jason A. Donenfeld
2020-04-01 19:11 Jason A. Donenfeld
2020-03-31 0:22 Jason A. Donenfeld
2020-03-19 5:23 Jason A. Donenfeld
2020-02-14 23:04 Jason A. Donenfeld
2020-02-14 13:39 Jason A. Donenfeld
2020-02-05 13:38 Jason A. Donenfeld
2020-01-28 15:54 Jason A. Donenfeld
2020-01-21 15:22 Jason A. Donenfeld
2020-01-05 23:10 Jason A. Donenfeld
2019-12-30 9:32 Jason A. Donenfeld
2019-12-28 15:37 Thomas Deutschmann
2019-12-27 23:03 Jason A. Donenfeld
2019-12-26 16:47 Jason A. Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1577460310.bda5207741e4e1ae4513f51b7fc1162b39cb4101.zx2c4@gentoo \
--to=zx2c4@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox