From 6327055e266c25ade91869ac3eacdadfdff70c8c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 16 Jun 2020 17:39:09 +0000 Subject: [PATCH 1/2] INSTALL.md: Remove trailing whitespace git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9023 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 9ec4b3922..9b03148ea 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -29,7 +29,7 @@ or not your Linux distribution supports a package manager: sudo rpm -U $PWD/{,scstadmin/}rpmbuilddir/RPMS/*/*.rpm elif dpkg-query -s libc-bin >/dev/null 2>&1; then sudo apt install build-essential debhelper devscripts gcc make lintian quilt - sudo apt install linux-headers-$(uname -r) || sudo apt install pve-headers-$(uname -r) + sudo apt install linux-headers-$(uname -r) || sudo apt install pve-headers-$(uname -r) make dpkg sudo dpkg -i $PWD/dpkg/{scst,iscsi-scst,scstadmin}_*.deb else From de023fe1fe4c91a3d2734fdc61ec307a2e5cba09 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 16 Jun 2020 17:39:35 +0000 Subject: [PATCH 2/2] scst/include/backport.h: Fix the build against CentOS 8.2 See also https://github.com/bvanassche/scst/issues/25. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9024 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 368360e5d..11d2b9f77 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -891,7 +891,9 @@ static inline bool list_entry_in_list(const struct list_head *entry) * See also commit 108c14858b9e ("locking/lockdep: Add support for dynamic * keys"). */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && \ + (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 || \ + (RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 2)) static inline void lockdep_register_key(struct lock_class_key *key) { }