From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8656C158009 for ; Mon, 19 Jun 2023 19:13:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA478E085E; Mon, 19 Jun 2023 19:13:21 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87F77E085E for ; Mon, 19 Jun 2023 19:13:21 +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 3DFE9340F3E for ; Mon, 19 Jun 2023 19:13:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FF23A87 for ; Mon, 19 Jun 2023 19:13:18 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1687201985.91ec01b6dba1555f2ada95a63ac2b3d7b2d31885.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vendor-reset/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205-r1.ebuild app-emulation/vendor-reset/vendor-reset-9999.ebuild X-VCS-Directories: app-emulation/vendor-reset/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 91ec01b6dba1555f2ada95a63ac2b3d7b2d31885 X-VCS-Branch: master Date: Mon, 19 Jun 2023 19:13:18 +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: 3271a654-2e7a-492d-a488-7ea66f7b999c X-Archives-Hash: 723eb8ca990b132f135f0a428e7e955c commit: 91ec01b6dba1555f2ada95a63ac2b3d7b2d31885 Author: Nick Sarnie gentoo org> AuthorDate: Mon Jun 19 19:09:46 2023 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Mon Jun 19 19:13:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ec01b6 app-emulation/vendor-reset: Port to linux-mod-r1 Closes: https://bugs.gentoo.org/908696 Signed-off-by: Nick Sarnie gentoo.org> ...build => vendor-reset-0.1.1_pre20221205-r1.ebuild} | 19 +++++++++---------- app-emulation/vendor-reset/vendor-reset-9999.ebuild | 18 ++++++++---------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/app-emulation/vendor-reset/vendor-reset-9999.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205-r1.ebuild similarity index 66% copy from app-emulation/vendor-reset/vendor-reset-9999.ebuild copy to app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205-r1.ebuild index b82d5b15ad5c..81c03b66a2bf 100644 --- a/app-emulation/vendor-reset/vendor-reset-9999.ebuild +++ b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-mod toolchain-funcs +inherit linux-mod-r1 if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git" @@ -22,18 +22,17 @@ SLOT="0" DEPEND="" RDEPEND="${DEPEND}" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" -MODULE_NAMES="vendor-reset(extra)" +CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" -pkg_setup() { - local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" - linux-mod_pkg_setup - BUILD_TARGETS="build" - BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KDIR=${KERNEL_DIR}" +src_compile() { + local modlist=( vendor-reset=extra ) + linux-mod-r1_src_compile } src_install() { - linux-mod_src_install + linux-mod-r1_src_install insinto /etc/modules-load.d/ newins "${FILESDIR}"/modload.conf vendor-reset.conf diff --git a/app-emulation/vendor-reset/vendor-reset-9999.ebuild b/app-emulation/vendor-reset/vendor-reset-9999.ebuild index b82d5b15ad5c..c02b2add3f0b 100644 --- a/app-emulation/vendor-reset/vendor-reset-9999.ebuild +++ b/app-emulation/vendor-reset/vendor-reset-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-mod toolchain-funcs +inherit linux-mod-r1 if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git" @@ -23,17 +23,15 @@ SLOT="0" DEPEND="" RDEPEND="${DEPEND}" -MODULE_NAMES="vendor-reset(extra)" +CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" -pkg_setup() { - local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" - linux-mod_pkg_setup - BUILD_TARGETS="build" - BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KDIR=${KERNEL_DIR}" +src_compile() { + local modlist=( vendor-reset=extra ) + linux-mod-r1_src_compile } src_install() { - linux-mod_src_install + linux-mod-r1_src_install insinto /etc/modules-load.d/ newins "${FILESDIR}"/modload.conf vendor-reset.conf