1 |
commit: 8d991738f61ad43a6b58cda7388ae33e341f93d4 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 27 07:02:57 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 27 07:05:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d991738 |
7 |
|
8 |
net-misc/chrony: Run config(!) changes in src_configure() |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
net-misc/chrony/chrony-3.5.1.ebuild | 4 ++-- |
14 |
net-misc/chrony/chrony-9999.ebuild | 4 ++-- |
15 |
2 files changed, 4 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/chrony/chrony-3.5.1.ebuild b/net-misc/chrony/chrony-3.5.1.ebuild |
18 |
index fa28cf69009..067eb1c8836 100644 |
19 |
--- a/net-misc/chrony/chrony-3.5.1.ebuild |
20 |
+++ b/net-misc/chrony/chrony-3.5.1.ebuild |
21 |
@@ -53,7 +53,9 @@ src_prepare() { |
22 |
# Copy for potential user fixup |
23 |
cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf |
24 |
cp examples/chronyd.service "${T}"/chronyd.service |
25 |
+} |
26 |
|
27 |
+src_configure() { |
28 |
# Set config for privdrop |
29 |
if ! use caps; then |
30 |
sed -i \ |
31 |
@@ -66,9 +68,7 @@ src_prepare() { |
32 |
-e 's/-F 1//' \ |
33 |
"${T}"/chronyd.conf "${T}"/chronyd.service || die |
34 |
fi |
35 |
-} |
36 |
|
37 |
-src_configure() { |
38 |
tc-export CC |
39 |
|
40 |
local CHRONY_EDITLINE |
41 |
|
42 |
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild |
43 |
index 0338e59678b..a2dcdd4d2bd 100644 |
44 |
--- a/net-misc/chrony/chrony-9999.ebuild |
45 |
+++ b/net-misc/chrony/chrony-9999.ebuild |
46 |
@@ -73,7 +73,9 @@ src_prepare() { |
47 |
# Copy for potential user fixup |
48 |
cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf |
49 |
cp examples/chronyd.service "${T}"/chronyd.service |
50 |
+} |
51 |
|
52 |
+src_configure() { |
53 |
# Set config for privdrop |
54 |
if ! use caps; then |
55 |
sed -i \ |
56 |
@@ -86,9 +88,7 @@ src_prepare() { |
57 |
-e 's/-F 1//' \ |
58 |
"${T}"/chronyd.conf "${T}"/chronyd.service || die |
59 |
fi |
60 |
-} |
61 |
|
62 |
-src_configure() { |
63 |
tc-export CC |
64 |
|
65 |
local CHRONY_EDITLINE |