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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71B701580FD for ; Sat, 28 Dec 2024 20:08:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6325E0826; Sat, 28 Dec 2024 20:08:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 913FDE0826 for ; Sat, 28 Dec 2024 20:08:14 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D969B33BED4 for ; Sat, 28 Dec 2024 20:08:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55019191A for ; Sat, 28 Dec 2024 20:08:11 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1735354158.e8182c52475e6ab21711ba7121f29f3e73b495de.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-kernel/zenpower3/, sys-kernel/zenpower3/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-kernel/zenpower3/files/zenpower3-9999-use-symlink-to-detect-kernel-version.patch sys-kernel/zenpower3/zenpower3-0.2.0.ebuild sys-kernel/zenpower3/zenpower3-9999.ebuild X-VCS-Directories: sys-kernel/zenpower3/files/ sys-kernel/zenpower3/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: e8182c52475e6ab21711ba7121f29f3e73b495de X-VCS-Branch: master Date: Sat, 28 Dec 2024 20:08:11 +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: e1afd160-39b7-4d99-b852-0e285722ff36 X-Archives-Hash: 37c5c6d22bd153ac15f7d50b97216233 commit: e8182c52475e6ab21711ba7121f29f3e73b495de Author: kernaltrap gmail com> AuthorDate: Sat Dec 28 02:49:18 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sat Dec 28 02:49:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8182c52 sys-kernel/zenpower3: add 9999 package The upstream used in the versioned zenpower3 package is dead. The best fix would be to fallback to live, and use the original upstream (0.2.0 was using a fork of zenpower). Signed-off-by: kernaltrap gmail.com> .../zenpower3-9999-use-symlink-to-detect-kernel-version.patch | 9 +++++++++ sys-kernel/zenpower3/zenpower3-0.2.0.ebuild | 1 - .../{zenpower3-0.2.0.ebuild => zenpower3-9999.ebuild} | 11 ++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/sys-kernel/zenpower3/files/zenpower3-9999-use-symlink-to-detect-kernel-version.patch b/sys-kernel/zenpower3/files/zenpower3-9999-use-symlink-to-detect-kernel-version.patch new file mode 100644 index 000000000..e92abc955 --- /dev/null +++ b/sys-kernel/zenpower3/files/zenpower3-9999-use-symlink-to-detect-kernel-version.patch @@ -0,0 +1,9 @@ +--- a/Makefile 2024-12-27 20:38:15.878880229 -0600 ++++ b/Makefile 2024-12-27 20:38:36.776225483 -0600 +@@ -1,5 +1,5 @@ + VERSION := 0.1.12 +-TARGET := $(shell uname -r) ++TARGET ?= $(shell uname -r) + DKMS_ROOT_PATH := /usr/src/zenpower-$(VERSION) + + KERNEL_MODULES := /lib/modules/$(TARGET) diff --git a/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild b/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild index 906bf5c7c..d9b81129f 100644 --- a/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild +++ b/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild @@ -9,7 +9,6 @@ DESCRIPTION="Linux kernel driver for reading sensors of AMD Zen family CPUs" HOMEPAGE="https://git.exozy.me/a/zenpower3" SRC_URI="https://git.exozy.me/a/zenpower3/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}" - LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" diff --git a/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild b/sys-kernel/zenpower3/zenpower3-9999.ebuild similarity index 70% copy from sys-kernel/zenpower3/zenpower3-0.2.0.ebuild copy to sys-kernel/zenpower3/zenpower3-9999.ebuild index 906bf5c7c..787bed043 100644 --- a/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild +++ b/sys-kernel/zenpower3/zenpower3-9999.ebuild @@ -7,8 +7,14 @@ inherit linux-mod-r1 DESCRIPTION="Linux kernel driver for reading sensors of AMD Zen family CPUs" HOMEPAGE="https://git.exozy.me/a/zenpower3" -SRC_URI="https://git.exozy.me/a/zenpower3/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}" +if [[ ${PV} -eq 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ocerman/zenpower" + S="${WORKDIR}/${PN}-9999" +else + SRC_URI="https://git.exozy.me/a/zenpower3/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}" +fi LICENSE="GPL-2" SLOT="0" @@ -28,6 +34,5 @@ src_compile() { src_install() { linux-mod-r1_src_install - dobin zp_read_debug.sh dodoc README.md }