ソースを参照

- add option to turn on SMB dump routines
- honour BR2_INET_IPV6

Bernhard Reutner-Fischer 18 年 前
コミット
3c7d6ae588
2 ファイル変更15 行追加1 行削除
  1. 7 0
      package/tcpdump/Config.in
  2. 8 1
      package/tcpdump/tcpdump.mk

+ 7 - 0
package/tcpdump/Config.in

@@ -7,6 +7,13 @@ config BR2_PACKAGE_TCPDUMP
 
 
 	  http://www.tcpdump.org/
 	  http://www.tcpdump.org/
 
 
+config BR2_PACKAGE_TCPDUMP_SMB
+	bool "smb dump support"
+	default n
+	depends on BR2_PACKAGE_TCPDUMP
+	help
+	  enable possibly-buggy SMB printer
+
 config BR2_PACKAGE_DHCPDUMP
 config BR2_PACKAGE_DHCPDUMP
 	bool "dhcpdump"
 	bool "dhcpdump"
 	default n
 	default n

+ 8 - 1
package/tcpdump/tcpdump.mk

@@ -12,6 +12,12 @@ TCPDUMP_SITE:=http://www.tcpdump.org/release
 TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VERSION).tar.gz
 TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VERSION).tar.gz
 TCPDUMP_CAT:=$(ZCAT)
 TCPDUMP_CAT:=$(ZCAT)
 
 
+ifneq ($(BR2_PACKAGE_TCPDUMP_SMB),y)
+TCPDUMP_ENABLE_SMB:=--disable-smb
+else
+TCPDUMP_ENABLE_SMB:=--enable-smb
+endif
+
 $(DL_DIR)/$(TCPDUMP_SOURCE):
 $(DL_DIR)/$(TCPDUMP_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(TCPDUMP_SITE)/$(TCPDUMP_SOURCE)
 	 $(WGET) -P $(DL_DIR) $(TCPDUMP_SITE)/$(TCPDUMP_SOURCE)
 
 
@@ -37,7 +43,8 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
 		--mandir=/usr/share/man \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--infodir=/usr/share/info \
 		--without-crypto \
 		--without-crypto \
-		--disable-smb \
+		$(TCPDUMP_ENABLE_SMB) \
+		$(DISABLE_IPV6) \
 	)
 	)
 	$(SED) '/HAVE_PCAP_DEBUG/d' $(TCPDUMP_DIR)/config.h
 	$(SED) '/HAVE_PCAP_DEBUG/d' $(TCPDUMP_DIR)/config.h
 	touch $@
 	touch $@