jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/netsniff-ng: allow to build with uclibc but w/o mausezahn

Browse Source 
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 <vadim4j@gmail.com>
[Thomas:
 - use the allbutmausezahn and install_allbutmausezahn targets inside
   of enumerating all the tools in the .mk file
 - stick to a "config" instead of introducing a "menuconfig"]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Vadim Kochan 2019-03-04 10:57:41 +02:00 committed by Thomas Petazzoni
parent 4dcb76b013
commit b0f98d5800
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
package/netsniff-ng/Config.in
View File

@ -1,16 +1,12 @@
config BR2_PACKAGE_NETSNIFF_NG config BR2_PACKAGE_NETSNIFF_NG
bool "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_HEADERS_AT_LEAST_3_0
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
select BR2_PACKAGE_LIBNL select BR2_PACKAGE_LIBNL
select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_LIBCLI
select BR2_PACKAGE_LIBNETFILTER_CONNTRACK select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBURCU
select BR2_PACKAGE_LIBNET
help help
netsniff-ng is a free, performant Linux network analyzer and netsniff-ng is a free, performant Linux network analyzer and
networking toolkit. If you will, the Swiss army knife for networking toolkit. If you will, the Swiss army knife for
@ -18,7 +14,22 @@ config BR2_PACKAGE_NETSNIFF_NG
http://netsniff-ng.org 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_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC \ depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

19
package/netsniff-ng/netsniff-ng.mk
View File

@ -13,9 +13,16 @@ NETSNIFF_NG_LICENSE_FILES = README COPYING
NETSNIFF_NG_CONF_ENV = \ NETSNIFF_NG_CONF_ENV = \
NACL_INC_DIR=/dev/null \ NACL_INC_DIR=/dev/null \
NACL_LIB_DIR=/dev/null NACL_LIB_DIR=/dev/null
NETSNIFF_NG_DEPENDENCIES = \ NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu
libnl libpcap libcli libnetfilter_conntrack \
liburcu libnet ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y)
NETSNIFF_NG_DEPENDENCIES += libcli libnet
NETSNIFF_NG_BUILD_MAKE_TARGET = all
NETSNIFF_NG_INSTALL_MAKE_TARGET = install
else
NETSNIFF_NG_BUILD_MAKE_TARGET = allbutmausezahn
NETSNIFF_NG_INSTALL_MAKE_TARGET = install_allbutmausezahn
endif
ifeq ($(BR2_PACKAGE_GEOIP),y) ifeq ($(BR2_PACKAGE_GEOIP),y)
NETSNIFF_NG_DEPENDENCIES += geoip NETSNIFF_NG_DEPENDENCIES += geoip
@ -41,12 +48,14 @@ define NETSNIFF_NG_CONFIGURE_CMDS
endef endef
define NETSNIFF_NG_BUILD_CMDS 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_BUILD_MAKE_TARGET)
endef endef
define NETSNIFF_NG_INSTALL_TARGET_CMDS define NETSNIFF_NG_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ $(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_INSTALL_MAKE_TARGET)
endef endef
$(eval $(generic-package)) $(eval $(generic-package))