Merge pull request #17 from modelrockettier/master

Update debian URLs and remove libattr from dependencies
This commit is contained in:
koverstreet 2019-01-22 13:34:09 -05:00 committed by GitHub
commit 1c50d258e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 14 deletions

14
INSTALL
View File

@ -1,19 +1,21 @@
Dependencies: Dependencies:
* libattr1 * libaio
* libblkid * libblkid
* libuuid * libkeyutils
* liblz4
* libscrypt * libscrypt
* libsodium * libsodium
* libkeyutils
* liburcu * liburcu
* libuuid
* libzstd
* pkg-config * pkg-config
* zlib1g * zlib1g
On debian, you can install these with On debian, you can install these with
apt install -y pkg-config libblkid-dev uuid-dev libscrypt-dev libsodium-dev apt install -y pkg-config libaio-dev libblkid-dev libkeyutils-dev \
libkeyutils-dev liburcu-dev zlib1g-dev libzstd-dev libattr1-dev liblz4-dev libscrypt-dev libsodium-dev liburcu-dev libzstd-dev \
libaio-dev liblz4-dev uuid-dev zlib1g-dev
Then, just make && make install Then, just make && make install

View File

@ -37,7 +37,13 @@ endif
PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd" PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd"
PKGCONFIG_CFLAGS:=$(shell pkg-config --cflags $(PKGCONFIG_LIBS)) PKGCONFIG_CFLAGS:=$(shell pkg-config --cflags $(PKGCONFIG_LIBS))
ifeq (,$(PKGCONFIG_CFLAGS))
$(error pkg-config error)
endif
PKGCONFIG_LDLIBS:=$(shell pkg-config --libs $(PKGCONFIG_LIBS)) PKGCONFIG_LDLIBS:=$(shell pkg-config --libs $(PKGCONFIG_LIBS))
ifeq (,$(PKGCONFIG_LDLIBS))
$(error pkg-config error (libs))
endif
CFLAGS+=$(PKGCONFIG_CFLAGS) CFLAGS+=$(PKGCONFIG_CFLAGS)
LDLIBS+=$(PKGCONFIG_LDLIBS) LDLIBS+=$(PKGCONFIG_LDLIBS)

8
debian/control vendored
View File

@ -3,10 +3,10 @@ Maintainer: Kent Overstreet <kent.overstreet@gmail.com>
Section: utils Section: utils
Priority: optional Priority: optional
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Build-Depends: debhelper (>= 9), pkg-config, libblkid-dev, uuid-dev, Build-Depends: debhelper (>= 9), pkg-config, libaio-dev, libblkid-dev,
libscrypt-dev, libsodium-dev, libkeyutils-dev, liburcu-dev, zlib1g-dev, libkeyutils-dev, liblz4-dev, libscrypt-dev, libsodium-dev, liburcu-dev,
libattr1-dev, libaio-dev, libzstd-dev libzstd-dev, uuid-dev, zlib1g-dev
Homepage: http://bcache.evilpiepirate.org/ Homepage: https://bcachefs.org/
Package: bcachefs-tools Package: bcachefs-tools
Architecture: linux-any Architecture: linux-any

2
debian/copyright vendored
View File

@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: kmo@daterainc.com Upstream-Contact: kmo@daterainc.com
linux-bcache@vger.kernel.org linux-bcache@vger.kernel.org
Source: http://evilpiepirate.org/git/bcache-tools.git Source: https://evilpiepirate.org/git/bcachefs-tools.git
Files: * Files: *
Copyright: 2013 Kent Overstreet <kmo@daterainc.com> Copyright: 2013 Kent Overstreet <kmo@daterainc.com>

6
debian/watch vendored
View File

@ -1,3 +1,3 @@
version=3 version=4
opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/bcachefs-tools_$1\.tar\.gz/ \
http://evilpiepirate.org/git/bcache-tools.git/refs/ /git/bcache-tools.git/tag/\?id=v(\d[\d.]*) https://github.com/koverstreet/bcachefs-tools/tags .*/v?(\d\S+)\.tar\.gz