Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] linux: use correct conditional for wireguard kernel config fixup
Date: Sat, 15 Feb 2020 19:20:20 +0100	[thread overview]
Message-ID: <20200215182020.20862-2-peter@korsgaard.com> (raw)
In-Reply-To: <20200215182020.20862-1-peter@korsgaard.com>

Commit de591c5c3a93 (package/wireguard-linux-compat: new package) split up
the wireguard package in wireguard-tools and wireguard-linux-compat, but
forgot to update the conditional in linux.mk, so the kernel config fixups
needed for wireguard are no longer applied.

Update the conditional to use the BR2_PACKAGE_WIREGUARD_LINUX_COMPAT symbol
instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index bf308b807a..4b60f33ff3 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -392,7 +392,7 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT,$(@D)/.config))
-	$(if $(BR2_PACKAGE_WIREGUARD),
+	$(if $(BR2_PACKAGE_WIREGUARD_LINUX_COMPAT),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_INET,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU,$(@D)/.config)
-- 
2.20.1

  reply	other threads:[~2020-02-15 18:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-15 18:20 [Buildroot] [PATCH 1/2] package/wireguard-linux-compat: bump version to 0.0.20200215 Peter Korsgaard
2020-02-15 18:20 ` Peter Korsgaard [this message]
2020-02-16 14:27   ` [Buildroot] [PATCH 2/2] linux: use correct conditional for wireguard kernel config fixup Peter Korsgaard
2020-02-16 14:27 ` [Buildroot] [PATCH 1/2] package/wireguard-linux-compat: bump version to 0.0.20200215 Peter Korsgaard

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=20200215182020.20862-2-peter@korsgaard.com \
    --to=peter@korsgaard.com \
    --cc=buildroot@busybox.net \
    /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