From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46A081580E0 for ; Sun, 26 Jan 2025 18:18:06 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2D613343499 for ; Sun, 26 Jan 2025 18:18:06 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2DFBE11046F; Sun, 26 Jan 2025 18:18:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 22D7011046F for ; Sun, 26 Jan 2025 18:18:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D08A134347F for ; Sun, 26 Jan 2025 18:18:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38C3FEE8 for ; Sun, 26 Jan 2025 18:18:03 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1737915387.1bba5d466e46ddefc553e7a7183b31244955beaa.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/knem/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/knem/knem-9999.ebuild X-VCS-Directories: sys-cluster/knem/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 1bba5d466e46ddefc553e7a7183b31244955beaa X-VCS-Branch: master Date: Sun, 26 Jan 2025 18:18:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64816ccf-0cec-49e9-a54d-5727fc92ea17 X-Archives-Hash: 95fb3f845a79cce802fe0f62cc374c5d commit: 1bba5d466e46ddefc553e7a7183b31244955beaa Author: Mike Pagano gentoo org> AuthorDate: Mon Jan 20 22:04:23 2025 +0000 Commit: Mike Pagano gentoo org> CommitDate: Sun Jan 26 18:16:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bba5d46 sys-cluster/knem: Update knem to use linux-mod-r1, and drop non-git version Changes: Upstream has decided to stop having release, and will only provide fixes to their git repo. [1] 1. Removed non-git SRC from -9999 ebuild 2. Migrated -9999 ebuild to linux-mod-r1 Bug #908727 3. Minor spelling fix [1] https://knem.gitlabpages.inria.fr/ Signed-off-by: Mike Pagano gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/40234 Signed-off-by: Mike Pagano gentoo.org> sys-cluster/knem/knem-9999.ebuild | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild index d0ff2cda6826..e5270502943d 100644 --- a/sys-cluster/knem/knem-9999.ebuild +++ b/sys-cluster/knem/knem-9999.ebuild @@ -1,19 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -inherit autotools linux-mod linux-info toolchain-funcs udev +inherit autotools git-r3 linux-mod-r1 toolchain-funcs udev DESCRIPTION="High-Performance Intra-Node MPI Communication" -HOMEPAGE="https://knem.gforge.inria.fr/" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://gitlab.inria.fr/knem/knem.git" - inherit git-r3 -else - SRC_URI="https://gitlab.inria.fr/knem/knem/uploads/4a43e3eb860cda2bbd5bf5c7c04a24b6/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +HOMEPAGE="https://knem.gitlabpages.inria.fr/" +EGIT_REPO_URI="https://gitlab.inria.fr/knem/knem.git" LICENSE="GPL-2 LGPL-2" SLOT="0" @@ -26,15 +20,11 @@ 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 + linux-mod-r1_pkg_setup ARCH="$(tc-arch-kernel)" ABI="${KERNEL_ABI}" } @@ -54,10 +44,11 @@ src_configure() { } src_compile() { + local modlist=( knem=misc ) default if use modules; then cd "${S}/driver/linux" - linux-mod_src_compile || die "failed to build driver" + linux-mod-r1_src_compile || die "failed to build driver" fi } @@ -65,10 +56,10 @@ src_install() { default if use modules; then cd "${S}/driver/linux" - linux-mod_src_install || die "failed to install driver" + linux-mod-r1_src_install fi - # Drop funny unneded stuff + # Drop funny unneeded stuff rm "${ED}/usr/sbin/knem_local_install" || die rmdir "${ED}/usr/sbin" || die # install udev rules @@ -77,6 +68,7 @@ src_install() { } pkg_postinst() { + linux-mod-r1_pkg_postinst udev_reload }