From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 18/22] package/iptables: bear the kernel options munging
Date: Sat, 4 Apr 2020 14:10:30 +0200 [thread overview]
Message-ID: <a3b90f766e42e15c95d79401b12af127633c15b3.1586002215.git.yann.morin.1998@free.fr> (raw)
In-Reply-To: <cover.1586002215.git.yann.morin.1998@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
linux/linux.mk | 5 -----
package/iptables/iptables.mk | 7 +++++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index e4dfefde48..36cb49b84a 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -355,11 +355,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER))
$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
$(call KCONFIG_ENABLE_OPT,CONFIG_NET))
- $(if $(BR2_PACKAGE_IPTABLES),
- $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES)
- $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER)
- $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER)
- $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES))
$(if $(BR2_PACKAGE_XTABLES_ADDONS),
$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED)
$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK)
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index ae5cf4ddd3..7b964aaf41 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -47,4 +47,11 @@ else
IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy
endif
+define IPTABLES_LINUX_CONFIG_FIXUPS
+ $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES)
+endef
+
$(eval $(autotools-package))
--
2.20.1
next prev parent reply other threads:[~2020-04-04 12:10 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-04 12:10 [Buildroot] [PATCH 00/22] linux: allow packages to set kconfig options (branch yem/pkg-linux-opts) Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 01/22] core/pkg-utils: rationalise kconfig option mangling Yann E. MORIN
2020-08-30 7:54 ` Peter Korsgaard
2020-04-04 12:10 ` [Buildroot] [PATCH 02/22] core/pkg-utils: kconfig mangling defaults to current package's .config Yann E. MORIN
2020-05-01 13:55 ` Thomas Petazzoni
2020-08-30 7:54 ` Peter Korsgaard
2020-04-04 12:10 ` [Buildroot] [PATCH 03/22] boot/barebox: don't specify .config to munge Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 04/22] boot/uboot: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 05/22] boot/busybox: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 06/22] boot/swupdate: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 07/22] boot/uclibc: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 08/22] linux: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 09/22] linux: allow packages to set options Yann E. MORIN
2020-05-01 13:56 ` Thomas Petazzoni
2020-04-04 12:10 ` [Buildroot] [PATCH 10/22] package/audit: bear the kernel options munging Yann E. MORIN
2020-04-06 12:10 ` Matthew Weber
2020-04-04 12:10 ` [Buildroot] [PATCH 11/22] package/intel-micro-code: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 12/22] package/ktap: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 13/22] package/pcm-tools: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 14/22] package/linux-tools/perf: " Yann E. MORIN
2020-05-01 13:57 ` Thomas Petazzoni
2020-04-04 12:10 ` [Buildroot] [PATCH 15/22] package/systemd: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 16/22] package/smack: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 17/22] package/sunxi-mali-mainline-driver: " Yann E. MORIN
2020-04-04 12:10 ` Yann E. MORIN [this message]
2020-04-04 12:10 ` [Buildroot] [PATCH 19/22] package/xtables-addons: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 20/22] package/wireguard-linux-compat: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 21/22] package/libselinux: " Yann E. MORIN
2020-04-06 12:08 ` Matthew Weber
2020-04-19 18:14 ` Adam Duskett
2020-04-04 12:10 ` [Buildroot] [PATCH 22/22] package/kernel-module-imx-gpu-viv: " Yann E. MORIN
2020-05-01 13:54 ` [Buildroot] [PATCH 00/22] linux: allow packages to set kconfig options (branch yem/pkg-linux-opts) Thomas Petazzoni
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=a3b90f766e42e15c95d79401b12af127633c15b3.1586002215.git.yann.morin.1998@free.fr \
--to=yann.morin.1998@free.fr \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.