* [gentoo-commits] repo/proj/guru:master commit in: sys-power/linux-tools-power-x86/files/, sys-power/linux-tools-power-x86/
@ 2023-02-04 11:46 Viorel Munteanu
0 siblings, 0 replies; 2+ messages in thread
From: Viorel Munteanu @ 2023-02-04 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 11dcbcffe507dddd4f80cf4bb8282564016776e9
Author: Joe Kappus <joe <AT> wt <DOT> gd>
AuthorDate: Sat Feb 4 10:53:53 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 10:55:02 2023 +0000
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 <joe <AT> 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 000000000..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.000000000 -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.000000000 -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.000000000 -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
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit fcaps linux-info python-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-power/linux-tools-power-x86/files/, sys-power/linux-tools-power-x86/
@ 2024-05-14 15:51 Julien Roy
0 siblings, 0 replies; 2+ messages in thread
From: Julien Roy @ 2024-05-14 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 795b8fd5bed35989ef2520b35d735b72f71ba7d4
Author: Joe Kappus <joe <AT> wt <DOT> gd>
AuthorDate: Tue May 14 08:48:54 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Tue May 14 08:50:37 2024 +0000
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 <joe <AT> 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
--- 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
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit fcaps linux-info python-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-14 15:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-04 11:46 [gentoo-commits] repo/proj/guru:master commit in: sys-power/linux-tools-power-x86/files/, sys-power/linux-tools-power-x86/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2024-05-14 15:51 Julien Roy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox