diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | vla-warning.patch | 34 |
3 files changed, 11 insertions, 50 deletions
@@ -1,18 +1,16 @@ pkgbase = kvdo-dkms - pkgdesc = A pair of kernel modules which provide pools of deduplicated and/or compressed block storage + pkgdesc = A pair of kernel modules which provide pools of deduplicated and/or compressed block storage (semi-official version for latest kernels) pkgver = 6.2.4.26 - pkgrel = 1 - url = https://github.com/dm-vdo/kvdo + pkgrel = 2 + url = https://github.com/rhawalsh/kvdo arch = x86_64 license = GPL2 provides = kvdo - source = kvdo-6.2.4.26.tar.gz::https://github.com/dm-vdo/kvdo/archive/6.2.4.26.tar.gz + source = kvdo-6.2.4.26.tar.gz::https://github.com/rhawalsh/kvdo/archive/6.2.4.26-COPR.tar.gz source = dkms.conf - source = vla-warning.patch source = config_hz.patch - sha256sums = 7bb38310000bc7bc19e7f11875699392bfe8c6fb52c1828e7a7b9b7a27bc8ea4 + sha256sums = 78f0a02aeb69d65010184d836ea3da2b2430cdd480cb58a4793fe4e980371924 sha256sums = 516f60bdb28f7a0cb6c8f1f84c656ee7c6aec8feb393538f227ed515372ac88a - sha256sums = a6b9a42ef6c0933ff02fe304f9ab627f045f83abc8ed33cf0b91522096cade0f sha256sums = 8871d201fef0b4ae8ea4a3459e7a3b375b5d104df110dcbf56c8da929c68b946 pkgname = kvdo-dkms @@ -3,27 +3,24 @@ # jgottula _pkgname=kvdo pkgname=kvdo-dkms -pkgrel=1 +pkgrel=2 pkgver=6.2.4.26 -pkgdesc='A pair of kernel modules which provide pools of deduplicated and/or compressed block storage' +pkgdesc='A pair of kernel modules which provide pools of deduplicated and/or compressed block storage (semi-official version for latest kernels)' arch=('x86_64') -url="https://github.com/dm-vdo/kvdo" +url="https://github.com/rhawalsh/kvdo" license=('GPL2') provides=('kvdo') -source=("$_pkgname-$pkgver.tar.gz::https://github.com/dm-vdo/kvdo/archive/$pkgver.tar.gz" +source=("$_pkgname-$pkgver.tar.gz::https://github.com/rhawalsh/kvdo/archive/$pkgver-COPR.tar.gz" "dkms.conf" - "vla-warning.patch" "config_hz.patch") -sha256sums=('7bb38310000bc7bc19e7f11875699392bfe8c6fb52c1828e7a7b9b7a27bc8ea4' +sha256sums=('78f0a02aeb69d65010184d836ea3da2b2430cdd480cb58a4793fe4e980371924' '516f60bdb28f7a0cb6c8f1f84c656ee7c6aec8feb393538f227ed515372ac88a' - 'a6b9a42ef6c0933ff02fe304f9ab627f045f83abc8ed33cf0b91522096cade0f' '8871d201fef0b4ae8ea4a3459e7a3b375b5d104df110dcbf56c8da929c68b946') package() { mkdir -p "$pkgdir"/usr/src - cp -r "$_pkgname-$pkgver" "$pkgdir"/usr/src/"$_pkgname-$pkgver" + cp -r "$_pkgname-$pkgver-COPR" "$pkgdir"/usr/src/"$_pkgname-$pkgver" cd "$pkgdir"/usr/src/kvdo-"$pkgver" - patch --forward --strip=1 -i "$srcdir"/vla-warning.patch patch --forward --strip=0 -i "$srcdir"/config_hz.patch cd "$srcdir" sed -e "s/@PKGVER@/${pkgver}/" dkms.conf > "$pkgdir"/usr/src/"$_pkgname-$pkgver"/dkms.conf diff --git a/vla-warning.patch b/vla-warning.patch deleted file mode 100644 index d036868c579a..000000000000 --- a/vla-warning.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a06cd41fcf96c7af62a0263e30a0a1cf962fc1ec Mon Sep 17 00:00:00 2001 -From: Andrew Walsh <awalsh@redhat.com> -Date: Fri, 14 Jun 2019 12:25:12 -0400 -Subject: [PATCH] Ignored VLA warnings in the build for UDS and KVDO - ---- - uds/Makefile | 1 + - vdo/Makefile | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/uds/Makefile b/uds/Makefile -index abe679b..5d640d3 100644 ---- a/uds/Makefile -+++ b/uds/Makefile -@@ -10,6 +10,7 @@ EXTRA_CFLAGS = -std=gnu99 \ - -Werror \ - -Wframe-larger-than=400 \ - -Wno-declaration-after-statement \ -+ -Wno-vla \ - -DUDS_VERSION=\"$(UDS_VERSION)\" \ - $(INCLUDES) - -diff --git a/vdo/Makefile b/vdo/Makefile -index 02e488b..1835cac 100644 ---- a/vdo/Makefile -+++ b/vdo/Makefile -@@ -14,6 +14,7 @@ EXTRA_CFLAGS = -std=gnu99 \ - -Werror \ - -Wframe-larger-than=400 \ - -Wno-declaration-after-statement \ -+ -Wno-vla \ - -DVDO_VERSION_MAJOR=$(VDO_VERSION_MAJOR) \ - -DVDO_VERSION_MINOR=$(VDO_VERSION_MINOR) \ - -DVDO_VERSION_MICRO=$(VDO_VERSION_MICRO) \ |