| 1 |
commit: 768341030da4acb06798dc0d444ba8ca9dfea5f8 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 3 21:04:46 2018 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 3 21:05:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76834103 |
| 7 |
|
| 8 |
sys-cluster/knem: Version bump |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/555148 |
| 11 |
Closes: https://bugs.gentoo.org/560558 |
| 12 |
Closes: https://bugs.gentoo.org/625688 |
| 13 |
Closes: https://bugs.gentoo.org/638356 |
| 14 |
Closes: https://bugs.gentoo.org/649494 |
| 15 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
| 16 |
|
| 17 |
sys-cluster/knem/Manifest | 2 +- |
| 18 |
.../knem/files/knem-1.1.3-setup_timer.patch | 58 ++++++++++++++++++++++ |
| 19 |
.../knem/{knem-1.1.1.ebuild => knem-1.1.3.ebuild} | 11 ++-- |
| 20 |
sys-cluster/knem/knem-9999.ebuild | 7 +-- |
| 21 |
4 files changed, 71 insertions(+), 7 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest |
| 24 |
index a4736fb6353..b258d70ac67 100644 |
| 25 |
--- a/sys-cluster/knem/Manifest |
| 26 |
+++ b/sys-cluster/knem/Manifest |
| 27 |
@@ -1 +1 @@ |
| 28 |
-DIST knem-1.1.1.tar.gz 321401 BLAKE2B bb3f2bd553aa1aad5b7ede61723aaea625b811564f43efaf395425449e2b61631432ab3f9ceed2f3f104f638a93705919e595436fdbe8e64b4782ce1c98629fc SHA512 6b53748df8ffcfa400870657d5c121f51e132d2b724bca832b00d7c16c546299d1dd29739fe1d4b00cc33010558ae584e7c0078de2c56d8ea92ce7880b4bfedc |
| 29 |
+DIST knem-1.1.3.tar.gz 330109 BLAKE2B 0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51 SHA512 ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb |
| 30 |
|
| 31 |
diff --git a/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch b/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..eb418ccc957 |
| 34 |
--- /dev/null |
| 35 |
+++ b/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch |
| 36 |
@@ -0,0 +1,58 @@ |
| 37 |
+diff --git a/driver/linux/check_kernel_headers.sh b/driver/linux/check_kernel_headers.sh |
| 38 |
+index b0b9b851c0a1..7afec9fae138 100755 |
| 39 |
+--- a/driver/linux/check_kernel_headers.sh |
| 40 |
++++ b/driver/linux/check_kernel_headers.sh |
| 41 |
+@@ -330,6 +330,19 @@ else |
| 42 |
+ echo no |
| 43 |
+ fi |
| 44 |
+ |
| 45 |
++# timer_setup() added in v4.14-rc3 |
| 46 |
++echo -n " checking (in kernel headers) timer_setup() availability ... " |
| 47 |
++if test -e ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then |
| 48 |
++ if grep timer_setup ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then |
| 49 |
++ echo "#define HAVE_TIMER_SETUP 1" >> ${TMP_CHECKS_NAME} |
| 50 |
++ echo yes |
| 51 |
++ else |
| 52 |
++ echo no |
| 53 |
++ fi |
| 54 |
++else |
| 55 |
++ echo no |
| 56 |
++fi |
| 57 |
++ |
| 58 |
+ # add the footer |
| 59 |
+ echo "" >> ${TMP_CHECKS_NAME} |
| 60 |
+ echo "#endif /* __knem_checks_h__ */" >> ${TMP_CHECKS_NAME} |
| 61 |
+diff --git a/driver/linux/knem_main.c b/driver/linux/knem_main.c |
| 62 |
+index e12aad3c0ea5..ddae2af14449 100644 |
| 63 |
+--- a/driver/linux/knem_main.c |
| 64 |
++++ b/driver/linux/knem_main.c |
| 65 |
+@@ -2610,9 +2610,17 @@ knem_kthread_func(void *data) |
| 66 |
+ |
| 67 |
+ #ifdef KNEM_HAVE_DMA_ENGINE |
| 68 |
+ static void |
| 69 |
++#ifdef HAVE_TIMER_SETUP |
| 70 |
++knem_dmacpy_cleanup_timer_handler(struct timer_list *t) |
| 71 |
++#else |
| 72 |
+ knem_dmacpy_cleanup_timer_handler(unsigned long data) |
| 73 |
++#endif |
| 74 |
+ { |
| 75 |
++#ifdef HAVE_TIMER_SETUP |
| 76 |
++ struct knem_context * ctx = from_timer(ctx, t, dmacpy_cleanup_timer); |
| 77 |
++#else |
| 78 |
+ struct knem_context * ctx = (void *) data; |
| 79 |
++#endif |
| 80 |
+ |
| 81 |
+ wake_up(&ctx->kthread_work_wq); |
| 82 |
+ knem_counter_inc(DMACPY_CLEANUP_TIMEOUT); |
| 83 |
+@@ -2665,7 +2673,11 @@ knem_miscdev_open(struct inode * inode, struct file * file) |
| 84 |
+ if (ctx->dmacpy_chan) { |
| 85 |
+ INIT_LIST_HEAD(&ctx->dmacpy_cleanup_work_list); |
| 86 |
+ spin_lock_init(&ctx->dmacpy_cleanup_work_lock); |
| 87 |
++#ifdef HAVE_TIMER_SETUP |
| 88 |
++ timer_setup(&ctx->dmacpy_cleanup_timer, knem_dmacpy_cleanup_timer_handler, 0); |
| 89 |
++#else |
| 90 |
+ setup_timer(&ctx->dmacpy_cleanup_timer, knem_dmacpy_cleanup_timer_handler, (unsigned long) ctx); |
| 91 |
++#endif |
| 92 |
+ #if (defined CONFIG_NUMA) && (defined KNEM_HAVE_CPUMASK_OF_NODE) |
| 93 |
+ { |
| 94 |
+ int node = dev_to_node(ctx->dmacpy_chan->device->dev); |
| 95 |
|
| 96 |
diff --git a/sys-cluster/knem/knem-1.1.1.ebuild b/sys-cluster/knem/knem-1.1.3.ebuild |
| 97 |
similarity index 86% |
| 98 |
rename from sys-cluster/knem/knem-1.1.1.ebuild |
| 99 |
rename to sys-cluster/knem/knem-1.1.3.ebuild |
| 100 |
index 5de621a022f..ed55d7b088e 100644 |
| 101 |
--- a/sys-cluster/knem/knem-1.1.1.ebuild |
| 102 |
+++ b/sys-cluster/knem/knem-1.1.3.ebuild |
| 103 |
@@ -1,7 +1,7 @@ |
| 104 |
-# Copyright 1999-2014 Gentoo Foundation |
| 105 |
+# Copyright 1999-2018 Gentoo Foundation |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
-EAPI=5 |
| 109 |
+EAPI=6 |
| 110 |
|
| 111 |
inherit autotools linux-mod linux-info toolchain-funcs udev multilib |
| 112 |
|
| 113 |
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 114 |
inherit git-2 |
| 115 |
KEYWORDS="" |
| 116 |
else |
| 117 |
- SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz" |
| 118 |
+ SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz" |
| 119 |
KEYWORDS="~amd64 ~x86" |
| 120 |
fi |
| 121 |
|
| 122 |
@@ -31,8 +31,12 @@ MODULE_NAMES="knem(misc:${S}/driver/linux)" |
| 123 |
BUILD_TARGETS="all" |
| 124 |
BUILD_PARAMS="KDIR=${KERNEL_DIR}" |
| 125 |
|
| 126 |
+PATCHES=( "${FILESDIR}/${P}-setup_timer.patch" ) |
| 127 |
+ |
| 128 |
pkg_setup() { |
| 129 |
linux-info_pkg_setup |
| 130 |
+ CONFIG_CHECK="DMA_ENGINE" |
| 131 |
+ check_extra_config |
| 132 |
linux-mod_pkg_setup |
| 133 |
ARCH="$(tc-arch-kernel)" |
| 134 |
ABI="${KERNEL_ABI}" |
| 135 |
@@ -41,6 +45,7 @@ pkg_setup() { |
| 136 |
src_prepare() { |
| 137 |
sed 's:driver/linux::g' -i Makefile.am |
| 138 |
eautoreconf |
| 139 |
+ default |
| 140 |
} |
| 141 |
|
| 142 |
src_configure() { |
| 143 |
|
| 144 |
diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild |
| 145 |
index 5de621a022f..135aad0a586 100644 |
| 146 |
--- a/sys-cluster/knem/knem-9999.ebuild |
| 147 |
+++ b/sys-cluster/knem/knem-9999.ebuild |
| 148 |
@@ -1,7 +1,7 @@ |
| 149 |
-# Copyright 1999-2014 Gentoo Foundation |
| 150 |
+# Copyright 1999-2018 Gentoo Foundation |
| 151 |
# Distributed under the terms of the GNU General Public License v2 |
| 152 |
|
| 153 |
-EAPI=5 |
| 154 |
+EAPI=6 |
| 155 |
|
| 156 |
inherit autotools linux-mod linux-info toolchain-funcs udev multilib |
| 157 |
|
| 158 |
@@ -9,7 +9,7 @@ DESCRIPTION="High-Performance Intra-Node MPI Communication" |
| 159 |
HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/" |
| 160 |
if [[ ${PV} == "9999" ]] ; then |
| 161 |
EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git" |
| 162 |
- inherit git-2 |
| 163 |
+ inherit git-r3 |
| 164 |
KEYWORDS="" |
| 165 |
else |
| 166 |
SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz" |
| 167 |
@@ -41,6 +41,7 @@ pkg_setup() { |
| 168 |
src_prepare() { |
| 169 |
sed 's:driver/linux::g' -i Makefile.am |
| 170 |
eautoreconf |
| 171 |
+ default |
| 172 |
} |
| 173 |
|
| 174 |
src_configure() { |
Archives