From patchwork Mon Mar 4 08:57:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1051014 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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.b="o7uzFDPL"; 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 44CYb02VJZz9s7T for ; Mon, 4 Mar 2019 19:48:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CC3AB8709D; Mon, 4 Mar 2019 08:48:22 +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 Y5kpPoTagEl5; Mon, 4 Mar 2019 08:48:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 850B786D82; Mon, 4 Mar 2019 08:48:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4E5D61BF831 for ; Mon, 4 Mar 2019 08:48:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B8BB81A5F for ; Mon, 4 Mar 2019 08:48:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i-gYImroR52y for ; Mon, 4 Mar 2019 08:48:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4233B80EC9 for ; Mon, 4 Mar 2019 08:48:18 +0000 (UTC) Received: by mail-lf1-f68.google.com with SMTP id v185so2883937lfa.11 for ; Mon, 04 Mar 2019 00:48:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/48BhT4vYxqvNRPUIcf4XbWtIVwIoZGdw7Voq0H9OsQ=; b=o7uzFDPLIn5ny+XcygI7vxDn9mtx/BMuiaa3NwWNdlEm1e6tvTq3b3Qp30izKlZH11 Jr246VgTH3EJGgOzfYaN/gsWC8QvKFcd9oxwgiS7brXeN9SPllF+7r/x+8hWz+7gzTcA 7pVV5sLqt1FWCDGYcChvwR7QhaZhvT0xRPBI9ra2tLHjt1EImnyAR2ZV0QAmVnYH2R0t gFurjQIkuropBW2+s6BpyxZvG6d4IaBPoKhSrvVQkDHY8fTxgiNy8Jllr9sGFyleDTU/ huKqMDlXyKVj5oex3szg0/SE2CUoVG4R1VHjlA+0sKjITXuZCqSX50xGjTAnB/atZx9/ yX3Q== 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=/48BhT4vYxqvNRPUIcf4XbWtIVwIoZGdw7Voq0H9OsQ=; b=GMV53FkjzZs9AZeZwnFCt8nApS74KQSrzhvqsEKjC+kuEYqjx0cPHHxZSJ6N4XHfTD s5rm4Bpkh8rdZh2yygbLhlc5G92EEsGkPrz7lwOEOQddvXU9FBGkvJtIINA5J1h3Xvx5 JQnEZR8jH2JpCMKjPrUrGm54qnk0qz5H7PCjAWafQWUZ1MoYE5f4YpdvbS2N3qSOze2o dcCHdtAhxcoBkbopX4nXV5UDsxGxi+tUW0WaPCGdtG6D0hmMQzBHrICkPzuyjXB3Wu3Q iQcLtwipX4umuMNF5QFK6G768hKZzhYgA13zEquklWt7JLvXx9aa4sgJac4/F4pePpNh jw/A== X-Gm-Message-State: APjAAAUk8a0CXukSIN3J6dDv6bbm7jV19FRac5rXKvYlJAO9/sTx/28K Mis4FXfipYfph1ZK42rqO6OlsQmn X-Google-Smtp-Source: APXvYqweBvb16QDjXs5AVq8uatlApolc8NxjGrq2CV8WUhTcfkYkypaub1iqB3sJU84s344KGlz+zg== X-Received: by 2002:a19:70a:: with SMTP id 10mr10283093lfh.133.1551689296033; Mon, 04 Mar 2019 00:48:16 -0800 (PST) Received: from vkochan-ThinkPad-T470p.lan ([93.75.250.209]) by smtp.gmail.com with ESMTPSA id z88sm1392456ljb.10.2019.03.04.00.48.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 00:48:15 -0800 (PST) From: Vadim Kochan To: buildroot@buildroot.org Date: Mon, 4 Mar 2019 10:57:41 +0200 Message-Id: <20190304085741.13782-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] package/netsniff-ng: Allow to build with uclibc but w/o mausezahn 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: Vadim Kochan , Joris Lijssens MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" mausezahn can't be build with uclibc because uclibc does not provide ceill() function, so it does not allow to build all netsniff-ng's tools with uclibc. Fix it by moving mausezahn under separate config option, which has own dependencies and packages selection (libnet & libcli). Signed-off-by: Vadim Kochan --- package/netsniff-ng/Config.in | 27 +++++++++++++++++++-------- package/netsniff-ng/netsniff-ng.mk | 16 +++++++++++----- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/package/netsniff-ng/Config.in b/package/netsniff-ng/Config.in index c4803b2fa2..15862ff433 100644 --- a/package/netsniff-ng/Config.in +++ b/package/netsniff-ng/Config.in @@ -1,16 +1,12 @@ -config BR2_PACKAGE_NETSNIFF_NG +menuconfig BR2_PACKAGE_NETSNIFF_NG bool "netsniff-ng" - # Build with uClibc fails due to missing ceill() - depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS select BR2_PACKAGE_LIBNL select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBCLI select BR2_PACKAGE_LIBNETFILTER_CONNTRACK select BR2_PACKAGE_LIBURCU - select BR2_PACKAGE_LIBNET help netsniff-ng is a free, performant Linux network analyzer and networking toolkit. If you will, the Swiss army knife for @@ -18,7 +14,22 @@ config BR2_PACKAGE_NETSNIFF_NG http://netsniff-ng.org -comment "netsniff-ng needs a glibc or musl toolchain w/ threads, headers >= 3.0" +if BR2_PACKAGE_NETSNIFF_NG + +config BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN + bool "mausezahn" + default y + # Build with uClibc fails due to missing ceill() + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_LIBCLI + select BR2_PACKAGE_LIBNET + +comment "mausezahn needs glibc or musl toolchain" + depends on BR2_TOOLCHAIN_USES_UCLIBC + +endif + +comment "netsniff-ng needs a toolchain w/ threads, headers >= 3.0" depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC \ - || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk index 77d8921425..9fe50f10d3 100644 --- a/package/netsniff-ng/netsniff-ng.mk +++ b/package/netsniff-ng/netsniff-ng.mk @@ -13,9 +13,14 @@ NETSNIFF_NG_LICENSE_FILES = README COPYING NETSNIFF_NG_CONF_ENV = \ NACL_INC_DIR=/dev/null \ NACL_LIB_DIR=/dev/null -NETSNIFF_NG_DEPENDENCIES = \ - libnl libpcap libcli libnetfilter_conntrack \ - liburcu libnet +NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu + +NETSNIFF_NG_TOOLS = netsniff-ng trafgen astraceroute flowtop ifpps bpfc curvetun + +ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) +NETSNIFF_NG_DEPENDENCIES += libcli libnet +NETSNIFF_NG_TOOLS += mausezahn +endif ifeq ($(BR2_PACKAGE_GEOIP),y) NETSNIFF_NG_DEPENDENCIES += geoip @@ -41,12 +46,13 @@ define NETSNIFF_NG_CONFIGURE_CMDS endef define NETSNIFF_NG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(NETSNIFF_NG_TOOLS) endef define NETSNIFF_NG_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc install -C $(@D) + PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc install \ + -C $(@D) $(NETSNIFF_NG_TOOLS) endef $(eval $(generic-package))