commit: 439ee110dea289c23f6940833d6f0dfd42db8a56 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Tue Jun 27 15:02:24 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jul 20 18:57:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=439ee110
net-misc/r8125: migrate to linux-mod-r1.eclass Closes: https://bugs.gentoo.org/908704 Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/31642 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> ...25-9.008.00.ebuild => r8125-9.008.00-r1.ebuild} | 29 +++++++++---------- ...25-9.009.01.ebuild => r8125-9.009.01-r1.ebuild} | 29 +++++++++---------- ...25-9.009.02.ebuild => r8125-9.009.02-r1.ebuild} | 29 +++++++++---------- ...25-9.011.01.ebuild => r8125-9.011.01-r1.ebuild} | 33 +++++++++++----------- 4 files changed, 58 insertions(+), 62 deletions(-) diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00-r1.ebuild similarity index 70% rename from net-misc/r8125/r8125-9.008.00.ebuild rename to net-misc/r8125/r8125-9.008.00-r1.ebuild index 378ced667e5b..3779fd117278 100644 --- a/net-misc/r8125/r8125-9.008.00.ebuild +++ b/net-misc/r8125/r8125-9.008.00-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit linux-info linux-mod +inherit linux-mod-r1 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; @@ -16,8 +16,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -MODULE_NAMES="r8125(net:${S}/src)" -BUILD_TARGETS="modules" IUSE="+multi-tx-q ptp +rss use-firmware" PATCHES=( @@ -31,16 +29,17 @@ PATCHES=( CONFIG_CHECK="~!R8169" WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)" - BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)" - BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile } diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01-r1.ebuild similarity index 66% rename from net-misc/r8125/r8125-9.009.01.ebuild rename to net-misc/r8125/r8125-9.009.01-r1.ebuild index d85f17950eeb..87bff3e7fb42 100644 --- a/net-misc/r8125/r8125-9.009.01.ebuild +++ b/net-misc/r8125/r8125-9.009.01-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit linux-info linux-mod +inherit linux-mod-r1 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; @@ -14,8 +14,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -MODULE_NAMES="r8125(net:${S}/src)" -BUILD_TARGETS="modules" IUSE="+multi-tx-q ptp +rss use-firmware" PATCHES=( @@ -28,16 +26,17 @@ PATCHES=( CONFIG_CHECK="~!R8169" WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)" - BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)" - BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile } diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02-r1.ebuild similarity index 63% rename from net-misc/r8125/r8125-9.009.02.ebuild rename to net-misc/r8125/r8125-9.009.02-r1.ebuild index 922d00c7e9d0..61bad3803fde 100644 --- a/net-misc/r8125/r8125-9.009.02.ebuild +++ b/net-misc/r8125/r8125-9.009.02-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit linux-info linux-mod +inherit linux-mod-r1 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; @@ -14,8 +14,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -MODULE_NAMES="r8125(net:${S}/src)" -BUILD_TARGETS="modules" IUSE="+multi-tx-q ptp +rss use-firmware" PATCHES=( @@ -26,16 +24,17 @@ PATCHES=( CONFIG_CHECK="~!R8169" WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)" - BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)" - BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile } diff --git a/net-misc/r8125/r8125-9.011.01.ebuild b/net-misc/r8125/r8125-9.011.01-r1.ebuild similarity index 53% rename from net-misc/r8125/r8125-9.011.01.ebuild rename to net-misc/r8125/r8125-9.011.01-r1.ebuild index bc1351818977..ed61c4d34909 100644 --- a/net-misc/r8125/r8125-9.011.01.ebuild +++ b/net-misc/r8125/r8125-9.011.01-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit linux-info linux-mod +inherit linux-mod-r1 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; @@ -14,8 +14,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -MODULE_NAMES="r8125(net:${S}/src)" -BUILD_TARGETS="modules" IUSE="+multi-tx-q ptp +rss use-firmware" PATCHES=( @@ -25,18 +23,19 @@ PATCHES=( CONFIG_CHECK="~!R8169" WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)" - BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)" - BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" - BUILD_PARAMS+=" ENABLE_PAGE_REUSE=$(usex ptp n y)" # Not compatible with PTP - BUILD_PARAMS+=" ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y)" # Not compatible with PTP -} - -src_install() { - linux-mod_src_install - einstalldocs +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP + ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP + ) + + linux-mod-r1_src_compile }
