global: remove remaining tools references
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
parent
22a1e10487
commit
9b76476d36
|
|
@ -4,7 +4,7 @@ cscope.out
|
|||
*.dwo
|
||||
*.ko
|
||||
*.mod.c
|
||||
src/tools/wg
|
||||
*.a
|
||||
Module.symvers
|
||||
*.cmd
|
||||
.tmp_versions
|
||||
|
|
@ -19,5 +19,5 @@ src/tests/qemu/distfiles/
|
|||
*.id2
|
||||
*.nam
|
||||
*.til
|
||||
*.pro.user
|
||||
.cache.mk
|
||||
src/crypto/zinc/*/*.S
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
shopt -s globstar
|
||||
|
||||
WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../../src/")"
|
||||
WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../src/")"
|
||||
|
||||
for i in "$WG"/**/{*.c,*.h,*.S,*.pl,*.include} "$WG/Kbuild" "$WG/Kconfig"; do
|
||||
[[ $i == "$WG/tools/"* || $i == "$WG/tests/"* ]] && continue
|
||||
[[ $i == "$WG/tests/"* ]] && continue
|
||||
diff -u /dev/null "$i" | sed "s:${WG}:b/net/wireguard:;s:Kbuild:Makefile:"
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
|
||||
|
||||
K="$1"
|
||||
WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../../src/")"
|
||||
WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../src/")"
|
||||
|
||||
if [[ ! -e $K/net/Kconfig ]]; then
|
||||
echo "You must specify the location of kernel sources as the first argument." >&2
|
||||
|
|
|
|||
24
src/Makefile
24
src/Makefile
|
|
@ -12,8 +12,8 @@ DEPMOD ?= depmod
|
|||
|
||||
PWD := $(shell pwd)
|
||||
|
||||
all: module tools
|
||||
debug: module-debug tools-debug
|
||||
all: module
|
||||
debug: module-debug
|
||||
|
||||
ifneq ($(V),1)
|
||||
MAKEFLAGS += --no-print-directory
|
||||
|
|
@ -42,40 +42,30 @@ module-debug: version.h
|
|||
|
||||
clean:
|
||||
@$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
|
||||
@$(MAKE) -C tools clean
|
||||
|
||||
module-install:
|
||||
@$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
|
||||
$(DEPMOD) -a $(KERNELRELEASE)
|
||||
|
||||
install: module-install tools-install
|
||||
install: module-install
|
||||
|
||||
rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
|
||||
DKMS_SOURCES := version.h Makefile Kbuild Kconfig dkms.conf $(filter-out version.h wireguard.mod.c tools/% tests/%,$(call rwildcard,,*.c *.h *.S *.pl *.include))
|
||||
DKMS_SOURCES := version.h Makefile Kbuild Kconfig dkms.conf $(filter-out version.h wireguard.mod.c tests/%,$(call rwildcard,,*.c *.h *.S *.pl *.include))
|
||||
dkms-install: $(DKMS_SOURCES)
|
||||
@$(foreach f,$(DKMS_SOURCES),install -v -m0644 -D $(f) $(DESTDIR)$(DKMSDIR)/$(f);)
|
||||
|
||||
tools:
|
||||
@$(MAKE) -C tools
|
||||
|
||||
tools-debug:
|
||||
@$(MAKE) -C tools V=1 DEBUG_TOOLS=y
|
||||
|
||||
tools-install:
|
||||
@$(MAKE) -C tools install
|
||||
|
||||
style:
|
||||
$(KERNELDIR)/scripts/checkpatch.pl -f --max-line-length=4000 --codespell --color=always $(filter-out wireguard.mod.c,$(wildcard *.c)) $(wildcard *.h) $(wildcard selftest/*.c)
|
||||
|
||||
check: clean
|
||||
scan-build --html-title=WireGuard -maxloop 100 --view --keep-going $(MAKE) module tools CONFIG_WIREGUARD_DEBUG=y C=2 CF="-D__CHECK_ENDIAN__"
|
||||
scan-build --html-title=wireguard-linux-compat -maxloop 100 --view --keep-going $(MAKE) module CONFIG_WIREGUARD_DEBUG=y C=2 CF="-D__CHECK_ENDIAN__"
|
||||
|
||||
coccicheck: clean
|
||||
@$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_WIREGUARD_DEBUG=y coccicheck MODE=report
|
||||
|
||||
cloc:
|
||||
@cloc --skip-uniqueness --by-file --extract-with="$$(readlink -f ../contrib/kernel-tree/filter-compat-defines.sh) >FILE< > \$$(basename >FILE<)" $(filter-out wireguard.mod.c,$(wildcard *.c)) $(wildcard *.h)
|
||||
@cloc --skip-uniqueness --by-file --extract-with="$$(readlink -f ../kernel-tree-scripts/filter-compat-defines.sh) >FILE< > \$$(basename >FILE<)" $(filter-out wireguard.mod.c,$(wildcard *.c)) $(wildcard *.h)
|
||||
|
||||
-include tests/debug.mk
|
||||
|
||||
.PHONY: all module module-debug module-install tools tools-install install dkms-install clean core-cloc check style version.h dkms.conf
|
||||
.PHONY: all module module-debug module-install install dkms-install clean cloc check style version.h dkms.conf
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ insert: debug
|
|||
-sudo insmod wireguard.ko
|
||||
|
||||
test: insert
|
||||
sudo PATH="$(shell pwd)/tools:$$PATH:/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin" ./tests/netns.sh
|
||||
sudo PATH="$$PATH:/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin" ./tests/netns.sh
|
||||
|
||||
test-qemu:
|
||||
$(MAKE) -C tests/qemu
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ endif
|
|||
ARCH := $(firstword $(subst -, ,$(CBUILD)))
|
||||
|
||||
# Set these from the environment to override
|
||||
KERNEL_VERSION ?= 5.4
|
||||
KERNEL_VERSION ?= 5.4.6
|
||||
KERNEL_VERSION := $(KERNEL_VERSION)$(if $(DEBUG_KERNEL),$(if $(findstring -debug,$(KERNEL_VERSION)),,-debug),)
|
||||
BUILD_PATH ?= $(PWD)/../../../qemu-build/$(ARCH)
|
||||
DISTFILES_PATH ?= $(PWD)/distfiles
|
||||
|
|
@ -23,8 +23,7 @@ NR_CPUS ?= 4
|
|||
MIRROR := https://download.wireguard.com/qemu-test/distfiles/
|
||||
|
||||
rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
|
||||
WIREGUARD_SOURCES := ../../Kbuild ../../Kconfig $(filter-out ../../tools/% ../../tests/%,$(call rwildcard,../../,*.c *.h *.S *.pl *.include))
|
||||
TOOLS_SOURCES := $(wildcard ../../tools/*.c ../../tools/*.h ../../uapi/*.h ../../crypto/zinc/curve25519/curve25519-hacl64.c ../../crypto/zinc/curve25519/curve25519-fiat32.c)
|
||||
WIREGUARD_SOURCES := ../../Kbuild ../../Kconfig $(filter-out ../../tests/%,$(call rwildcard,../../,*.c *.h *.S *.pl *.include))
|
||||
|
||||
default: qemu
|
||||
|
||||
|
|
@ -58,6 +57,7 @@ $(eval $(call tar_download,IPROUTE2,iproute2,5.1.0,.tar.gz,https://www.kernel.or
|
|||
$(eval $(call tar_download,IPTABLES,iptables,1.6.1,.tar.bz2,https://www.netfilter.org/projects/iptables/files/))
|
||||
$(eval $(call tar_download,NMAP,nmap,7.60,.tar.bz2,https://nmap.org/dist/))
|
||||
$(eval $(call tar_download,IPUTILS,iputils,s20161105,.tar.gz,https://github.com/iputils/iputils/archive/s20161105.tar.gz/#))
|
||||
$(eval $(call tar_download,WIREGUARD_TOOLS,wireguard-tools,1.0.20191226,.tar.xz,https://git.zx2c4.com/wireguard-tools/snapshot/))
|
||||
|
||||
export CFLAGS ?= -O3 -pipe
|
||||
export LDFLAGS ?=
|
||||
|
|
@ -244,7 +244,7 @@ $(BUILD_PATH)/init-cpio-spec.txt:
|
|||
echo "nod /dev/console 644 0 0 c 5 1" >> $@
|
||||
echo "dir /bin 755 0 0" >> $@
|
||||
echo "file /bin/iperf3 $(IPERF_PATH)/src/iperf3 755 0 0" >> $@
|
||||
echo "file /bin/wg $(BUILD_PATH)/tools/wg 755 0 0" >> $@
|
||||
echo "file /bin/wg $(WIREGUARD_TOOLS_PATH)/src/wg 755 0 0" >> $@
|
||||
echo "file /bin/bash $(BASH_PATH)/bash 755 0 0" >> $@
|
||||
echo "file /bin/ip $(IPROUTE2_PATH)/ip/ip 755 0 0" >> $@
|
||||
echo "file /bin/ss $(IPROUTE2_PATH)/misc/ss 755 0 0" >> $@
|
||||
|
|
@ -285,7 +285,7 @@ $(KERNEL_PATH)/.config: kernel.config arch/$(ARCH).config | $(KERNEL_PATH)/.inst
|
|||
cd $(KERNEL_PATH) && ARCH=$(KERNEL_ARCH) scripts/kconfig/merge_config.sh -n .config minimal.config
|
||||
$(if $(findstring -debug,$(KERNEL_VERSION)),cd $(KERNEL_PATH) && sed -i 's/^EXTRAVERSION =.*/EXTRAVERSION = -debug/' Makefile && ARCH=$(KERNEL_ARCH) scripts/kconfig/merge_config.sh -n .config $(PWD)/debug.config,)
|
||||
|
||||
$(KERNEL_BZIMAGE): $(KERNEL_PATH)/.config $(BUILD_PATH)/init-cpio-spec.txt $(MUSL_PATH)/lib/libc.so $(IPERF_PATH)/src/iperf3 $(BUILD_PATH)/tools/wg $(IPUTILS_PATH)/ping $(BASH_PATH)/bash $(IPROUTE2_PATH)/misc/ss $(IPROUTE2_PATH)/ip/ip $(IPTABLES_PATH)/iptables/xtables-multi $(NMAP_PATH)/ncat/ncat $(BUILD_PATH)/init ../netns.sh $(WIREGUARD_SOURCES) $(TOOLS_SOURCES)
|
||||
$(KERNEL_BZIMAGE): $(KERNEL_PATH)/.config $(BUILD_PATH)/init-cpio-spec.txt $(MUSL_PATH)/lib/libc.so $(IPERF_PATH)/src/iperf3 $(IPUTILS_PATH)/ping $(BASH_PATH)/bash $(IPROUTE2_PATH)/misc/ss $(IPROUTE2_PATH)/ip/ip $(IPTABLES_PATH)/iptables/xtables-multi $(NMAP_PATH)/ncat/ncat $(WIREGUARD_TOOLS_PATH)/src/wg $(BUILD_PATH)/init ../netns.sh
|
||||
LOCALVERSION="" $(MAKE) -C $(KERNEL_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) CC="$(NOPIE_GCC)"
|
||||
|
||||
$(BUILD_PATH)/include/linux/.installed: | $(KERNEL_PATH)/.config
|
||||
|
|
@ -329,11 +329,12 @@ $(LIBMNL_PATH)/src/.libs/libmnl.a: | $(LIBMNL_PATH)/.installed $(USERSPACE_DEPS)
|
|||
$(MAKE) -C $(LIBMNL_PATH)
|
||||
sed -i 's:prefix=.*:prefix=$(LIBMNL_PATH):' $(LIBMNL_PATH)/libmnl.pc
|
||||
|
||||
$(BUILD_PATH)/tools/wg: $(TOOLS_SOURCES) | $(LIBMNL_PATH)/src/.libs/libmnl.a $(USERSPACE_DEPS)
|
||||
mkdir -p $(BUILD_PATH)
|
||||
cp -pr ../../uapi ../../crypto ../../tools $(BUILD_PATH)/
|
||||
$(MAKE) -C $(BUILD_PATH)/tools clean
|
||||
LDFLAGS="$(LDFLAGS) -L$(LIBMNL_PATH)/src/.libs" $(MAKE) -C $(BUILD_PATH)/tools LIBMNL_CFLAGS="-I$(LIBMNL_PATH)/include" LIBMNL_LDLIBS="-lmnl" wg
|
||||
$(WIREGUARD_TOOLS_PATH)/.installed: $(WIREGUARD_TOOLS_TAR)
|
||||
flock -s $<.lock tar -C $(BUILD_PATH) -xf $<
|
||||
touch $@
|
||||
|
||||
$(WIREGUARD_TOOLS_PATH)/src/wg: | $(WIREGUARD_TOOLS_PATH)/.installed $(LIBMNL_PATH)/src/.libs/libmnl.a $(USERSPACE_DEPS)
|
||||
LDFLAGS="$(LDFLAGS) -L$(LIBMNL_PATH)/src/.libs" $(MAKE) -C $(WIREGUARD_TOOLS_PATH)/src LIBMNL_CFLAGS="-I$(LIBMNL_PATH)/include" LIBMNL_LDLIBS="-lmnl" wg
|
||||
$(STRIP) -s $@
|
||||
|
||||
$(BUILD_PATH)/init: init.c | $(USERSPACE_DEPS)
|
||||
|
|
|
|||
Loading…
Reference in New Issue