commit: f4a2efe6ceac03d126ab832f0798aec80665ed43 Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Sun Mar 9 21:37:35 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Sun Mar 23 01:13:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f4a2efe6
sys-kernel/zenpower3: change fork to koweda one * decide to use this fork since it fix some issues with the unmainted original package * decided to drop Sid127 package since it change the name of module/sensor to zenstats breaking compatiblity with software that uses zenpower. Also I don't have way to check if the zen4/5 support work since I only have zen3 hardware. Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com> sys-kernel/zenpower3/Manifest | 2 +- ...enpower3-use-symlink-to-detect-kernel-version.patch | 18 +++++++++--------- sys-kernel/zenpower3/metadata.xml | 2 +- ...ower3-0.2.0-r1.ebuild => zenpower3-0.2.0-r2.ebuild} | 13 +++++-------- sys-kernel/zenpower3/zenpower3-9999.ebuild | 11 +++++------ 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/sys-kernel/zenpower3/Manifest b/sys-kernel/zenpower3/Manifest index 0f4770070..c3cebb41a 100644 --- a/sys-kernel/zenpower3/Manifest +++ b/sys-kernel/zenpower3/Manifest @@ -1 +1 @@ -DIST zenpower3-0.2.0.tar.gz 14201 BLAKE2B 6adce14eaf4fba98ba942c55dcf6b277f643eae749eecc10b8709fec1289dbf24d5ab6949b1195f0eda60341a284f3932b44d1ead813ba1f5fb0ec91926a3257 SHA512 27ea8d1937b179257efa6138461dce0b3f038db2fa71fe257f17e216a495e34acf6c5b65a4eb68e9386de747055394cde2fd68ee28d511dcbeecad806f9e25ec +DIST zenpower3-0.2.0.tar.gz 14019 BLAKE2B ce7d28f2f5f83fc2e44cbc720855816916b6ad6801c7ccdd8845fd385366c8967b0090ed8f94909e4c2488f0f7e11de6dc66f56b2b72dae988325b76014c9004 SHA512 cf4a930dd7a1f8670cee9f364d57acca17c11726c6ff671bdb6209c0f7ea9af1e7c707cd77b20214fdb38a930cfd1e1e0b59c1d9cc738e1bf0fd8e6ee8302a3f diff --git a/sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch b/sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch index 629c19828..3d3a04f7b 100644 --- a/sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch +++ b/sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch @@ -1,7 +1,7 @@ -From 580c957c1159e38b3b909504652782acc0317deb Mon Sep 17 00:00:00 2001 +From f575836deb3221cde127cb06390dc192d5099455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= <[email protected]> -Date: Sun, 29 Dec 2024 10:56:13 +0000 +Date: Sun, 9 Mar 2025 20:57:53 +0000 Subject: [PATCH] zenpower3: use KV_FULL to detect kernel version. * fix CFLAGS for clang MIME-Version: 1.0 @@ -10,18 +10,18 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Gonçalo Negrier Duarte <[email protected]> --- - Makefile | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) + Makefile | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 72c831c..03cbdc3 100644 +index d108729..37a58ba 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,12 @@ VERSION := 0.2.0 -TARGET := $(shell uname -r) +TARGET := ${KV_FULL} - DKMS_ROOT_PATH := /usr/src/zenstats-$(VERSION) + DKMS_ROOT_PATH := /usr/src/zenpower-$(VERSION) -KBUILD_CFLAGS += -Wimplicit-fallthrough=3 +ifeq ($(CC),clang) @@ -30,8 +30,8 @@ index 72c831c..03cbdc3 100644 + CXXFLAGS += -Wimplicit-fallthrough=3 +endif - KERNEL_MODULES := /lib/modules/$(TARGET) - + KERNEL_MODULES := /lib/modules/$(TARGET) + -- -2.47.1 +2.48.1 diff --git a/sys-kernel/zenpower3/metadata.xml b/sys-kernel/zenpower3/metadata.xml index cdabf4b13..5958e0b21 100644 --- a/sys-kernel/zenpower3/metadata.xml +++ b/sys-kernel/zenpower3/metadata.xml @@ -6,6 +6,6 @@ <email>[email protected]</email> </maintainer> <upstream> - <remote-id type="github">Sid127/zenstats</remote-id> + <remote-id type="github">koweda/zenpower3</remote-id> </upstream> </pkgmetadata> diff --git a/sys-kernel/zenpower3/zenpower3-0.2.0-r1.ebuild b/sys-kernel/zenpower3/zenpower3-0.2.0-r2.ebuild similarity index 67% rename from sys-kernel/zenpower3/zenpower3-0.2.0-r1.ebuild rename to sys-kernel/zenpower3/zenpower3-0.2.0-r2.ebuild index 0b2026437..a7e4064f6 100644 --- a/sys-kernel/zenpower3/zenpower3-0.2.0-r1.ebuild +++ b/sys-kernel/zenpower3/zenpower3-0.2.0-r2.ebuild @@ -2,23 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 +_PN=zenpower inherit linux-mod-r1 -_PN="zenstats" -_P="${_PN}-${PV}" DESCRIPTION="Linux kernel driver for reading sensors of AMD Zen family CPUs" HOMEPAGE=" - https://github.com/Sid127/zenstats + https://github.com/koweda/zenpower3 https://github.com/ocerman/zenpower " if [[ ${PV} == "9999" ]]; then inherit git-r3 # Mantain fork of zenpower3 - EGIT_REPO_URI="https://github.com/Sid127/zenstats"; + EGIT_REPO_URI="https://github.com/koweda/zenpower3"; else - SRC_URI="https://github.com/Sid127/zenstats/archive/v0.1.0.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/zenstats-0.1.0" + SRC_URI="https://github.com/koweda/zenpower3/archive/v0.2.0.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P}" KEYWORDS="~amd64" fi @@ -27,8 +26,6 @@ SLOT="0" CONFIG_CHECK="HWMON PCI AMD_NB" -PATCHES="${FILESDIR}/${PN}-use-symlink-to-detect-kernel-version.patch" - src_compile() { MODULES_MAKEARGS+=( TARGET="${KV_FULL}" diff --git a/sys-kernel/zenpower3/zenpower3-9999.ebuild b/sys-kernel/zenpower3/zenpower3-9999.ebuild index 65825e870..a96cf47a8 100644 --- a/sys-kernel/zenpower3/zenpower3-9999.ebuild +++ b/sys-kernel/zenpower3/zenpower3-9999.ebuild @@ -2,23 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 +_PN=zenpower inherit linux-mod-r1 -_PN="zenstats" -_P="${_PN}-${PV}" DESCRIPTION="Linux kernel driver for reading sensors of AMD Zen family CPUs" HOMEPAGE=" - https://github.com/Sid127/zenstats + https://github.com/koweda/zenpower3 https://github.com/ocerman/zenpower " if [[ ${PV} == "9999" ]]; then inherit git-r3 # Mantain fork of zenpower3 - EGIT_REPO_URI="https://github.com/Sid127/zenstats"; + EGIT_REPO_URI="https://github.com/koweda/zenpower3"; else - SRC_URI="https://github.com/Sid127/zenstats/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${_P}" + SRC_URI="https://github.com/koweda/zenpower3/archive/v0.2.0.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P}" KEYWORDS="~amd64" fi
