From e581891bef447b74b1ac76ee3abf322638f2e202 Mon Sep 17 00:00:00 2001 From: Michael Tuexen Date: Sat, 25 Jul 2015 20:32:27 +0200 Subject: [PATCH 1/4] Use opt_*.h files in the kernel build directory. --- sys/contrib/multistack/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/contrib/multistack/Makefile b/sys/contrib/multistack/Makefile index 7f18946..e0e98ff 100644 --- a/sys/contrib/multistack/Makefile +++ b/sys/contrib/multistack/Makefile @@ -1,13 +1,9 @@ .PATH: . KMOD= multistack SRCS= multistack.c -SRCS+= opt_inet.h opt_inet6.h opt_sctp.h opt_compat.h opt_ipsec.h TARGET!= uname -m IDENT!= uname -i -CFLAGS+= -I$(KSRC) -CFLAGS+= -I../../../sys/ CFLAGS+= -I../../ -CFLAGS+= -I$(KSRC)/sys/$(TARGET)/compile/$(IDENT) -CFLAGS+= $(NMVER) +CFLAGS+= -I$(SYSDIR)/$(TARGET)/compile/$(IDENT) .include From 754f620d461c80a85f2b3b676745e40d62f6d9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=BCxen?= Date: Sat, 25 Jul 2015 20:39:45 +0200 Subject: [PATCH 2/4] Update README.md Fix FreeBSD build instructions. --- README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e36eaf7..10957c9 100644 --- a/README.md +++ b/README.md @@ -50,17 +50,14 @@ For more details, see multistack/examples/pkt-gen.c (a modified version of netma ## How to Build the Code (FreeBSD) -Assuming that the kernel source code directory is `~/head/` use +Assuming that the kernel source code directory is `/home/tuexen/head/` use ```` cd multistack/sys/contrib/multistack -env SYSDIR=~/head/sys make -```` -If you also want SCTP support, you need to do -```` -echo "#define SCTP 1" > opt_sctp.h -env SYSDIR=~/head/sys make +env SYSDIR=/home/tuexen/head/sys make ```` +Please note that you need r285877 or higher of the FreeBSD HEAD sources [(see patch)](https://svnweb.freebsd.org/changeset/base/285877) to get multistack compiling with SCTP support. + ## Author Michio Honda (firstname@netapp.com) From 5e9a623d593eb5604e05e93536daca1f49056953 Mon Sep 17 00:00:00 2001 From: Michael Tuexen Date: Fri, 7 Aug 2015 10:37:58 +0200 Subject: [PATCH 3/4] For Felix to try... --- sys/contrib/multistack/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/multistack/Makefile b/sys/contrib/multistack/Makefile index e0e98ff..bb9a96a 100644 --- a/sys/contrib/multistack/Makefile +++ b/sys/contrib/multistack/Makefile @@ -5,5 +5,5 @@ TARGET!= uname -m IDENT!= uname -i CFLAGS+= -I../../ CFLAGS+= -I$(SYSDIR)/$(TARGET)/compile/$(IDENT) - +CFLAGS+= -I$(SYSDIR)/$(IDENT) .include From 7a38aa2402f25b72282273c3b3f1fa54d92527e7 Mon Sep 17 00:00:00 2001 From: Michael Tuexen Date: Fri, 7 Aug 2015 10:43:59 +0200 Subject: [PATCH 4/4] Next try... --- sys/contrib/multistack/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/multistack/Makefile b/sys/contrib/multistack/Makefile index bb9a96a..e89d26a 100644 --- a/sys/contrib/multistack/Makefile +++ b/sys/contrib/multistack/Makefile @@ -5,5 +5,5 @@ TARGET!= uname -m IDENT!= uname -i CFLAGS+= -I../../ CFLAGS+= -I$(SYSDIR)/$(TARGET)/compile/$(IDENT) -CFLAGS+= -I$(SYSDIR)/$(IDENT) +CFLAGS+= -I/usr/obj/$(SYSDIR)/$(IDENT) .include