[gentoo-commits] repo/proj/guru:dev commit in: sys-power/linux-tools-power-x86/files/, sys-power/linux-tools-power-x86/

2024-05-14 Thread Joe Kappus 
commit: 795b8fd5bed35989ef2520b35d735b72f71ba7d4
Author: Joe Kappus  wt  gd>
AuthorDate: Tue May 14 08:48:54 2024 +
Commit: Joe Kappus  wt  gd>
CommitDate: Tue May 14 08:50:37 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=795b8fd5

sys-power/linux-tools-power-x86: add 6.6, fix cflags

Closes: https://bugs.gentoo.org/901453
Closes: https://bugs.gentoo.org/931485
Signed-off-by: Joe Kappus  wt.gd>

 sys-power/linux-tools-power-x86/Manifest   |  1 +
 ...gs.patch => linux-tools-power-x86-6.6-cflags.patch} | 18 --
 .../linux-tools-power-x86-6.1.ebuild   |  2 +-
 ...x86-6.1.ebuild => linux-tools-power-x86-6.6.ebuild} |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/sys-power/linux-tools-power-x86/Manifest 
b/sys-power/linux-tools-power-x86/Manifest
index ef5ea75ef1..f47107e8b3 100644
--- a/sys-power/linux-tools-power-x86/Manifest
+++ b/sys-power/linux-tools-power-x86/Manifest
@@ -1 +1,2 @@
 DIST linux-6.1.tar.xz 134728520 BLAKE2B 
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
 SHA512 
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
+DIST linux-6.6.tar.xz 140064536 BLAKE2B 
5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
 SHA512 
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35

diff --git 
a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch
similarity index 59%
rename from 
sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch
rename to 
sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch
index 700baa781a..111fb1a888 100644
--- 
a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch
+++ 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch
@@ -1,28 +1,34 @@
+diff --git a/tools/power/x86/intel-speed-select/Makefile 
b/tools/power/x86/intel-speed-select/Makefile
+index 7221f2f55e8b..96b5a456a4c5 100644
 --- a/tools/power/x86/intel-speed-select/Makefile
 +++ b/tools/power/x86/intel-speed-select/Makefile
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ endif
  # Do not use make's built-in rules
  # (this improves performance and avoids hard-to-debug behaviour);
  MAKEFLAGS += -r
 -override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
-+override CFLAGS += -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
++override CFLAGS += -Wall -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
  override LDFLAGS += -lnl-genl-3 -lnl-3
  
  ALL_TARGETS := intel-speed-select
+diff --git a/tools/power/x86/turbostat/Makefile 
b/tools/power/x86/turbostat/Makefile
+index 92e139b9c792..972fb3c5a514 100644
 --- a/tools/power/x86/turbostat/Makefile
 +++ b/tools/power/x86/turbostat/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ ifeq ("$(origin O)", "command line")
  endif
  
  turbostat : turbostat.c
--override CFLAGS +=-O2 -Wall -I../../../include
-+override CFLAGS +=-Wall -I../../../include
+-override CFLAGS +=-O2 -Wall -Wextra -I../../../include
++override CFLAGS +=-Wall -Wextra -I../../../include
  override CFLAGS +=
-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
  override CFLAGS +=
-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
  override CFLAGS +=-D_FILE_OFFSET_BITS=64
+diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile 
b/tools/power/x86/x86_energy_perf_policy/Makefile
+index 666b325a62a2..0053893229fb 100644
 --- a/tools/power/x86/x86_energy_perf_policy/Makefile
 +++ b/tools/power/x86/x86_energy_perf_policy/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ ifeq ("$(origin O)", "command line")
  endif
  
  x86_energy_perf_policy : x86_energy_perf_policy.c

diff --git a/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild 
b/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
index a2c0295b13..d46d085b61 100644
--- a/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
+++ b/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit fcaps linux-info python-r1 toolchain-funcs
 

diff --git a/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild 
b/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.6.ebuild
similarity index 98%
copy from sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
copy to sys-power/linux-tools-power-x86/linux-tools-power-x86-6.6.ebuild
index a2c0295b13..d46d085b61 100644
---

[gentoo-commits] repo/proj/guru:dev commit in: sys-power/linux-tools-power-x86/files/

2023-02-06 Thread Joe Kappus 
commit: f6002f72da23a5bd98f0fc909988b1963cacb556
Author: Joe Kappus  wt  gd>
AuthorDate: Tue Feb  7 07:09:20 2023 +
Commit: Joe Kappus  wt  gd>
CommitDate: Tue Feb  7 07:09:20 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f6002f72

sys-power/linux-tools-power-x86: 6.1 adjust cflag patch

shuts up QA

Closes: https://bugs.gentoo.org/893266
Signed-off-by: Joe Kappus  wt.gd>

 .../files/linux-tools-power-x86-6.1-cflags.patch| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch
index d0072fe5d..499bbce0d 100644
--- 
a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch
+++ 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch
@@ -6,7 +6,7 @@ diff -urN a/tools/power/x86/intel-speed-select/Makefile 
b/tools/power/x86/intel-
  # (this improves performance and avoids hard-to-debug behaviour);
  MAKEFLAGS += -r
 -override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
-+override CFLAGS += -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
++override CFLAGS += -Wall -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
  override LDFLAGS += -lnl-genl-3 -lnl-3
  
  ALL_TARGETS := intel-speed-select
@@ -25,12 +25,12 @@ diff -urN a/tools/power/x86/turbostat/Makefile 
b/tools/power/x86/turbostat/Makef
 diff -urN a/tools/power/x86/x86_energy_perf_policy/Makefile 
b/tools/power/x86/x86_energy_perf_policy/Makefile
 --- a/tools/power/x86/x86_energy_perf_policy/Makefile  2022-12-11 
17:15:18.0 -0500
 +++ b/tools/power/x86/x86_energy_perf_policy/Makefile  2023-02-04 
05:47:25.962523488 -0500
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,6 @@
  endif
  
  x86_energy_perf_policy : x86_energy_perf_policy.c
 -override CFLAGS +=-O2 -Wall -I../../../include
 +override CFLAGS +=-Wall -I../../../include
  override CFLAGS +=
-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
- override CFLAGS +=-D_FORTIFY_SOURCE=2
+-override CFLAGS +=-D_FORTIFY_SOURCE=2

[gentoo-commits] repo/proj/guru:dev commit in: sys-power/linux-tools-power-x86/files/, sys-power/linux-tools-power-x86/

2023-02-04 Thread Joe Kappus 
commit: 11dcbcffe5074f80cf4bb8282564016776e9
Author: Joe Kappus  wt  gd>
AuthorDate: Sat Feb  4 10:53:53 2023 +
Commit: Joe Kappus  wt  gd>
CommitDate: Sat Feb  4 10:55:02 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11dcbcff

sys-power/linux-tools-power-x86: add 6.1, drop py3.8

Signed-off-by: Joe Kappus  wt.gd>

 sys-power/linux-tools-power-x86/Manifest   |  1 +
 .../files/linux-tools-power-x86-6.1-cflags.patch   | 36 ++
 .../linux-tools-power-x86-5.18.ebuild  |  2 +-
 18.ebuild => linux-tools-power-x86-6.1.ebuild} |  4 +--
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/sys-power/linux-tools-power-x86/Manifest 
b/sys-power/linux-tools-power-x86/Manifest
index 907336dce..db36dab30 100644
--- a/sys-power/linux-tools-power-x86/Manifest
+++ b/sys-power/linux-tools-power-x86/Manifest
@@ -1 +1,2 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
+DIST linux-6.1.tar.xz 134728520 BLAKE2B 
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
 SHA512 
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git 
a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch
new file mode 100644
index 0..d0072fe5d
--- /dev/null
+++ 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch
@@ -0,0 +1,36 @@
+diff -urN a/tools/power/x86/intel-speed-select/Makefile 
b/tools/power/x86/intel-speed-select/Makefile
+--- a/tools/power/x86/intel-speed-select/Makefile  2022-12-11 
17:15:18.0 -0500
 b/tools/power/x86/intel-speed-select/Makefile  2023-02-04 
05:47:25.961523494 -0500
+@@ -13,7 +13,7 @@
+ # Do not use make's built-in rules
+ # (this improves performance and avoids hard-to-debug behaviour);
+ MAKEFLAGS += -r
+-override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
++override CFLAGS += -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
+ override LDFLAGS += -lnl-genl-3 -lnl-3
+ 
+ ALL_TARGETS := intel-speed-select
+diff -urN a/tools/power/x86/turbostat/Makefile 
b/tools/power/x86/turbostat/Makefile
+--- a/tools/power/x86/turbostat/Makefile   2022-12-11 17:15:18.0 
-0500
 b/tools/power/x86/turbostat/Makefile   2023-02-04 05:49:01.960951027 
-0500
+@@ -9,7 +9,7 @@
+ endif
+ 
+ turbostat : turbostat.c
+-override CFLAGS +=-O2 -Wall -Wextra -I../../../include
++override CFLAGS +=-Wall -Wextra -I../../../include
+ override CFLAGS +=
-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+ override CFLAGS +=
-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
+ override CFLAGS +=-D_FILE_OFFSET_BITS=64
+diff -urN a/tools/power/x86/x86_energy_perf_policy/Makefile 
b/tools/power/x86/x86_energy_perf_policy/Makefile
+--- a/tools/power/x86/x86_energy_perf_policy/Makefile  2022-12-11 
17:15:18.0 -0500
 b/tools/power/x86/x86_energy_perf_policy/Makefile  2023-02-04 
05:47:25.962523488 -0500
+@@ -9,7 +9,7 @@
+ endif
+ 
+ x86_energy_perf_policy : x86_energy_perf_policy.c
+-override CFLAGS +=-O2 -Wall -I../../../include
++override CFLAGS +=-Wall -I../../../include
+ override CFLAGS +=
-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+ override CFLAGS +=-D_FORTIFY_SOURCE=2
+ 

diff --git a/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild 
b/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
index 65175d611..9b6ab7685 100644
--- a/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
+++ b/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps linux-info python-r1 toolchain-funcs
 

diff --git a/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild 
b/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
similarity index 97%
copy from sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
copy to sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
index 65175d611..b915c39b7 100644
--- a/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
+++ b/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2013-2022 Gentoo Authors
+# Copyright 2013-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] repo/proj/guru:dev commit in: sys-power/linux-tools-power-x86/files/, sys-power/linux-tools-power-x86/

2022-06-04 Thread Alessandro Barbieri 
commit: 4286520c0c83e2d01377ece54b4bb5f08459f692
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat Jun  4 10:37:21 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sat Jun  4 13:13:47 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4286520c

sys-power/linux-tools-power-x86: new package, add 5.18

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-power/linux-tools-power-x86/Manifest   |  1 +
 .../files/linux-tools-power-x86-5.18-cflags.patch  | 33 
 .../linux-tools-power-x86-5.18.ebuild  | 92 ++
 sys-power/linux-tools-power-x86/metadata.xml   | 11 +++
 4 files changed, 137 insertions(+)

diff --git a/sys-power/linux-tools-power-x86/Manifest 
b/sys-power/linux-tools-power-x86/Manifest
new file mode 100644
index 0..907336dce
--- /dev/null
+++ b/sys-power/linux-tools-power-x86/Manifest
@@ -0,0 +1 @@
+DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5

diff --git 
a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch
new file mode 100644
index 0..700baa781
--- /dev/null
+++ 
b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch
@@ -0,0 +1,33 @@
+--- a/tools/power/x86/intel-speed-select/Makefile
 b/tools/power/x86/intel-speed-select/Makefile
+@@ -13,7 +13,7 @@
+ # Do not use make's built-in rules
+ # (this improves performance and avoids hard-to-debug behaviour);
+ MAKEFLAGS += -r
+-override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
++override CFLAGS += -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include 
-I/usr/include/libnl3
+ override LDFLAGS += -lnl-genl-3 -lnl-3
+ 
+ ALL_TARGETS := intel-speed-select
+--- a/tools/power/x86/turbostat/Makefile
 b/tools/power/x86/turbostat/Makefile
+@@ -9,7 +9,7 @@
+ endif
+ 
+ turbostat : turbostat.c
+-override CFLAGS +=-O2 -Wall -I../../../include
++override CFLAGS +=-Wall -I../../../include
+ override CFLAGS +=
-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+ override CFLAGS +=
-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
+ override CFLAGS +=-D_FILE_OFFSET_BITS=64
+--- a/tools/power/x86/x86_energy_perf_policy/Makefile
 b/tools/power/x86/x86_energy_perf_policy/Makefile
+@@ -9,7 +9,7 @@
+ endif
+ 
+ x86_energy_perf_policy : x86_energy_perf_policy.c
+-override CFLAGS +=-O2 -Wall -I../../../include
++override CFLAGS +=-Wall -I../../../include
+ override CFLAGS +=
-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+ override CFLAGS +=-D_FORTIFY_SOURCE=2
+ 

diff --git a/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild 
b/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
new file mode 100644
index 0..65175d611
--- /dev/null
+++ b/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2013-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit fcaps linux-info python-r1 toolchain-funcs
+
+DESCRIPTION="Linux x86 CPU power tools"
+HOMEPAGE="https://www.kernel.org/;
+SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz;
+S="${WORKDIR}/linux-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64"
+IUSE="pstate-tracer"
+
+CDEPEND="dev-libs/libnl:3"
+RDEPEND="
+   pstate-tracer? (
+   ${PYTHON_DEPS}
+   dev-python/gnuplot-py[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-visualization/gnuplot
+   )
+"
+DEPEND="
+   ${CDEPEND}
+   virtual/os-headers
+"
+
+REQUIRED_USE="pstate-tracer? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+FILECAPS=( 'cap_sys_rawio=ep' usr/bin/turbostat )
+
+pkg_setup() {
+   linux-info_pkg_setup
+   if linux_config_exists; then
+   CONFIG_CHECK_MODULES="CONFIG_X86_MSR" || ewarn "msr module is 
needed at runtime"
+   fi
+}
+
+src_configure() {
+   export bindir="${EPREFIX}/usr/bin"
+   export sbindir="${EPREFIX}/usr/sbin"
+   export mandir="${EPREFIX}/usr/share/man"
+   export includedir="${EPREFIX}/usr/include"
+   export libdir="${EPREFIX}/usr/$(get_libdir)"
+   export localedir="${EPREFIX}/usr/share/locale"
+   export docdir="${EPREFIX}/usr/share/doc/${PF}"
+   export confdir="${EPREFIX}/etc"
+   export 
bash_completion_dir="${EPREFIX}/usr/share/bash-completion/completions"
+   export V=1
+}
+
+src_compile() {
+   myemakeargs=(
+