commit: 91ec01b6dba1555f2ada95a63ac2b3d7b2d31885 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Mon Jun 19 19:09:46 2023 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> 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 <sarnex <AT> 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
