diff options
| author | Henrik Riomar <henrik.riomar@gmail.com> | 2018-12-14 19:43:34 +0100 |
|---|---|---|
| committer | Henrik Riomar <henrik.riomar@gmail.com> | 2018-12-14 19:43:51 +0100 |
| commit | bab7a8c4902b77d1146141b526723a555b79c172 (patch) | |
| tree | 40312c7fad0dd503f6c2aa2be7ac7482eee249ad | |
| parent | 7880cba7b90801db958015f801f09af67160f56e (diff) | |
| download | aports-bab7a8c4902b77d1146141b526723a555b79c172.tar.bz2 aports-bab7a8c4902b77d1146141b526723a555b79c172.tar.xz | |
testing/zfs-prune-snapshots: upgrade to 1.0.1
| -rw-r--r-- | testing/zfs-prune-snapshots/0001-allow-passing-DESTDIR.patch | 36 | ||||
| -rw-r--r-- | testing/zfs-prune-snapshots/APKBUILD | 8 |
2 files changed, 3 insertions, 41 deletions
diff --git a/testing/zfs-prune-snapshots/0001-allow-passing-DESTDIR.patch b/testing/zfs-prune-snapshots/0001-allow-passing-DESTDIR.patch deleted file mode 100644 index 8ff30b26a1..0000000000 --- a/testing/zfs-prune-snapshots/0001-allow-passing-DESTDIR.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6de152a1687ba5c2a5c522280942cd1f7647fc5c Mon Sep 17 00:00:00 2001 -From: Henrik Riomar <henrik.riomar@gmail.com> -Date: Mon, 12 Nov 2018 21:29:10 +0100 -Subject: [PATCH] allow passing $(DESTDIR) - ---- - Makefile | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 271fd1d..af17196 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,13 +20,15 @@ clean: - - .PHONY: install - install: -- cp $(NAME) $(PREFIX)/bin/$(NAME) -- cp man/$(MANPAGE) $(PREFIX)/share/man/man$(MAN_SECTION)/$(MANPAGE) -+ install -d $(DESTDIR)/$(PREFIX)/bin -+ install -d $(DESTDIR)/$(PREFIX)/share/man/man$(MAN_SECTION) -+ install -m 0755 $(NAME) $(DESTDIR)/$(PREFIX)/bin/$(NAME) -+ install -m 0644 man/$(MANPAGE) $(DESTDIR)/$(PREFIX)/share/man/man$(MAN_SECTION)/$(MANPAGE) - - .PHONY: uninstall - uninstall: -- rm -f $(PREFIX)/bin/$(NAME) -- rm -f $(PREFIX)/share/man/man$(MAN_SECTION)/$(MANPAGE) -+ rm -f $(DESTDIR)/$(PREFIX)/bin/$(NAME) -+ rm -f $(DESTDIR)/$(PREFIX)/share/man/man$(MAN_SECTION)/$(MANPAGE) - - .PHONY: check - check: --- -2.19.1 - diff --git a/testing/zfs-prune-snapshots/APKBUILD b/testing/zfs-prune-snapshots/APKBUILD index cf8e31f694..7ba68a9d68 100644 --- a/testing/zfs-prune-snapshots/APKBUILD +++ b/testing/zfs-prune-snapshots/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Henrik Riomar <henrik.riomar@gmail.com> # Maintainer: Henrik Riomar <henrik.riomar@gmail.com> pkgname=zfs-prune-snapshots -pkgver=1.0.0 -pkgrel=1 +pkgver=1.0.1 +pkgrel=0 pkgdesc="Remove snapshots from one or more zpools that match given criteria" url="https://github.com/bahamas10/zfs-prune-snapshots" arch="noarch !armhf !armv7" @@ -11,7 +11,6 @@ depends="bash zfs" subpackages="$pkgname-doc" options="!check" # check() requires shellcheck source="$pkgname-$pkgver.tar.gz::https://github.com/bahamas10/${pkgname}/archive/v${pkgver}.tar.gz - 0001-allow-passing-DESTDIR.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -20,5 +19,4 @@ package() { make install PREFIX="/usr" DESTDIR="$pkgdir" } -sha512sums="4f4b157c93fdfeb2d517ce19622694ca2911bdb6c5735ec126a85b8fa2132752cdd91e8b5a2c79350d0e601c7f91a7d22b60d7e74abbe844b93bc6950d6218ab zfs-prune-snapshots-1.0.0.tar.gz -9d671c39437bf5d83ef734ac0ef1650c1794634903cf8fc25c920b137cc466896bfbfa3b406110c431151534bd393c3b1235f957e58224d0009f7a3076f9160d 0001-allow-passing-DESTDIR.patch" +sha512sums="657b5c187b4097b03c99fd6d31c358ded1181cc580690356ea06f591d72ea0734ac863598c95d18d08bf2f433d6644853e289cf0dab6a0a7209c8aa89cc68063 zfs-prune-snapshots-1.0.1.tar.gz" |