mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-03 08:27:43 +00:00
move tcpdump from lib to usr/lib, simplify configure, general cleanup
This commit is contained in:
parent
2a1ee531da
commit
8a7a669cd5
@ -1,5 +1,6 @@
|
|||||||
config BR2_PACKAGE_TCPDUMP
|
config BR2_PACKAGE_TCPDUMP
|
||||||
bool "tcpdump"
|
bool "tcpdump"
|
||||||
|
select BR2_PACKAGE_LIBPCAP
|
||||||
default n
|
default n
|
||||||
help
|
help
|
||||||
A tool for network monitoring and data acquisition.
|
A tool for network monitoring and data acquisition.
|
||||||
@ -9,6 +10,6 @@ config BR2_PACKAGE_TCPDUMP
|
|||||||
config BR2_PACKAGE_DHCPDUMP
|
config BR2_PACKAGE_DHCPDUMP
|
||||||
bool "dhcpdump"
|
bool "dhcpdump"
|
||||||
default n
|
default n
|
||||||
depends BR2_PACKAGE_TCPDUMP
|
select BR2_PACKAGE_LIBPCAP
|
||||||
help
|
help
|
||||||
A tool for monitoring dhcp requests using tcpdump.
|
A tool for monitoring dhcp requests using tcpdump.
|
||||||
|
@ -19,7 +19,7 @@ dhcpdump-source: $(DL_DIR)/$(DHCPDUMP_SOURCE)
|
|||||||
|
|
||||||
$(DHCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(DHCPDUMP_SOURCE)
|
$(DHCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(DHCPDUMP_SOURCE)
|
||||||
$(DHCPDUMP_CAT) $(DL_DIR)/$(DHCPDUMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
$(DHCPDUMP_CAT) $(DL_DIR)/$(DHCPDUMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||||
touch $(DHCPDUMP_DIR)/.unpacked
|
touch $@
|
||||||
|
|
||||||
$(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
|
$(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
|
||||||
( \
|
( \
|
||||||
@ -32,31 +32,23 @@ $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
|
|||||||
--host=$(GNU_TARGET_NAME) \
|
--host=$(GNU_TARGET_NAME) \
|
||||||
--build=$(GNU_HOST_NAME) \
|
--build=$(GNU_HOST_NAME) \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--exec-prefix=/usr \
|
|
||||||
--bindir=/usr/bin \
|
|
||||||
--sbindir=/usr/sbin \
|
|
||||||
--libdir=/lib \
|
|
||||||
--libexecdir=/usr/lib \
|
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--datadir=/usr/share \
|
|
||||||
--localstatedir=/var \
|
--localstatedir=/var \
|
||||||
--includedir=/include \
|
--mandir=/usr/share/man \
|
||||||
--mandir=/usr/man \
|
--infodir=/usr/share/info \
|
||||||
--infodir=/usr/info \
|
|
||||||
--with-build-cc="$(HOSTCC)" \
|
|
||||||
)
|
)
|
||||||
touch $(DHCPDUMP_DIR)/.configured
|
touch $@
|
||||||
|
|
||||||
$(DHCPDUMP_DIR)/dhcpdump: $(DHCPDUMP_DIR)/.configured
|
$(DHCPDUMP_DIR)/dhcpdump: $(DHCPDUMP_DIR)/.configured
|
||||||
$(MAKE) CC="$(TARGET_CC)" -C $(DHCPDUMP_DIR)
|
$(MAKE) CC="$(TARGET_CC)" -C $(DHCPDUMP_DIR)
|
||||||
|
|
||||||
$(TARGET_DIR)/sbin/dhcpdump: $(DHCPDUMP_DIR)/dhcpdump
|
$(TARGET_DIR)/usr/sbin/dhcpdump: $(DHCPDUMP_DIR)/dhcpdump
|
||||||
cp -af $< $@
|
cp -af $< $@
|
||||||
|
|
||||||
dhcpdump: uclibc zlib libpcap $(TARGET_DIR)/sbin/dhcpdump
|
dhcpdump: uclibc zlib libpcap $(TARGET_DIR)/usr/sbin/dhcpdump
|
||||||
|
|
||||||
dhcpdump-clean:
|
dhcpdump-clean:
|
||||||
rm -f $(TARGET_DIR)/sbin/dhcpdump
|
rm -f $(TARGET_DIR)/usr/sbin/dhcpdump
|
||||||
-$(MAKE) -C $(DHCPDUMP_DIR) clean
|
-$(MAKE) -C $(DHCPDUMP_DIR) clean
|
||||||
|
|
||||||
dhcpdump-dirclean:
|
dhcpdump-dirclean:
|
||||||
|
@ -34,18 +34,8 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
|
|||||||
--host=$(GNU_TARGET_NAME) \
|
--host=$(GNU_TARGET_NAME) \
|
||||||
--build=$(GNU_HOST_NAME) \
|
--build=$(GNU_HOST_NAME) \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--exec-prefix=/usr \
|
--mandir=/usr/share/man \
|
||||||
--bindir=/usr/bin \
|
--infodir=/usr/share/info \
|
||||||
--sbindir=/usr/sbin \
|
|
||||||
--libdir=/lib \
|
|
||||||
--libexecdir=/usr/lib \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
--datadir=/usr/share \
|
|
||||||
--localstatedir=/var \
|
|
||||||
--includedir=/usr/include \
|
|
||||||
--mandir=/usr/man \
|
|
||||||
--infodir=/usr/info \
|
|
||||||
--with-build-cc="$(HOSTCC)" \
|
|
||||||
--without-crypto \
|
--without-crypto \
|
||||||
--disable-smb \
|
--disable-smb \
|
||||||
)
|
)
|
||||||
@ -54,19 +44,19 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
|
|||||||
|
|
||||||
$(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
|
$(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
|
||||||
$(MAKE) CC="$(TARGET_CC)" \
|
$(MAKE) CC="$(TARGET_CC)" \
|
||||||
LDFLAGS="-L$(STAGING_DIR)/lib" \
|
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
|
||||||
LIBS="-lpcap" \
|
LIBS="-lpcap" \
|
||||||
INCLS="-I. -I$(STAGING_DIR)/usr/include" \
|
INCLS="-I. -I$(STAGING_DIR)/usr/include" \
|
||||||
-C $(TCPDUMP_DIR)
|
-C $(TCPDUMP_DIR)
|
||||||
|
|
||||||
$(TARGET_DIR)/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump
|
$(TARGET_DIR)/usr/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump
|
||||||
cp -f $< $@
|
cp -f $< $@
|
||||||
$(STRIP) -s $@
|
$(STRIP) $@
|
||||||
|
|
||||||
tcpdump: uclibc zlib libpcap $(TARGET_DIR)/sbin/tcpdump
|
tcpdump: uclibc zlib libpcap $(TARGET_DIR)/usr/sbin/tcpdump
|
||||||
|
|
||||||
tcpdump-clean:
|
tcpdump-clean:
|
||||||
rm -f $(TARGET_DIR)/sbin/tcpdump
|
rm -f $(TARGET_DIR)/usr/sbin/tcpdump
|
||||||
-$(MAKE) -C $(TCPDUMP_DIR) clean
|
-$(MAKE) -C $(TCPDUMP_DIR) clean
|
||||||
|
|
||||||
tcpdump-dirclean:
|
tcpdump-dirclean:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user