sysutils/fusefs-lkl: Update to more recent master

This brings us from Linux 4.3.0+ to Linux 4.5.0+.

It also brings in support for extended filesystem options from the LKL project.

Approved by:	mat
Differential Revision:	https://reviews.freebsd.org/D7520

5 files changed, 32 insertions, 20 deletions

diff --git a/sysutils/fusefs-lkl/Makefile b/sysutils/fusefs-lkl/Makefile
index 8993c4b9cda4..7449434ceeaf 100644
--- a/sysutils/fusefs-lkl/Makefile
+++ b/sysutils/fusefs-lkl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lkl
-PORTVERSION=	4.3.0
+PORTVERSION=	4.5.0
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	fusefs-
@@ -20,7 +20,7 @@ USE_BINUTILS=	yes
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	linux
-GH_TAGNAME=	64a367f522c6ec4fbed0193589d7733b06ab7968
+GH_TAGNAME=	e145a5a5bdf4b70753495b5ccd2439a354655341
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=No one has added other architecture ld formats yet
@@ -30,18 +30,18 @@ ALL_TARGET=	lklfuse
 MAKE_JOBS_UNSAFE=yes
 MAKE_ARGS+=	V=1
 # Need ports versions of 'bc', 'ld' to build!
-MAKE_ARGS+=	PATH="${PREFIX}/bin:${PATH}"
+MAKE_ARGS+=	PATH="${LOCALBASE}/bin:${PATH}"
 
 PLIST_FILES=	bin/lklfuse lib/liblkl.a
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lklfuse ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/lib/liblkl.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/liblkl.a ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1100000
-IGNORE=		requires FreeBSD CURRENT
+IGNORE=		requires FreeBSD 11 or newer
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/fusefs-lkl/distinfo b/sysutils/fusefs-lkl/distinfo
index 152c0752a68f..cedda374780a 100644
--- a/sysutils/fusefs-lkl/distinfo
+++ b/sysutils/fusefs-lkl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (lkl-linux-4.3.0-64a367f522c6ec4fbed0193589d7733b06ab7968_GH0.tar.gz) = a0d45aadd13df116ea7496c8107395ae504972bb7c8436bb099b9fd43817b8f5
-SIZE (lkl-linux-4.3.0-64a367f522c6ec4fbed0193589d7733b06ab7968_GH0.tar.gz) = 133474279
+TIMESTAMP = 1471416972
+SHA256 (lkl-linux-4.5.0-e145a5a5bdf4b70753495b5ccd2439a354655341_GH0.tar.gz) = c8b084f1db186d3d3ccd0d304916ef8d0a0daa325f162daf02b74ed99a9c3596
+SIZE (lkl-linux-4.5.0-e145a5a5bdf4b70753495b5ccd2439a354655341_GH0.tar.gz) = 139389769
diff --git a/sysutils/fusefs-lkl/files/patch-Makefile b/sysutils/fusefs-lkl/files/patch-Makefile
new file mode 100644
index 000000000000..77f66aec3129
--- /dev/null
+++ b/sysutils/fusefs-lkl/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	2016-08-16 21:09:03 UTC
++++ Makefile
+@@ -121,8 +121,8 @@ endif
+ 	$(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(patsubst %/,%,$(dir $*)) obj=$(notdir $*)
+ 
+ lib/lkl.o:
+-	$(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) defconfig
+-	$(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(CURDIR)
++	$(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) defconfig
++	$(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(CURDIR)
+ 
+ liblkl.a: lib/lkl-in.o lib/lkl.o
+ 	$(QUIET_AR)$(AR) -rc $@ $^
diff --git a/sysutils/fusefs-lkl/files/patch-lib_Build b/sysutils/fusefs-lkl/files/patch-lib_Build
new file mode 100644
index 000000000000..28b183a23fa5
--- /dev/null
+++ b/sysutils/fusefs-lkl/files/patch-lib_Build
@@ -0,0 +1,11 @@
+--- lib/Build.orig	2016-08-16 21:09:03 UTC
++++ lib/Build
+@@ -13,8 +13,5 @@ lkl-y += dbg.o
+ lkl-y += dbg_handler.o
+ lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net.o
+ lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_fd.o
+-lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_tap.o
+-lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_raw.o
+-lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_macvtap.o
+ lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_DPDK) += virtio_net_dpdk.o
+ lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_VDE) += virtio_net_vde.o
diff --git a/sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile b/sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile
deleted file mode 100644
index 8dd003c478b6..000000000000
--- a/sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile	2015-11-17 14:22:24.000000000 -0800
-+++ Makefile	2015-11-17 17:23:27.478293000 -0800
-@@ -40,8 +40,8 @@
- 	$(AR) -rc $@ $^
- 
- lib/lkl.o:
--	$(MAKE) -C ../.. ARCH=lkl defconfig
--	$(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(PWD)
-+	$(MAKE) -C ../.. ARCH=lkl LDFLAGS= defconfig
-+	$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(PWD)
- 
- %: %.o
- 	$(CC) -o $@ $^ $(LDFLAGS)