Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/cpupower/, sys-power/cpupower/files/
Date: Wed, 27 Nov 2019 16:15:14
Message-Id: 1574871259.e835ea9ec180af8d0a800c2d5d7928c58bf3ece6.floppym@gentoo
1 commit: e835ea9ec180af8d0a800c2d5d7928c58bf3ece6
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 27 16:14:19 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 27 16:14:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e835ea9e
7
8 sys-power/cpupower: bump to 5.4
9
10 Package-Manager: Portage-2.3.79_p3, Repoman-2.3.18_p2
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 sys-power/cpupower/Manifest | 1 +
14 sys-power/cpupower/cpupower-5.4.ebuild | 67 ++++++++++++++++++++++
15 sys-power/cpupower/files/cpupower-5.4-cflags.patch | 32 +++++++++++
16 3 files changed, 100 insertions(+)
17
18 diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
19 index eca4716f0bc..778c7cda1ae 100644
20 --- a/sys-power/cpupower/Manifest
21 +++ b/sys-power/cpupower/Manifest
22 @@ -1 +1,2 @@
23 DIST cpupower-4.13.0.tar.xz 67812 BLAKE2B 3b94b18bb57b0499a96d57ca26a48f528bf993e0f1ed7eb6d2949c879de8796501629bd0978946eae925d86dd3204a1cab0c99f1c3a8b51731dfbdb61451e990 SHA512 5e7095e2741eae920a097864926931afb2656e492b504f203c40c24ddc5aee5014c7689b220225171b5ea10c69b70774fb2a979d05ea56ef1fa063f3097626c7
24 +DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
25
26 diff --git a/sys-power/cpupower/cpupower-5.4.ebuild b/sys-power/cpupower/cpupower-5.4.ebuild
27 new file mode 100644
28 index 00000000000..d45b53b560a
29 --- /dev/null
30 +++ b/sys-power/cpupower/cpupower-5.4.ebuild
31 @@ -0,0 +1,67 @@
32 +# Copyright 1999-2019 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=7
36 +
37 +inherit systemd toolchain-funcs
38 +
39 +DESCRIPTION="Shows and sets processor power related values"
40 +HOMEPAGE="https://www.kernel.org/"
41 +SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz"
42 +
43 +LICENSE="GPL-2"
44 +SLOT="0/0"
45 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
46 +IUSE="nls"
47 +
48 +# File collision w/ headers of the deprecated cpufrequtils
49 +RDEPEND="sys-apps/pciutils
50 + !<sys-apps/linux-misc-apps-3.6-r2
51 + !sys-power/cpufrequtils"
52 +DEPEND="${RDEPEND}
53 + virtual/os-headers
54 + nls? ( sys-devel/gettext )"
55 +
56 +PATCHES=(
57 + "${FILESDIR}/cpupower-5.4-cflags.patch"
58 +)
59 +
60 +S="${WORKDIR}/linux-${PV}"
61 +
62 +src_configure() {
63 + export bindir="${EPREFIX}/usr/bin"
64 + export sbindir="${EPREFIX}/usr/sbin"
65 + export mandir="${EPREFIX}/usr/share/man"
66 + export includedir="${EPREFIX}/usr/include"
67 + export libdir="${EPREFIX}/usr/$(get_libdir)"
68 + export localedir="${EPREFIX}/usr/share/locale"
69 + export docdir="${EPREFIX}/usr/share/doc/${PF}"
70 + export confdir="${EPREFIX}/etc"
71 + export V=1
72 + export NLS=$(usex nls true false)
73 +}
74 +
75 +src_compile() {
76 + myemakeargs=(
77 + AR="$(tc-getAR)"
78 + CC="$(tc-getCC)"
79 + LD="$(tc-getCC)"
80 + VERSION=${PV}
81 + )
82 +
83 + cd tools/power/cpupower || die
84 + emake "${myemakeargs[@]}"
85 +}
86 +
87 +src_install() {
88 + cd tools/power/cpupower || die
89 + emake "${myemakeargs[@]}" DESTDIR="${D}" install
90 + doheader lib/cpupower.h
91 + einstalldocs
92 +
93 + newconfd "${FILESDIR}"/conf.d-r2 cpupower
94 + newinitd "${FILESDIR}"/init.d-r4 cpupower
95 +
96 + systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
97 + systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
98 +}
99
100 diff --git a/sys-power/cpupower/files/cpupower-5.4-cflags.patch b/sys-power/cpupower/files/cpupower-5.4-cflags.patch
101 new file mode 100644
102 index 00000000000..f21435a0cd0
103 --- /dev/null
104 +++ b/sys-power/cpupower/files/cpupower-5.4-cflags.patch
105 @@ -0,0 +1,32 @@
106 +From 6ae1f1b03aaaee6a9a56040d3ba7af6bf6648ad6 Mon Sep 17 00:00:00 2001
107 +From: Mike Gilbert <floppym@g.o>
108 +Date: Wed, 27 Nov 2019 10:51:15 -0500
109 +Subject: [PATCH] Respect user CFLAGS
110 +
111 +---
112 + tools/power/cpupower/Makefile | 9 +--------
113 + 1 file changed, 1 insertion(+), 8 deletions(-)
114 +
115 +diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
116 +index c8622497ef23..f17e8c94da16 100644
117 +--- a/tools/power/cpupower/Makefile
118 ++++ b/tools/power/cpupower/Makefile
119 +@@ -178,14 +178,7 @@ else
120 + endif
121 + export QUIET ECHO
122 +
123 +-# if DEBUG is enabled, then we do not strip or optimize
124 +-ifeq ($(strip $(DEBUG)),true)
125 +- override CFLAGS += -O1 -g -DDEBUG
126 +- STRIPCMD = /bin/true -Since_we_are_debugging
127 +-else
128 +- override CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
129 +- STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
130 +-endif
131 ++STRIPCMD = true
132 +
133 +
134 + # the actual make rules
135 +--
136 +2.24.0
137 +