From patchwork Mon Apr 27 21:26:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1277964 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=AVj1ifBf; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499yXy1nKQz9sSK for ; Tue, 28 Apr 2020 07:27:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8A7D287EA0; Mon, 27 Apr 2020 21:27:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XmkjVav1+OR1; Mon, 27 Apr 2020 21:27:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DC33187E46; Mon, 27 Apr 2020 21:27:23 +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 92DF51BF3C6 for ; Mon, 27 Apr 2020 21:27:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9012A85C0B for ; Mon, 27 Apr 2020 21:27:22 +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 qgCigOYSEFhU for ; Mon, 27 Apr 2020 21:27:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2B98485BCC for ; Mon, 27 Apr 2020 21:27:21 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id t20so3610301qtq.13 for ; Mon, 27 Apr 2020 14:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=y576CRvpPmPtO9H/nXxZAJ3E8/PYpqhvsVNiC+DgTrE=; b=AVj1ifBfZDqT0rF4Xt8Crd8kAtCXlukIo9BMjfkVknO/Kz9ZCPjL3PD6zzII6BxgaS uSDyyEaP+cnzgw3qPO0eRAVl61cHiZ1eETVsCcYDqAYlIS2efEoCNsdLumV0X6Kthhg5 Xto96V7tQEbGTfA9l38rD1WfFL1xtwm5M1xswhV082BqO/ISQ7LYWIH1mCAsJl5JkBXm Ui8SVOCQYicT2zkuv3PahzOR7G1Sq7DGw7FvgAmGOAh9L5vwAx5sQFgTs/x07OAeF8oG f7iK7nLYFX6mso2GALPmTzrpua+6ZG8yQ4/4VqrApBY/Z9EV67IX46J6oUSNTBrg7gSe R+lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=y576CRvpPmPtO9H/nXxZAJ3E8/PYpqhvsVNiC+DgTrE=; b=bpLqNdQ8aDvoL2cajZ+A7QqmfXIb3KIhvXLcQ8dTZ2bZU59/RSWQpjsbEYC4F5ZCHM C4dDSq/jPbwCL0uRX0LYltpdujfSEYmj6Uwhl+aPL8LhgOSvWh7Lfz3EH1T1HXHBIPZ5 z+BFpoCnD1QV+AeeEN8fGm49qQ+NTSug9wsfK2r3WucDD9MCAsPm89i9XzTvjaFtgJW7 7JK7a2c0+QATrpX+ZrTSkWCIdRiOyJQG0pOPMkji/BGOwIpGBpHBVywVzI0604LdijS9 n6a01FmMkBvIii3dzkbt3TrBeEIESqTPpzc2c6c3PRxISGEILWnPVBamDEYtbSOk74g1 s0iw== X-Gm-Message-State: AGi0PuYmwSiYJUqyPjQ9xh84RXg5HxRRv7q+FT3Ek0vnr5vuKOXPRdc8 h3MtoQDXShb8jNFk4+C5d73QHTEjMfBUmg== X-Google-Smtp-Source: APiQypIeisXRRStJJjA9wV7ythHBKo7xfantOvtrArEP0N7cXd6EpsBQCHQKgGpLahPQDWkjCf+IAw== X-Received: by 2002:ac8:3f6d:: with SMTP id w42mr24585521qtk.171.1588022838770; Mon, 27 Apr 2020 14:27:18 -0700 (PDT) Received: from ryan-pc.birdiebarn.net (50-83-38-60.client.mchsi.com. [50.83.38.60]) by smtp.gmail.com with ESMTPSA id u26sm11695332qkm.125.2020.04.27.14.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 14:27:07 -0700 (PDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Mon, 27 Apr 2020 16:26:52 -0500 Message-Id: <20200427212653.29933-1-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2 1/2] package/ebtables: bump to version 2.0.11 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: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the version bump to 2.0.11, ebtables switch to autotools build system. In addition, ebtables-{restore/save} moved to being installed as ebtables-legacy-{restore/save}. Changes to support this version bump include: * Remove dependency on !BR2_STATIC_LIBS for ebtables-restore as the switch to autotools supports compiling with static libraries. * Update ebtables-save script patch to use /usr/sbin/ebtables-legacy * Remove 0001-*-ethernetdb*.patch as it was merged with commit: http://git.netfilter.org/ebtables/commit/?id=f8079671326e9fd079391d24911a9a8a77f1d6fd * Remove 0002-*-musl-*.patch as support was added with commit: http://git.netfilter.org/ebtables/commit/?id=9fff3d5f9da00255463d28b38d688c25025b7fb1 Tested with test-pkg with BR2_PACKAGE_EBTABLES=y: br-arm-full [1/6]: OK br-arm-cortex-a9-glibc [2/6]: OK br-arm-cortex-m4-full [3/6]: SKIPPED br-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK Signed-off-by: Ryan Barnett Tested-by: Markus Mayer --- Changes v1 -> v2: - Leave config option for ebtables-save (suggested by Thomas) - Update the replace-ebtables-save-perl-script-with-bash.patch to utilize ebtables-legacy instead of /sbin/ebtables - Remove ebtables-legacy-{restore/save} if no config option selected (suggested by Thomas) Signed-off-by: Ryan Barnett --- ...ove-C-specific-compiler-hint-macro-_.patch | 50 ------------------- ...ebtables-save-perl-script-with-bash.patch} | 6 ++- .../0002-Fix-musl-compatibility.patch | 30 ----------- package/ebtables/Config.in | 8 +-- package/ebtables/ebtables.hash | 5 +- package/ebtables/ebtables.mk | 44 ++++++---------- 6 files changed, 25 insertions(+), 118 deletions(-) delete mode 100644 package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch rename package/ebtables/{0003-replace-ebtables-save-perl-script-with-bash.patch => 0001-replace-ebtables-save-perl-script-with-bash.patch} (91%) delete mode 100644 package/ebtables/0002-Fix-musl-compatibility.patch diff --git a/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch deleted file mode 100644 index bd7bead093..0000000000 --- a/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f8079671326e9fd079391d24911a9a8a77f1d6fd Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 12:31:58 +0200 -Subject: [PATCH] ethernetdb.h: Remove C++ specific compiler hint macro _THROW - -Fixes compilation with musl libc - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit f8079671326e9fd0 - - include/ethernetdb.h | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/include/ethernetdb.h b/include/ethernetdb.h -index 46d8bfd1b7e5..1683abe01987 100644 ---- a/include/ethernetdb.h -+++ b/include/ethernetdb.h -@@ -38,21 +38,20 @@ struct ethertypeent { - - /* Open ethertype data base files and mark them as staying open even - after a later search if STAY_OPEN is non-zero. */ --extern void setethertypeent(int __stay_open) __THROW; -+extern void setethertypeent(int __stay_open); - - /* Close ethertype data base files and clear `stay open' flag. */ --extern void endethertypeent(void) __THROW; -+extern void endethertypeent(void); - - /* Get next entry from ethertype data base file. Open data base if - necessary. */ --extern struct ethertypeent *getethertypeent(void) __THROW; -+extern struct ethertypeent *getethertypeent(void); - - /* Return entry from ethertype data base for network with NAME. */ --extern struct ethertypeent *getethertypebyname(__const char *__name) -- __THROW; -+extern struct ethertypeent *getethertypebyname(__const char *__name); - - /* Return entry from ethertype data base which number is PROTO. */ --extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; -+extern struct ethertypeent *getethertypebynumber(int __ethertype); - - - #endif /* ethernetdb.h */ --- -2.11.0 - diff --git a/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch b/package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch similarity index 91% rename from package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch rename to package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch index 687eb6a373..525e8a28b5 100644 --- a/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch +++ b/package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch @@ -16,6 +16,10 @@ Upstream: https://github.com/openembedded/meta-openembedded/commit/7f723007364ba79de05447671e83d4eefb3097dc Signed-off-by: Matthew Weber +[ryanbarnett3@gmail.com: + - changed EBTABLES executable to /usr/sbin/ebtables-legacy +] +Signed-off-by: Ryan Barnett --- ebtables-save.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) @@ -29,7 +33,7 @@ index 0000000..2d7fc4e @@ -0,0 +1,43 @@ +#!/bin/bash + -+EBTABLES="/sbin/ebtables" ++EBTABLES="/usr/sbin/ebtables-legacy" + +[ -x "$EBTABLES" ] || exit 1 + diff --git a/package/ebtables/0002-Fix-musl-compatibility.patch b/package/ebtables/0002-Fix-musl-compatibility.patch deleted file mode 100644 index 5e9f534b46..0000000000 --- a/package/ebtables/0002-Fix-musl-compatibility.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 138e7efdc8cad6453620c6366e6fa5e786593f7f Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 16 Feb 2017 14:41:48 +0200 -Subject: [PATCH] Fix musl compatibility - -Include netinet/ether.h before kernel headers to suppress the conflicting -definition of struct ethhdr. - -Signed-off-by: Baruch Siach ---- -Upstream status: not upstreamable; depends on Buildroot local musl patch ---- - include/ebtables_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/ebtables_u.h b/include/ebtables_u.h -index 35a5bcc54c86..268b1fd599d2 100644 ---- a/include/ebtables_u.h -+++ b/include/ebtables_u.h -@@ -24,6 +24,7 @@ - #ifndef EBTABLES_U_H - #define EBTABLES_U_H - #include -+#include - #include - #include - --- -2.11.0 - diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in index 4fc4b30dec..b98d03b626 100644 --- a/package/ebtables/Config.in +++ b/package/ebtables/Config.in @@ -12,15 +12,11 @@ config BR2_PACKAGE_EBTABLES_UTILS_SAVE bool "ebtables save" depends on BR2_PACKAGE_BASH # runtime help - Install the ebtables-save tool + Install the ebtables-legacy-save tool config BR2_PACKAGE_EBTABLES_UTILS_RESTORE bool "ebtables restore" - depends on !BR2_STATIC_LIBS help - Install the ebtables-restore tool - -comment "ebtables-restore needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS + Install the ebtables-legacy-restore tool endif diff --git a/package/ebtables/ebtables.hash b/package/ebtables/ebtables.hash index f9222b8896..98106b0d60 100644 --- a/package/ebtables/ebtables.hash +++ b/package/ebtables/ebtables.hash @@ -1,3 +1,4 @@ +# ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz.sha256sum +sha256 b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a ebtables-2.0.11.tar.gz # Locally computed -sha256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d ebtables-v2.0.10-4.tar.gz -sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING +sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 117cd5e99e..e8b982206c 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -4,45 +4,31 @@ # ################################################################################ -EBTABLES_VERSION = 2.0.10-4 -EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz +EBTABLES_VERSION = 2.0.11 EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables EBTABLES_LICENSE = GPL-2.0+ EBTABLES_LICENSE_FILES = COPYING -EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static) -EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32) - -define EBTABLES_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \ - CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)" -C $(@D) -endef ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y) define EBTABLES_INSTALL_TARGET_UTILS_SAVE - $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/sbin/ebtables-save + $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save endef -endif -ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_RESTORE),y) -define EBTABLES_INSTALL_TARGET_UTILS_RESTORE - $(INSTALL) -m 0755 -D $(@D)/ebtables-restore $(TARGET_DIR)/sbin/ebtables-restore +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_INSTALL_TARGET_UTILS_SAVE +else +# ebtables-legacy-save is installed by default, thus remove it from target +define EBTABLES_REMOVE_UTILS_SAVE + $(RM) -f $(TARGET_DIR)/usr/sbin/ebtables-legacy-save endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_SAVE endif -ifeq ($(BR2_STATIC_LIBS),y) -define EBTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/static $(TARGET_DIR)/sbin/ebtables -endef -else -define EBTABLES_INSTALL_TARGET_CMDS - $(foreach so,$(wildcard $(@D)/*.so $(@D)/extensions/*.so), \ - $(INSTALL) -m 0755 -D $(so) \ - $(TARGET_DIR)/lib/ebtables/$(notdir $(so)) - ) - $(INSTALL) -m 0755 -D $(@D)/ebtables $(TARGET_DIR)/sbin/ebtables - $(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes - $(EBTABLES_INSTALL_TARGET_UTILS_RESTORE) - $(EBTABLES_INSTALL_TARGET_UTILS_SAVE) +# ebtables-legacy-restore is installed by default, thus remove it if not +# selected +ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_RESTORE),) +define EBTABLES_REMOVE_UTILS_RESTORE + $(RM) -f $(TARGET_DIR)/usr/sbin/ebtables-legacy-restore endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_RESTORE endif -$(eval $(generic-package)) +$(eval $(autotools-package)) From patchwork Mon Apr 27 21:26:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1277968 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=fail (p=none dis=none) header.from=gmail.com 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=L8DZJo1t; 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 499yY62Vxqz9sSd for ; Tue, 28 Apr 2020 07:27:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1CE7322253; Mon, 27 Apr 2020 21:27:34 +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 rkBzDCRLOhlm; Mon, 27 Apr 2020 21:27:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 07B382155C; Mon, 27 Apr 2020 21:27:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 75EB81BF3C6 for ; Mon, 27 Apr 2020 21:27:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7217B2155C for ; Mon, 27 Apr 2020 21:27:31 +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 VXXDyRwoNSve for ; Mon, 27 Apr 2020 21:27:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by silver.osuosl.org (Postfix) with ESMTPS id BED742042C for ; Mon, 27 Apr 2020 21:27:30 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id n143so19730204qkn.8 for ; Mon, 27 Apr 2020 14:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=g4gfvbrQy3qL5o6cL4RXucb3DZiDRgXIFxsIEXSYKmM=; b=L8DZJo1tFmjh3KlpM30lFMtznKgqT8aG1c5ttl4ns7r/KXuC3PssIF7ozAkBoenbqA QFZNaiTW02lJZ8M5b40NB5LK41OaUJemDqriIE9VDPTJrLZb2rvloEIEdKuGXfH3s7rh 555zhyc+wFhRKwIV/SYT7uGNxuXr1XgPpD8cF6EMwO9W5YmEK0SGe2bi5U56JEEWwcL+ kzmbaLToyH3xk17jtiCMwk36qPxYys0DxDBbWndqG5lQaQBV9uiS76vHnOBjX7fIpkkN mqcOPH+53vdCmE2JPFeKmeT4284VLTBznZjY/FBnMJOYkwGwhYr5NJvIWOEL6Addt2Is 9PEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=g4gfvbrQy3qL5o6cL4RXucb3DZiDRgXIFxsIEXSYKmM=; b=H6xm/7ACzCZ0R5cUHmpiJIu8aiGb2Rfuf18MrFhZYEXgDLxdfszJmHoZnNebU8Frwn sp8LhFBB7kGNdv5fItoNJV1m5X/wMN24cmK7BCUs7TEQajMU05EBbwuUKjRt09JiO5b+ KCgpIpMH3S4kjCGaGW//BQHTnHS45O2o4TI3o04PJnb+SULpKtLG7aj3fcf1hoiyRA0J TVHa+nlSv3ULfo2fopt4zueXWsP8Dv6PivBhxSZnCpbx1qjqGuIaO8RWlm/JUMvh00MU QaJcupXbxi0v1+KifJM+wUhJYAEBZti7Llu+TSEYRPg6Mvyo3lX/uq/wu/AVmMsowF4t BFKw== X-Gm-Message-State: AGi0PuZb6p8bMuIjSe4aipxLhSiE7NJrNoO3x9UoPuHwxjJlY6JERFvF xNNj6R5Mc3HABlHsnmpjej5t7a78n5dagg== X-Google-Smtp-Source: APiQypLp23+WLLlmVx4iI/m9mTmMGGjpKh2ors5Gq9WzViXFMkprQLXrN7lKfaVfBYbMW2xIxEf3pQ== X-Received: by 2002:a37:71c4:: with SMTP id m187mr23863374qkc.4.1588022849417; Mon, 27 Apr 2020 14:27:29 -0700 (PDT) Received: from ryan-pc.birdiebarn.net (50-83-38-60.client.mchsi.com. [50.83.38.60]) by smtp.gmail.com with ESMTPSA id u26sm11695332qkm.125.2020.04.27.14.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 14:27:26 -0700 (PDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Mon, 27 Apr 2020 16:26:53 -0500 Message-Id: <20200427212653.29933-2-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200427212653.29933-1-ryanbarnett3@gmail.com> References: <20200427212653.29933-1-ryanbarnett3@gmail.com> Subject: [Buildroot] [PATCH v2 2/2] package/ebtables: select bash when installing ebtables-legacy-save 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: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" To allow easier installation of ebtables-legacy-save from the config menu, select BR2_PACKAGE_BASH. All dependencies of bash are met already by ebtables depending on BR2_USE_MMU. Signed-off-by: Ryan Barnett Tested-by: Markus Mayer --- Changes v1 -> v2: - new patch to series --- package/ebtables/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in index b98d03b626..703e55a3c3 100644 --- a/package/ebtables/Config.in +++ b/package/ebtables/Config.in @@ -10,7 +10,8 @@ if BR2_PACKAGE_EBTABLES config BR2_PACKAGE_EBTABLES_UTILS_SAVE bool "ebtables save" - depends on BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash help Install the ebtables-legacy-save tool