[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/files/
commit: b721d539f385e781dc8a8583e0c832551bb6b700
Author: Mike Pagano gentoo org>
AuthorDate: Wed Jul 27 11:05:00 2022 +
Commit: Mike Pagano gentoo org>
CommitDate: Wed Jul 27 11:05:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b721d539
sys-cluster/knem: Remove unused patch
Signed-off-by: Mike Pagano gentoo.org>
.../knem/files/knem-1.1.3-setup_timer.patch| 58 --
1 file changed, 58 deletions(-)
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
deleted file mode 100644
index eb418ccc957a..
--- a/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/driver/linux/check_kernel_headers.sh
b/driver/linux/check_kernel_headers.sh
-index b0b9b851c0a1..7afec9fae138 100755
a/driver/linux/check_kernel_headers.sh
-+++ b/driver/linux/check_kernel_headers.sh
-@@ -330,6 +330,19 @@ else
- echo no
- fi
-
-+# timer_setup() added in v4.14-rc3
-+echo -n " checking (in kernel headers) timer_setup() availability ... "
-+if test -e ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
-+ if grep timer_setup ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
-+echo "#define HAVE_TIMER_SETUP 1" >> ${TMP_CHECKS_NAME}
-+echo yes
-+ else
-+echo no
-+ fi
-+else
-+ echo no
-+fi
-+
- # add the footer
- echo "" >> ${TMP_CHECKS_NAME}
- echo "#endif /* __knem_checks_h__ */" >> ${TMP_CHECKS_NAME}
-diff --git a/driver/linux/knem_main.c b/driver/linux/knem_main.c
-index e12aad3c0ea5..ddae2af14449 100644
a/driver/linux/knem_main.c
-+++ b/driver/linux/knem_main.c
-@@ -2610,9 +2610,17 @@ knem_kthread_func(void *data)
-
- #ifdef KNEM_HAVE_DMA_ENGINE
- static void
-+#ifdef HAVE_TIMER_SETUP
-+knem_dmacpy_cleanup_timer_handler(struct timer_list *t)
-+#else
- knem_dmacpy_cleanup_timer_handler(unsigned long data)
-+#endif
- {
-+#ifdef HAVE_TIMER_SETUP
-+ struct knem_context * ctx = from_timer(ctx, t, dmacpy_cleanup_timer);
-+#else
- struct knem_context * ctx = (void *) data;
-+#endif
-
- wake_up(>kthread_work_wq);
- knem_counter_inc(DMACPY_CLEANUP_TIMEOUT);
-@@ -2665,7 +2673,11 @@ knem_miscdev_open(struct inode * inode, struct file *
file)
- if (ctx->dmacpy_chan) {
- INIT_LIST_HEAD(>dmacpy_cleanup_work_list);
- spin_lock_init(>dmacpy_cleanup_work_lock);
-+#ifdef HAVE_TIMER_SETUP
-+ timer_setup(>dmacpy_cleanup_timer,
knem_dmacpy_cleanup_timer_handler, 0);
-+#else
- setup_timer(>dmacpy_cleanup_timer,
knem_dmacpy_cleanup_timer_handler, (unsigned long) ctx);
-+#endif
- #if (defined CONFIG_NUMA) && (defined KNEM_HAVE_CPUMASK_OF_NODE)
- {
- int node = dev_to_node(ctx->dmacpy_chan->device->dev);
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 74eafbcfd69fe761ba6bc13c66f84fac3089677d
Author: Mike Pagano gentoo org>
AuthorDate: Tue Jul 26 20:06:31 2022 +
Commit: Mike Pagano gentoo org>
CommitDate: Tue Jul 26 20:06:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eafbcf
sys-cluster/knem: add 1.1.4, bump to EAPI 8
With permission from folks in gentoo-cluster, I
have bumped the version of both the package and
the EAPI version.
I did some minimal testing.
Closes: https://bugs.gentoo.org/778755
Signed-off-by: Mike Pagano gentoo.org>
sys-cluster/knem/Manifest | 1 +
sys-cluster/knem/knem-1.1.4.ebuild | 85 ++
2 files changed, 86 insertions(+)
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index b258d70ac673..311a0e0c71ab 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1 +1,2 @@
DIST knem-1.1.3.tar.gz 330109 BLAKE2B
0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51
SHA512
ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb
+DIST knem-1.1.4.tar.gz 336148 BLAKE2B
e7273040c563c63e5e5c1a4a6b822a4b34b6fbb7214a7a37b4ff06f23aa47fe80c55ed1781ce85d974ed7e53059b509db98a94baaa7bddfc8860d503cf89869d
SHA512
4f142a910ac51a590952aa1f36010fc2a1361162a0d5fd98f47d1c90dedbb293d56bd990bded5d4ec91fcc8df3fa3bcf0d126651b5868c557ffb9f3a588cb948
diff --git a/sys-cluster/knem/knem-1.1.4.ebuild
b/sys-cluster/knem/knem-1.1.4.ebuild
new file mode 100644
index ..a5299c2ab493
--- /dev/null
+++ b/sys-cluster/knem/knem-1.1.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools linux-mod linux-info toolchain-funcs udev
+
+DESCRIPTION="High-Performance Intra-Node MPI Communication"
+HOMEPAGE="https://knem.gforge.inria.fr/;
+if [[ ${PV} == "" ]] ; then
+ EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git;
+ inherit git-r3
+else
+
SRC_URI="https://gitlab.inria.fr/knem/knem/uploads/4a43e3eb860cda2bbd5bf5c7c04a24b6/${P}.tar.gz;
+ KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="debug modules"
+
+DEPEND="
+ sys-apps/hwloc:=
+ virtual/linux-sources"
+RDEPEND="
+ sys-apps/hwloc:=
+ sys-apps/kmod[tools]"
+
+MODULE_NAMES="knem(misc:${S}/driver/linux)"
+BUILD_TARGETS="all"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ CONFIG_CHECK="DMA_ENGINE"
+ check_extra_config
+ linux-mod_pkg_setup
+ ARCH="$(tc-arch-kernel)"
+ ABI="${KERNEL_ABI}"
+}
+
+src_prepare() {
+ sed 's:driver/linux::g' -i Makefile.am
+ eautoreconf
+ default
+}
+
+src_configure() {
+ econf \
+ --enable-hwloc \
+ --with-linux="${KERNEL_DIR}" \
+ --with-linux-release=${KV_FULL} \
+ $(use_enable debug)
+}
+
+src_compile() {
+ default
+ if use modules; then
+ cd "${S}/driver/linux"
+ linux-mod_src_compile || die "failed to build driver"
+ fi
+}
+
+src_install() {
+ default
+ if use modules; then
+ cd "${S}/driver/linux"
+ linux-mod_src_install || die "failed to install driver"
+ fi
+
+ # Drop funny unneded stuff
+ rm "${ED}/usr/sbin/knem_local_install" || die
+ rmdir "${ED}/usr/sbin" || die
+ # install udev rules
+ udev_dorules "${FILESDIR}/45-knem.rules"
+ rm "${ED}/etc/10-knem.rules" || die
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 720a3e9b7e0394e2a22259fb9f51655a3d467317
Author: Mike Pagano gentoo org>
AuthorDate: Tue Jul 26 20:09:07 2022 +
Commit: Mike Pagano gentoo org>
CommitDate: Tue Jul 26 20:09:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720a3e9b
sys-cluster/knem: drop 1.1.3-r3
Signed-off-by: Mike Pagano gentoo.org>
sys-cluster/knem/Manifest | 1 -
sys-cluster/knem/knem-1.1.3-r3.ebuild | 79 ---
2 files changed, 80 deletions(-)
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index 311a0e0c71ab..d9b784b0c468 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1,2 +1 @@
-DIST knem-1.1.3.tar.gz 330109 BLAKE2B
0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51
SHA512
ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb
DIST knem-1.1.4.tar.gz 336148 BLAKE2B
e7273040c563c63e5e5c1a4a6b822a4b34b6fbb7214a7a37b4ff06f23aa47fe80c55ed1781ce85d974ed7e53059b509db98a94baaa7bddfc8860d503cf89869d
SHA512
4f142a910ac51a590952aa1f36010fc2a1361162a0d5fd98f47d1c90dedbb293d56bd990bded5d4ec91fcc8df3fa3bcf0d126651b5868c557ffb9f3a588cb948
diff --git a/sys-cluster/knem/knem-1.1.3-r3.ebuild
b/sys-cluster/knem/knem-1.1.3-r3.ebuild
deleted file mode 100644
index 3241a9c53b13..
--- a/sys-cluster/knem/knem-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-mod linux-info toolchain-funcs udev multilib
-
-DESCRIPTION="High-Performance Intra-Node MPI Communication"
-HOMEPAGE="http://knem.gforge.inria.fr/;
-if [[ ${PV} == "" ]] ; then
- EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git;
- inherit git-r3
-else
- SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz;
- KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="debug modules"
-
-DEPEND="
- sys-apps/hwloc:=
- virtual/linux-sources"
-RDEPEND="
- sys-apps/hwloc:=
- sys-apps/kmod[tools]"
-
-MODULE_NAMES="knem(misc:${S}/driver/linux)"
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-
-PATCHES=( "${FILESDIR}/${P}-setup_timer.patch" )
-
-pkg_setup() {
- linux-info_pkg_setup
- CONFIG_CHECK="DMA_ENGINE"
- check_extra_config
- linux-mod_pkg_setup
- ARCH="$(tc-arch-kernel)"
- ABI="${KERNEL_ABI}"
-}
-
-src_prepare() {
- sed 's:driver/linux::g' -i Makefile.am
- eautoreconf
- default
-}
-
-src_configure() {
- econf \
- --enable-hwloc \
- --with-linux="${KERNEL_DIR}" \
- --with-linux-release=${KV_FULL} \
- $(use_enable debug)
-}
-
-src_compile() {
- default
- if use modules; then
- cd "${S}/driver/linux"
- linux-mod_src_compile || die "failed to build driver"
- fi
-}
-
-src_install() {
- default
- if use modules; then
- cd "${S}/driver/linux"
- linux-mod_src_install || die "failed to install driver"
- fi
-
- # Drop funny unneded stuff
- rm "${ED}/usr/sbin/knem_local_install" || die
- rmdir "${ED}/usr/sbin" || die
- # install udev rules
- udev_dorules "${FILESDIR}/45-knem.rules"
- rm "${ED}/etc/10-knem.rules" || die
-}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 956c2cce202903dc6a2da346b3a0e483a773a2a6
Author: Mike Pagano gentoo org>
AuthorDate: Tue Jul 26 20:08:08 2022 +
Commit: Mike Pagano gentoo org>
CommitDate: Tue Jul 26 20:08:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956c2cce
sys-cluster/knem: update EAPI 6 -> 8
Bumped with ACK from folks in gentoo-cluster.
Fixed SRC urls and home page and handled QA
warnings.
Signed-off-by: Mike Pagano gentoo.org>
sys-cluster/knem/knem-.ebuild | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/sys-cluster/knem/knem-.ebuild
b/sys-cluster/knem/knem-.ebuild
index b87cfd8b81d7..d0ff2cda6826 100644
--- a/sys-cluster/knem/knem-.ebuild
+++ b/sys-cluster/knem/knem-.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="8"
-inherit autotools linux-mod linux-info toolchain-funcs udev multilib
+inherit autotools linux-mod linux-info toolchain-funcs udev
DESCRIPTION="High-Performance Intra-Node MPI Communication"
-HOMEPAGE="http://knem.gforge.inria.fr/;
+HOMEPAGE="https://knem.gforge.inria.fr/;
if [[ ${PV} == "" ]] ; then
- EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git;
+ EGIT_REPO_URI="https://gitlab.inria.fr/knem/knem.git;
inherit git-r3
else
- SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz;
+
SRC_URI="https://gitlab.inria.fr/knem/knem/uploads/4a43e3eb860cda2bbd5bf5c7c04a24b6/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
fi
@@ -75,3 +75,11 @@ src_install() {
udev_dorules "${FILESDIR}/45-knem.rules"
rm "${ED}/etc/10-knem.rules" || die
}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: d2308f31e0da5285fac32f5c60c5bcfb3a0bc1c9
Author: Sam James gentoo org>
AuthorDate: Wed Feb 2 05:33:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 2 05:33:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2308f31
Revert "sys-cluster/knem: Stabilize 1.1.3-r3 amd64, #816579"
Didn't mean to stable this one, fixed pkg list.
This reverts commit 6d7c724246efc00ae4acd221ec4afc0a3279c75e.
Signed-off-by: Sam James gentoo.org>
sys-cluster/knem/knem-1.1.3-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/knem/knem-1.1.3-r3.ebuild
b/sys-cluster/knem/knem-1.1.3-r3.ebuild
index 8a2526c88a42..3241a9c53b13 100644
--- a/sys-cluster/knem/knem-1.1.3-r3.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
else
SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz;
- KEYWORDS="amd64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="GPL-2 LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 6d7c724246efc00ae4acd221ec4afc0a3279c75e
Author: Sam James gentoo org>
AuthorDate: Wed Feb 2 05:30:19 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 2 05:30:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7c7242
sys-cluster/knem: Stabilize 1.1.3-r3 amd64, #816579
Signed-off-by: Sam James gentoo.org>
sys-cluster/knem/knem-1.1.3-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/knem/knem-1.1.3-r3.ebuild
b/sys-cluster/knem/knem-1.1.3-r3.ebuild
index 3241a9c53b13..8a2526c88a42 100644
--- a/sys-cluster/knem/knem-1.1.3-r3.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
else
SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz;
- KEYWORDS="~amd64 ~riscv ~x86"
+ KEYWORDS="amd64 ~riscv ~x86"
fi
LICENSE="GPL-2 LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 43f85589637eb9dc7b6011cdc64afe703519206e
Author: Sam James gentoo org>
AuthorDate: Fri Oct 29 22:39:38 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 29 22:43:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f85589
sys-cluster/knem: add hwloc subslot operator
Signed-off-by: Sam James gentoo.org>
sys-cluster/knem/{knem-1.1.3-r2.ebuild => knem-1.1.3-r3.ebuild} | 4 ++--
sys-cluster/knem/knem-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/knem/knem-1.1.3-r2.ebuild
b/sys-cluster/knem/knem-1.1.3-r3.ebuild
similarity index 97%
rename from sys-cluster/knem/knem-1.1.3-r2.ebuild
rename to sys-cluster/knem/knem-1.1.3-r3.ebuild
index 11a20117f63..3241a9c53b1 100644
--- a/sys-cluster/knem/knem-1.1.3-r2.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r3.ebuild
@@ -20,10 +20,10 @@ SLOT="0"
IUSE="debug modules"
DEPEND="
- sys-apps/hwloc
+ sys-apps/hwloc:=
virtual/linux-sources"
RDEPEND="
- sys-apps/hwloc
+ sys-apps/hwloc:=
sys-apps/kmod[tools]"
MODULE_NAMES="knem(misc:${S}/driver/linux)"
diff --git a/sys-cluster/knem/knem-.ebuild
b/sys-cluster/knem/knem-.ebuild
index e8eb7f91501..b87cfd8b81d 100644
--- a/sys-cluster/knem/knem-.ebuild
+++ b/sys-cluster/knem/knem-.ebuild
@@ -20,10 +20,10 @@ SLOT="0"
IUSE="debug modules"
DEPEND="
- sys-apps/hwloc
+ sys-apps/hwloc:=
virtual/linux-sources"
RDEPEND="
- sys-apps/hwloc
+ sys-apps/hwloc:=
sys-apps/kmod[tools]"
MODULE_NAMES="knem(misc:${S}/driver/linux)"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: e47befc344f1fe99effd47618f92da01c5b5bd15
Author: Marek Szuba gentoo org>
AuthorDate: Tue Aug 24 23:58:36 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Wed Aug 25 00:10:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47befc3
sys-cluster/knem: keyword 1.1.3-r2 for ~riscv
Signed-off-by: Marek Szuba gentoo.org>
sys-cluster/knem/knem-1.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/knem/knem-1.1.3-r2.ebuild
b/sys-cluster/knem/knem-1.1.3-r2.ebuild
index 5eff8ce1fc9..11a20117f63 100644
--- a/sys-cluster/knem/knem-1.1.3-r2.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
else
SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz;
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="GPL-2 LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 0335129fb9aab2d2e1bdefff929e2aa047569543
Author: Sam James gentoo org>
AuthorDate: Sun Feb 14 23:25:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 15 00:32:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0335129f
sys-cluster/knem: fix double KEYWORDS
Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.
See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
sys-cluster/knem/knem-1.1.3-r2.ebuild | 3 +--
sys-cluster/knem/knem-.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/knem/knem-1.1.3-r2.ebuild
b/sys-cluster/knem/knem-1.1.3-r2.ebuild
index 640b8a3486a..5eff8ce1fc9 100644
--- a/sys-cluster/knem/knem-1.1.3-r2.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="http://knem.gforge.inria.fr/;
if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git;
inherit git-r3
- KEYWORDS=""
else
SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
diff --git a/sys-cluster/knem/knem-.ebuild
b/sys-cluster/knem/knem-.ebuild
index 7863b80cb7e..e8eb7f91501 100644
--- a/sys-cluster/knem/knem-.ebuild
+++ b/sys-cluster/knem/knem-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="http://knem.gforge.inria.fr/;
if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git;
inherit git-r3
- KEYWORDS=""
else
SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 79da88ed145b790df858649fb45746234e609ccd
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Aug 8 14:14:15 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Aug 8 14:14:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79da88ed
sys-cluster/knem: migrate to sys-apps/kmod
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada gentoo.org>
sys-cluster/knem/{knem-1.1.3-r1.ebuild => knem-1.1.3-r2.ebuild} | 2 +-
sys-cluster/knem/knem-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/knem/knem-1.1.3-r1.ebuild
b/sys-cluster/knem/knem-1.1.3-r2.ebuild
similarity index 98%
rename from sys-cluster/knem/knem-1.1.3-r1.ebuild
rename to sys-cluster/knem/knem-1.1.3-r2.ebuild
index b0608beda96..640b8a3486a 100644
--- a/sys-cluster/knem/knem-1.1.3-r1.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
virtual/linux-sources"
RDEPEND="
sys-apps/hwloc
- virtual/modutils"
+ sys-apps/kmod[tools]"
MODULE_NAMES="knem(misc:${S}/driver/linux)"
BUILD_TARGETS="all"
diff --git a/sys-cluster/knem/knem-.ebuild
b/sys-cluster/knem/knem-.ebuild
index 6e992263079..7863b80cb7e 100644
--- a/sys-cluster/knem/knem-.ebuild
+++ b/sys-cluster/knem/knem-.ebuild
@@ -25,7 +25,7 @@ DEPEND="
virtual/linux-sources"
RDEPEND="
sys-apps/hwloc
- virtual/modutils"
+ sys-apps/kmod[tools]"
MODULE_NAMES="knem(misc:${S}/driver/linux)"
BUILD_TARGETS="all"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 12ba58c6f7d42072f3d44af52aad4967be9b7e67
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Aug 7 10:59:48 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Aug 8 12:18:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ba58c6
sys-cluster/knem: migrate to sys-apps/kmod
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada gentoo.org>
sys-cluster/knem/{knem-1.1.3.ebuild => knem-1.1.3-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sys-cluster/knem/knem-1.1.3.ebuild
b/sys-cluster/knem/knem-1.1.3-r1.ebuild
similarity index 100%
rename from sys-cluster/knem/knem-1.1.3.ebuild
rename to sys-cluster/knem/knem-1.1.3-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/
commit: 4eee3a32dbcdd71e94f6e499efebd211e1ad0fbc
Author: Alexey Shvetsov gentoo org>
AuthorDate: Mon May 18 08:09:10 2020 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Mon May 18 08:09:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eee3a32
sys-cluster/knem: Update homepage
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Shvetsov gentoo.org>
sys-cluster/knem/knem-1.1.3.ebuild | 6 +++---
sys-cluster/knem/knem-.ebuild | 6 --
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sys-cluster/knem/knem-1.1.3.ebuild
b/sys-cluster/knem/knem-1.1.3.ebuild
index ed55d7b088e..b0608beda96 100644
--- a/sys-cluster/knem/knem-1.1.3.ebuild
+++ b/sys-cluster/knem/knem-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,10 +6,10 @@ EAPI=6
inherit autotools linux-mod linux-info toolchain-funcs udev multilib
DESCRIPTION="High-Performance Intra-Node MPI Communication"
-HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/;
+HOMEPAGE="http://knem.gforge.inria.fr/;
if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git;
- inherit git-2
+ inherit git-r3
KEYWORDS=""
else
SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz;
diff --git a/sys-cluster/knem/knem-.ebuild
b/sys-cluster/knem/knem-.ebuild
index 135aad0a586..6e992263079 100644
--- a/sys-cluster/knem/knem-.ebuild
+++ b/sys-cluster/knem/knem-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit autotools linux-mod linux-info toolchain-funcs udev multilib
DESCRIPTION="High-Performance Intra-Node MPI Communication"
-HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/;
+HOMEPAGE="http://knem.gforge.inria.fr/;
if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git;
inherit git-r3
@@ -33,6 +33,8 @@ BUILD_PARAMS="KDIR=${KERNEL_DIR}"
pkg_setup() {
linux-info_pkg_setup
+ CONFIG_CHECK="DMA_ENGINE"
+ check_extra_config
linux-mod_pkg_setup
ARCH="$(tc-arch-kernel)"
ABI="${KERNEL_ABI}"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/, sys-cluster/knem/files/
commit: 768341030da4acb06798dc0d444ba8ca9dfea5f8
Author: Alexey Shvetsov gentoo org>
AuthorDate: Mon Sep 3 21:04:46 2018 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Mon Sep 3 21:05:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76834103
sys-cluster/knem: Version bump
Closes: https://bugs.gentoo.org/555148
Closes: https://bugs.gentoo.org/560558
Closes: https://bugs.gentoo.org/625688
Closes: https://bugs.gentoo.org/638356
Closes: https://bugs.gentoo.org/649494
Package-Manager: Portage-2.3.47, Repoman-2.3.10
sys-cluster/knem/Manifest | 2 +-
.../knem/files/knem-1.1.3-setup_timer.patch| 58 ++
.../knem/{knem-1.1.1.ebuild => knem-1.1.3.ebuild} | 11 ++--
sys-cluster/knem/knem-.ebuild | 7 +--
4 files changed, 71 insertions(+), 7 deletions(-)
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index a4736fb6353..b258d70ac67 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1 +1 @@
-DIST knem-1.1.1.tar.gz 321401 BLAKE2B
bb3f2bd553aa1aad5b7ede61723aaea625b811564f43efaf395425449e2b61631432ab3f9ceed2f3f104f638a93705919e595436fdbe8e64b4782ce1c98629fc
SHA512
6b53748df8ffcfa400870657d5c121f51e132d2b724bca832b00d7c16c546299d1dd29739fe1d4b00cc33010558ae584e7c0078de2c56d8ea92ce7880b4bfedc
+DIST knem-1.1.3.tar.gz 330109 BLAKE2B
0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51
SHA512
ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb
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
new file mode 100644
index 000..eb418ccc957
--- /dev/null
+++ b/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch
@@ -0,0 +1,58 @@
+diff --git a/driver/linux/check_kernel_headers.sh
b/driver/linux/check_kernel_headers.sh
+index b0b9b851c0a1..7afec9fae138 100755
+--- a/driver/linux/check_kernel_headers.sh
b/driver/linux/check_kernel_headers.sh
+@@ -330,6 +330,19 @@ else
+ echo no
+ fi
+
++# timer_setup() added in v4.14-rc3
++echo -n " checking (in kernel headers) timer_setup() availability ... "
++if test -e ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
++ if grep timer_setup ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
++echo "#define HAVE_TIMER_SETUP 1" >> ${TMP_CHECKS_NAME}
++echo yes
++ else
++echo no
++ fi
++else
++ echo no
++fi
++
+ # add the footer
+ echo "" >> ${TMP_CHECKS_NAME}
+ echo "#endif /* __knem_checks_h__ */" >> ${TMP_CHECKS_NAME}
+diff --git a/driver/linux/knem_main.c b/driver/linux/knem_main.c
+index e12aad3c0ea5..ddae2af14449 100644
+--- a/driver/linux/knem_main.c
b/driver/linux/knem_main.c
+@@ -2610,9 +2610,17 @@ knem_kthread_func(void *data)
+
+ #ifdef KNEM_HAVE_DMA_ENGINE
+ static void
++#ifdef HAVE_TIMER_SETUP
++knem_dmacpy_cleanup_timer_handler(struct timer_list *t)
++#else
+ knem_dmacpy_cleanup_timer_handler(unsigned long data)
++#endif
+ {
++#ifdef HAVE_TIMER_SETUP
++ struct knem_context * ctx = from_timer(ctx, t, dmacpy_cleanup_timer);
++#else
+ struct knem_context * ctx = (void *) data;
++#endif
+
+ wake_up(>kthread_work_wq);
+ knem_counter_inc(DMACPY_CLEANUP_TIMEOUT);
+@@ -2665,7 +2673,11 @@ knem_miscdev_open(struct inode * inode, struct file *
file)
+ if (ctx->dmacpy_chan) {
+ INIT_LIST_HEAD(>dmacpy_cleanup_work_list);
+ spin_lock_init(>dmacpy_cleanup_work_lock);
++#ifdef HAVE_TIMER_SETUP
++ timer_setup(>dmacpy_cleanup_timer,
knem_dmacpy_cleanup_timer_handler, 0);
++#else
+ setup_timer(>dmacpy_cleanup_timer,
knem_dmacpy_cleanup_timer_handler, (unsigned long) ctx);
++#endif
+ #if (defined CONFIG_NUMA) && (defined KNEM_HAVE_CPUMASK_OF_NODE)
+ {
+ int node = dev_to_node(ctx->dmacpy_chan->device->dev);
diff --git a/sys-cluster/knem/knem-1.1.1.ebuild
b/sys-cluster/knem/knem-1.1.3.ebuild
similarity index 86%
rename from sys-cluster/knem/knem-1.1.1.ebuild
rename to sys-cluster/knem/knem-1.1.3.ebuild
index 5de621a022f..ed55d7b088e 100644
--- a/sys-cluster/knem/knem-1.1.1.ebuild
+++ b/sys-cluster/knem/knem-1.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools linux-mod linux-info toolchain-funcs udev multilib
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-2
KEYWORDS=""
else
- SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz;
+ SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
fi
@@ -31,8 +31,12 @@ MODULE_NAMES="knem(misc:${S}/driver/linux)"
