From owner-svn-ports-all@freebsd.org Wed Aug 17 15:46:26 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83419BBCB30; Wed, 17 Aug 2016 15:46:26 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42CA71ED6; Wed, 17 Aug 2016 15:46:26 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7HFkPoq097269; Wed, 17 Aug 2016 15:46:25 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HFkPBb097265; Wed, 17 Aug 2016 15:46:25 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201608171546.u7HFkPBb097265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: "Conrad E. Meyer" Date: Wed, 17 Aug 2016 15:46:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420357 - in head/sysutils/fusefs-lkl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 15:46:26 -0000 Author: cem (src committer) Date: Wed Aug 17 15:46:24 2016 New Revision: 420357 URL: https://svnweb.freebsd.org/changeset/ports/420357 Log: 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 Added: head/sysutils/fusefs-lkl/files/patch-Makefile - copied, changed from r420356, head/sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile head/sysutils/fusefs-lkl/files/patch-lib_Build (contents, props changed) Deleted: head/sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile Modified: head/sysutils/fusefs-lkl/Makefile head/sysutils/fusefs-lkl/distinfo Modified: head/sysutils/fusefs-lkl/Makefile ============================================================================== --- head/sysutils/fusefs-lkl/Makefile Wed Aug 17 15:42:23 2016 (r420356) +++ head/sysutils/fusefs-lkl/Makefile Wed Aug 17 15:46:24 2016 (r420357) @@ -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 .if ${OSVERSION} < 1100000 -IGNORE= requires FreeBSD CURRENT +IGNORE= requires FreeBSD 11 or newer .endif .include Modified: head/sysutils/fusefs-lkl/distinfo ============================================================================== --- head/sysutils/fusefs-lkl/distinfo Wed Aug 17 15:42:23 2016 (r420356) +++ head/sysutils/fusefs-lkl/distinfo Wed Aug 17 15:46:24 2016 (r420357) @@ -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 Copied and modified: head/sysutils/fusefs-lkl/files/patch-Makefile (from r420356, head/sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile) ============================================================================== --- head/sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile Wed Aug 17 15:42:23 2016 (r420356, copy source) +++ head/sysutils/fusefs-lkl/files/patch-Makefile Wed Aug 17 15:46:24 2016 (r420357) @@ -1,13 +1,13 @@ ---- Makefile 2015-11-17 14:22:24.000000000 -0800 -+++ Makefile 2015-11-17 17:23:27.478293000 -0800 -@@ -40,8 +40,8 @@ - $(AR) -rc $@ $^ +--- 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: -- $(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) +- $(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) - %: %.o - $(CC) -o $@ $^ $(LDFLAGS) + liblkl.a: lib/lkl-in.o lib/lkl.o + $(QUIET_AR)$(AR) -rc $@ $^ Added: head/sysutils/fusefs-lkl/files/patch-lib_Build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-lkl/files/patch-lib_Build Wed Aug 17 15:46:24 2016 (r420357) @@ -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