From 4a0bc4aef7c96f79e60674fab80fed420ad090a0 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Fri, 30 May 2014 21:25:14 -0400 Subject: [PATCH] add debian package building. closes #11 --- Makefile | 8 +++++--- debian/changelog | 27 +++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 20 ++++++++++++++++++++ debian/copyright | 31 +++++++++++++++++++++++++++++++ debian/docs | 1 + debian/files | 1 + debian/rules | 8 ++++++++ 8 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/files create mode 100755 debian/rules diff --git a/Makefile b/Makefile index eb4127b4..d4744d12 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ help: @echo "usage: make" @echo "make XATTR_AVAILABLE=0 - to build program without xattrs functionality (auto discovered otherwise)" -$(TARGET): changelog obj/obj-stamp $(OBJ) +$(TARGET): obj/obj-stamp $(OBJ) $(CXX) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS) changelog: @@ -96,7 +96,7 @@ install-strip: install uninstall: $(RM) "$(INSTALLTARGET)" -tarball: distclean +tarball: distclean changelog $(eval VERSION := $(shell $(GIT) describe --always --tags --dirty)) $(eval FILENAME := $(TARGET)-$(VERSION)) $(eval TMPDIR := $(shell $(MKTEMP) --tmpdir -d .$(FILENAME).XXXXXXXX)) @@ -106,7 +106,9 @@ tarball: distclean $(RM) -rf $(TMPDIR) deb: - $(GIT) buildpackage + $(eval VERSION := $(shell $(GIT) describe --always --tags --dirty)) + $(GIT) dch --auto --release --new-version="$(VERSION)" + $(GIT) buildpackage --git-ignore-new .PHONY: all clean install help diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..1a7eaab6 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,27 @@ +mergerfs (1.1.0) trusty; urgency=medium + + * initial code commit + * fix building without libattr + * update build instructions in readme + * use {get,list,set}xattr to modify runtime + * use long instead of int to limit possibility of overflow in switch, closes #1 + * add FS_IOC_{GET}VERSION to ioctl + * remove statfs policy + * fs::make_path should check for forward slashes, add if missing + * remove stat'ing of files in readdir. closes #3 + * use eaccess to determine permissions for ffwp. closes #2 + * rework policy code + * add fgetattr. closes #5 + * when readdir's filler returns non-zero return ENOMEM. closes #7 + * enhance Makefile + * further Makefile enhancements + * fix free space calculations. closes #8 + * add debian package building + + -- Antonio SJ Musumeci Fri, 30 May 2014 21:32:19 -0400 + +mergerfs (1.0.0) trusty; urgency=medium + + * Initial commit + + -- Antonio SJ Musumeci Fri, 30 May 2014 21:28:09 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..a94ba3c5 --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: mergerfs +Section: utils +Priority: optional +Maintainer: Antonio SJ Musumeci +Build-Depends: debhelper (>= 8.0.0), + libfuse-dev, + libattr1-dev, + pkg-config +Standards-Version: 3.9.4 +Homepage: http://github.com/trapexit/mergerfs + +Package: mergerfs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libfuse2 +Description: another FUSE union filesystem + mergerfs is similar to mhddfs, unionfs, and aufs. Like mhddfs in that it too + uses FUSE. Like aufs in that it provides multiple policies for how to handle + behavior. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..8dc5c1cd --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mergerfs-1.1.0 +Source: http://github.com/trapexit/mergerfs + +Files: * +Copyright: 2014 Antonio SJ Musumeci +License: MIT + +Files: debian/* +Copyright: 2014 Antonio SJ Musumeci +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +n \ No newline at end of file diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..b43bf86b --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/files b/debian/files new file mode 100644 index 00000000..8991ed0f --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +mergerfs_1.1.0_amd64.deb utils optional diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..218df65d --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@