summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--vla-warning.patch34
3 files changed, 46 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd553fa564d5..fbf8fbc0b218 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
pkgbase = kvdo-dkms
pkgdesc = A pair of kernel modules which provide pools of deduplicated and/or compressed block storage
pkgver = 6.2.2.24
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/dm-vdo/kvdo
arch = x86_64
license = GPL2
provides = kvdo
source = kvdo-6.2.2.24.tar.gz::https://github.com/dm-vdo/kvdo/archive/6.2.2.24.tar.gz
source = dkms.conf
+ source = vla-warning.patch
sha256sums = 11e3562236ea5b2fbbfc52469f0cc266b2480c8decdda9d5448999d821c79971
sha256sums = 516f60bdb28f7a0cb6c8f1f84c656ee7c6aec8feb393538f227ed515372ac88a
+ sha256sums = a6b9a42ef6c0933ff02fe304f9ab627f045f83abc8ed33cf0b91522096cade0f
pkgname = kvdo-dkms
diff --git a/PKGBUILD b/PKGBUILD
index f74f185f561d..b1dfcb79115b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer: zapp-brannigan <fuerst.reinje@web.de>
+# danhyal <danhyal@gmail.com>
_pkgname=kvdo
pkgname=kvdo-dkms
-pkgrel=1
+pkgrel=2
pkgver=6.2.2.24
pkgdesc='A pair of kernel modules which provide pools of deduplicated and/or compressed block storage'
arch=('x86_64')
@@ -9,12 +10,17 @@ url="https://github.com/dm-vdo/kvdo"
license=('GPL2')
provides=('kvdo')
source=("$_pkgname-$pkgver.tar.gz::https://github.com/dm-vdo/kvdo/archive/$pkgver.tar.gz"
- "dkms.conf")
+ "dkms.conf"
+ "vla-warning.patch")
sha256sums=('11e3562236ea5b2fbbfc52469f0cc266b2480c8decdda9d5448999d821c79971'
- '516f60bdb28f7a0cb6c8f1f84c656ee7c6aec8feb393538f227ed515372ac88a')
+ '516f60bdb28f7a0cb6c8f1f84c656ee7c6aec8feb393538f227ed515372ac88a'
+ 'a6b9a42ef6c0933ff02fe304f9ab627f045f83abc8ed33cf0b91522096cade0f')
package() {
mkdir -p "$pkgdir"/usr/src
cp -r "$_pkgname-$pkgver" "$pkgdir"/usr/src/"$_pkgname-$pkgver"
+ cd "$pkgdir"/usr/src/kvdo-"$pkgver"
+ patch --forward --strip=1 -i "$srcdir"/vla-warning.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
new file mode 100644
index 000000000000..d036868c579a
--- /dev/null
+++ b/vla-warning.patch
@@ -0,0 +1,34 @@
+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) \