From f35d14415d71433a6735d8fa21f153c94b4e8035 Mon Sep 17 00:00:00 2001 From: Tim Schlueter Date: Mon, 14 Jan 2019 00:04:11 -0800 Subject: [PATCH 1/3] libattr is no longer necessary --- INSTALL | 14 ++++++++------ debian/control | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index c20b7d95..5e22623b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,19 +1,21 @@ Dependencies: - * libattr1 + * libaio * libblkid - * libuuid + * libkeyutils + * liblz4 * libscrypt * libsodium - * libkeyutils * liburcu + * libuuid + * libzstd * pkg-config * zlib1g On debian, you can install these with - apt install -y pkg-config libblkid-dev uuid-dev libscrypt-dev libsodium-dev - libkeyutils-dev liburcu-dev zlib1g-dev libzstd-dev libattr1-dev - libaio-dev liblz4-dev + apt install -y pkg-config libaio-dev libblkid-dev libkeyutils-dev \ + liblz4-dev libscrypt-dev libsodium-dev liburcu-dev libzstd-dev \ + uuid-dev zlib1g-dev Then, just make && make install diff --git a/debian/control b/debian/control index 08673f4b..c8e01e7d 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Maintainer: Kent Overstreet Section: utils Priority: optional Standards-Version: 3.9.5 -Build-Depends: debhelper (>= 9), pkg-config, libblkid-dev, uuid-dev, - libscrypt-dev, libsodium-dev, libkeyutils-dev, liburcu-dev, zlib1g-dev, - libattr1-dev, libaio-dev, libzstd-dev +Build-Depends: debhelper (>= 9), pkg-config, libaio-dev, libblkid-dev, + libkeyutils-dev, liblz4-dev, libscrypt-dev, libsodium-dev, liburcu-dev, + libzstd-dev, uuid-dev, zlib1g-dev Homepage: http://bcache.evilpiepirate.org/ Package: bcachefs-tools From b821144debc8878521e3b9616718329be9e27d51 Mon Sep 17 00:00:00 2001 From: Tim Schlueter Date: Mon, 14 Jan 2019 00:25:02 -0800 Subject: [PATCH 2/3] Abort compilation early if pkg-config fails --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index d9220b98..cffb3c65 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,13 @@ endif PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd" PKGCONFIG_CFLAGS:=$(shell pkg-config --cflags $(PKGCONFIG_LIBS)) +ifeq (,$(PKGCONFIG_CFLAGS)) + $(error pkg-config error) +endif PKGCONFIG_LDLIBS:=$(shell pkg-config --libs $(PKGCONFIG_LIBS)) +ifeq (,$(PKGCONFIG_LDLIBS)) + $(error pkg-config error (libs)) +endif CFLAGS+=$(PKGCONFIG_CFLAGS) LDLIBS+=$(PKGCONFIG_LDLIBS) From 854f7e2dd648a7d33d5453d4ebb015bc00376e27 Mon Sep 17 00:00:00 2001 From: Tim Schlueter Date: Mon, 14 Jan 2019 00:26:32 -0800 Subject: [PATCH 3/3] Updated homepage, repo, and watch urls for debian package --- debian/control | 2 +- debian/copyright | 2 +- debian/watch | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index c8e01e7d..21205042 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.5 Build-Depends: debhelper (>= 9), pkg-config, libaio-dev, libblkid-dev, libkeyutils-dev, liblz4-dev, libscrypt-dev, libsodium-dev, liburcu-dev, libzstd-dev, uuid-dev, zlib1g-dev -Homepage: http://bcache.evilpiepirate.org/ +Homepage: https://bcachefs.org/ Package: bcachefs-tools Architecture: linux-any diff --git a/debian/copyright b/debian/copyright index 1491ae80..e6e051ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: kmo@daterainc.com linux-bcache@vger.kernel.org -Source: http://evilpiepirate.org/git/bcache-tools.git +Source: https://evilpiepirate.org/git/bcachefs-tools.git Files: * Copyright: 2013 Kent Overstreet diff --git a/debian/watch b/debian/watch index f9ca3c6d..a6755b16 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 - -http://evilpiepirate.org/git/bcache-tools.git/refs/ /git/bcache-tools.git/tag/\?id=v(\d[\d.]*) +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/bcachefs-tools_$1\.tar\.gz/ \ + https://github.com/koverstreet/bcachefs-tools/tags .*/v?(\d\S+)\.tar\.gz