From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1661029-garchives=archives.gentoo.org@lists.gentoo.org>
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))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E2AF3159C9B
for <garchives@archives.gentoo.org>; Sun, 11 Aug 2024 20:56:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8DE7AE2B7C;
Sun, 11 Aug 2024 20:56:38 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6AB07E2B58
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Aug 2024 20:56:38 +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 8817F340806
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Aug 2024 20:56:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E41F81EDB
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Aug 2024 20:56:35 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1723409761.df8c8087a90e1123ea8a7e62a10d2be5df9167b1.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-process/atop/atop-2.10.0-r1.ebuild sys-process/atop/atop-2.9.0-r1.ebuild
X-VCS-Directories: sys-process/atop/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: df8c8087a90e1123ea8a7e62a10d2be5df9167b1
X-VCS-Branch: master
Date: Sun, 11 Aug 2024 20:56:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 95951301-0913-471a-a65a-2c56a501840d
X-Archives-Hash: c825fd17dcbb46c8307fea851be22333
commit: df8c8087a90e1123ea8a7e62a10d2be5df9167b1
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Aug 11 20:51:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 20:56:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df8c8087
sys-process/atop: patch out uname usage
Bonus: dies when it finds uname in netatop source
Closes: https://bugs.gentoo.org/919693
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/atop/atop-2.10.0-r1.ebuild | 8 ++++++++
sys-process/atop/atop-2.9.0-r1.ebuild | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/sys-process/atop/atop-2.10.0-r1.ebuild b/sys-process/atop/atop-2.10.0-r1.ebuild
index c9b216bc2e3f..5d3ecf36942a 100644
--- a/sys-process/atop/atop-2.10.0-r1.ebuild
+++ b/sys-process/atop/atop-2.10.0-r1.ebuild
@@ -53,6 +53,14 @@ src_prepare() {
if use modules ; then
cd "${WORKDIR}"/${NETATOP_P} || die
eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
+
+ sed \
+ -e "s#\`uname -r\`#${KV_FULL}#g" \
+ -e "s#\$(shell uname -r)#${KV_FULL}#g" \
+ -i {.,daemon,module}/Makefile || die
+
+ grep -rq "uname -r" && die "found uname calls"
+
cd "${S}" || die
fi
diff --git a/sys-process/atop/atop-2.9.0-r1.ebuild b/sys-process/atop/atop-2.9.0-r1.ebuild
index 313f9ab42b41..b7d49a35cd46 100644
--- a/sys-process/atop/atop-2.9.0-r1.ebuild
+++ b/sys-process/atop/atop-2.9.0-r1.ebuild
@@ -49,6 +49,14 @@ src_prepare() {
if use modules ; then
cd "${WORKDIR}"/${NETATOP_P} || die
eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
+
+ sed \
+ -e "s#\`uname -r\`#${KV_FULL}#g" \
+ -e "s#\$(shell uname -r)#${KV_FULL}#g" \
+ -i {.,daemon,module}/Makefile || die
+
+ grep -rq "uname -r" && die "found uname calls"
+
cd "${S}" || die
fi