svn commit: r473847 - in head/sysutils/fusefs-lkl: . files
Conrad Meyer
cem at FreeBSD.org
Tue Jul 3 16:39:37 UTC 2018
Author: cem (src committer)
Date: Tue Jul 3 16:39:35 2018
New Revision: 473847
URL: https://svnweb.freebsd.org/changeset/ports/473847
Log:
sysutils/fusefs-lkl: update to 4.16
Upstream removed git tags, so the version is based on Linux Makefile and
date of the git revision.
The upstream Makefile no longer accepts specific targets, so the non-FUSE
targets are patched away to prevent them from being built (which fails).
(They are not used by this port.)
Submitted by: Charlie Li <ml AT vishwin.info>
Reviewed by: mat
Sponsored by: Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D16044
Added:
head/sysutils/fusefs-lkl/files/patch-Targets (contents, props changed)
Deleted:
head/sysutils/fusefs-lkl/files/patch-lib_Build
Modified:
head/sysutils/fusefs-lkl/Makefile
head/sysutils/fusefs-lkl/distinfo
head/sysutils/fusefs-lkl/files/patch-Makefile
Modified: head/sysutils/fusefs-lkl/Makefile
==============================================================================
--- head/sysutils/fusefs-lkl/Makefile Tue Jul 3 16:36:03 2018 (r473846)
+++ head/sysutils/fusefs-lkl/Makefile Tue Jul 3 16:39:35 2018 (r473847)
@@ -2,10 +2,7 @@
# $FreeBSD$
PORTNAME= lkl
-DISTVERSIONPREFIX= v
-DISTVERSION= 4.8-493
-PORTREVISION= 4
-DISTVERSIONSUFFIX= -g4b77c32b1a88
+DISTVERSION= 4.16.g20180628
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-
@@ -14,16 +11,19 @@ COMMENT= Full-featured Linux BTRFS, Ext4, XFS as a FUS
LICENSE= GPLv2
-BROKEN= inconsistent kallsyms data
+BUILD_DEPENDS= gnubc>0:math/gnubc \
+ gnustat:sysutils/coreutils \
+ gsed:textproc/gsed
-BUILD_DEPENDS= gnubc>0:math/gnubc
-
-USES= fuse gmake python:build shebangfix
+USES= bison:build fuse gmake python:build shebangfix
SHEBANG_FILES= ../../arch/lkl/scripts/headers_install.py
+BINARY_ALIAS= sed=gsed \
+ stat=gnustat
USE_BINUTILS= yes
USE_GCC= yes
USE_GITHUB= yes
GH_PROJECT= linux
+GH_TAGNAME= 86dd3afb590eccc1903611bdaa8bac87757eb80d
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON=No one has added other architecture ld formats yet
@@ -31,7 +31,6 @@ ONLY_FOR_ARCHS_REASON=No one has added other architect
IGNORE_FreeBSD_10= requires FreeBSD 11 or newer
WRKSRC_SUBDIR= tools/lkl
-ALL_TARGET= lklfuse
MAKE_JOBS_UNSAFE=yes
MAKE_ARGS+= V=1
# Need ports versions of 'bc', 'ld' to build!
Modified: head/sysutils/fusefs-lkl/distinfo
==============================================================================
--- head/sysutils/fusefs-lkl/distinfo Tue Jul 3 16:36:03 2018 (r473846)
+++ head/sysutils/fusefs-lkl/distinfo Tue Jul 3 16:39:35 2018 (r473847)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476438518
-SHA256 (lkl-linux-v4.8-493-g4b77c32b1a88_GH0.tar.gz) = 3b1adae23f1419a8b5c93d9c03bdca7b70df0b15285ab608b76cddb9285fbbba
-SIZE (lkl-linux-v4.8-493-g4b77c32b1a88_GH0.tar.gz) = 143222799
+TIMESTAMP = 1530225787
+SHA256 (lkl-linux-4.16.g20180628-86dd3afb590eccc1903611bdaa8bac87757eb80d_GH0.tar.gz) = d63cccf64ab8938389b0054e3e68ee467100bfc98475b1864ab7dac542d51317
+SIZE (lkl-linux-4.16.g20180628-86dd3afb590eccc1903611bdaa8bac87757eb80d_GH0.tar.gz) = 164254140
Modified: head/sysutils/fusefs-lkl/files/patch-Makefile
==============================================================================
--- head/sysutils/fusefs-lkl/files/patch-Makefile Tue Jul 3 16:36:03 2018 (r473846)
+++ head/sysutils/fusefs-lkl/files/patch-Makefile Tue Jul 3 16:39:35 2018 (r473847)
@@ -1,13 +1,15 @@
---- Makefile.orig 2016-08-16 21:09:03 UTC
+--- Makefile.orig 2018-06-12 22:43:19 UTC
+++ Makefile
-@@ -121,8 +121,8 @@ endif
- $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(patsubst %/,%,$(dir $*)) obj=$(notdir $*)
+@@ -61,10 +61,10 @@ endif
- 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)
+ # rule to build lkl.o
+ $(OUTPUT)lib/lkl.o: bin/stat
+- $(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) $(KCONFIG)
++ $(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) $(KCONFIG)
+ # this workaround is for arm32 linker (ld.gold)
+ $(Q)export PATH=$(srctree)/tools/lkl/bin/:${PATH} ;\
+- $(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(OUTPUT)
++ $(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(OUTPUT)
- liblkl.a: lib/lkl-in.o lib/lkl.o
- $(QUIET_AR)$(AR) -rc $@ $^
+ # rules to link libs
+ $(OUTPUT)%$(SOSUF): LDFLAGS += -shared
Added: head/sysutils/fusefs-lkl/files/patch-Targets
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/fusefs-lkl/files/patch-Targets Tue Jul 3 16:39:35 2018 (r473847)
@@ -0,0 +1,18 @@
+--- Targets.orig 2018-06-12 22:43:19 UTC
++++ Targets
+@@ -10,15 +10,6 @@ LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_ANDR
+ progs-$(LKL_HOST_CONFIG_FUSE) += lklfuse
+ LDLIBS_lklfuse-y := -lfuse
+
+-progs-$(LKL_HOST_CONFIG_ARCHIVE) += fs2tar
+-LDLIBS_fs2tar-y := -larchive
+-LDLIBS_fs2tar-$(LKL_HOST_CONFIG_NEEDS_LARGP) += -largp
+-
+-
+-progs-$(LKL_HOST_CONFIG_ARCHIVE) += cptofs
+-LDLIBS_cptofs-y := -larchive
+-LDLIBS_cptofs-$(LKL_HOST_CONFIG_NEEDS_LARGP) += -largp
+-
+ progs-y += tests/boot
+ progs-y += tests/disk
+ progs-y += tests/net-test
More information about the svn-ports-all
mailing list