From patchwork Sat Apr 4 12:10:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1266397 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=XkWibNXk; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48vbJL2dpVz9sSG for ; Sat, 4 Apr 2020 23:11:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ADD5F2153B; Sat, 4 Apr 2020 12:11:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8D6Ur6C5hC6i; Sat, 4 Apr 2020 12:11:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 229102261A; Sat, 4 Apr 2020 12:11:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 25F841BF3B9 for ; Sat, 4 Apr 2020 12:10:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1D41087D93 for ; Sat, 4 Apr 2020 12:10:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AYLQSMUSgVRR for ; Sat, 4 Apr 2020 12:10:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 55B3A87CE5 for ; Sat, 4 Apr 2020 12:10:52 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id h9so11748417wrc.8 for ; Sat, 04 Apr 2020 05:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=52Xcc5+kEF+p5Lnplim8TtPKoczPdn7soAZYz3myvx4=; b=XkWibNXkFR/d2YXCKg/4yo3CsodkpNAVVVCYgP/b51uCwTHUQwmi8bGtyU/DTBm+72 c6M2PvUGPNVKLfzG++pFbbQgT0O8rfjMvnVTki7ZnTGrW8QWY5qZieJ0pORXKDM/kvjF 4xqQ7W720721dnd+hK5P7Lm9IVdK9Ug1dueft2T+5TLSdpnFpER9WFzxXRJC25c3i9hc xJ1OU1mFEbLiq05Xqy8imbWJSmNV8RKxnH8d63V5Rqhzr998rjlTsLwsIZqAl7nYgwND qMyZGE8xZUro0RdBraYeQQQlAI5/eJUf8bAlmUJveqDTd/kscYnk2JmG0M8vyBgzXIEf f/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=52Xcc5+kEF+p5Lnplim8TtPKoczPdn7soAZYz3myvx4=; b=beSPKAAg+4osdrKOkBaFrSFJhUKffXxaxe80cRE9kQ9ZrIMuuseqLnAEwwf4IkKz7G 1QGpeA0PrRWXLEZz9gpIRsAxtFiyjhvW7yM/r7T9l2Qx6Is5nzwkp1AwDMBk4cba0hAF JuUc2kCy6fPmJHSeWrgbf6wlM05FtFbl2AAxj1kfnfYZtKm5BGIcbedqauorp1IbiwJJ 1NK3m77nX6ci1RHeUvC0muO6lmxUXCM5AuYrtwQ2xNMJscvirJFKF8HRnkqzPc80P+zu 2SyBItMhKxijKNISWKW+LHbotNn7uXCBH6RnRUGKOEJcRx+kH25vo9oiv68SbWDC2Gep /acQ== X-Gm-Message-State: AGi0Pua6yjNzU+VfPntfan90FomtgeT052cvA2TsEWRV5aGKyf2b8ZX3 X7ynK2peeLd6Vkz7AuVeJaaWpln9 X-Google-Smtp-Source: APiQypLJC/4/U01AczgQgwK9srLlVUwtrHxhRrJWgWwZfKVCQQBzmSeXC7FuBjrmhr2DvEMYostBHg== X-Received: by 2002:a5d:4003:: with SMTP id n3mr13475268wrp.176.1586002250600; Sat, 04 Apr 2020 05:10:50 -0700 (PDT) Received: from scaer.home ([2a01:cb19:8b51:cb00:2984:4c3:cd3a:118d]) by smtp.gmail.com with ESMTPSA id q19sm12031907wra.38.2020.04.04.05.10.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2020 05:10:50 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 4 Apr 2020 14:10:31 +0200 Message-Id: <9ddef22e530b82e92f5438c6f766b8f6d32de72c.1586002215.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 19/22] package/xtables-addons: bear the kernel options munging X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Yann E. MORIN --- linux/linux.mk | 5 ----- package/xtables-addons/xtables-addons.mk | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 36cb49b84a..eb2bfbfa3f 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_XTABLES_ADDONS), - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT)) $(if $(BR2_PACKAGE_WIREGUARD_LINUX_COMPAT), $(call KCONFIG_ENABLE_OPT,CONFIG_INET) $(call KCONFIG_ENABLE_OPT,CONFIG_NET) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 1a74b80f46..dab57d980e 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -30,4 +30,11 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT) +endef + $(eval $(autotools-package))