Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/adjtimex/files/
Date: Sun, 01 Dec 2019 18:42:47
Message-Id: 1575225754.1501195562f59c1177b54199db9b398aad7a4a3f.bman@gentoo
1 commit: 1501195562f59c1177b54199db9b398aad7a4a3f
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Dec 1 08:21:37 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 1 18:42:34 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15011955
7
8 net-misc/adjtimex: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
12
13 .../files/adjtimex-1.29-r1-gentoo-utc.patch | 30 ----------------------
14 1 file changed, 30 deletions(-)
15
16 diff --git a/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch
17 deleted file mode 100644
18 index ac8730d1ee7..00000000000
19 --- a/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch
20 +++ /dev/null
21 @@ -1,30 +0,0 @@
22 ---- adjtimex-1.29-debian/debian/adjtimexconfig 2011-12-23 21:29:32.962449759 +0100
23 -+++ adjtimex-1.29/debian/adjtimexconfig 2011-12-23 21:30:00.610638657 +0100
24 -@@ -3,6 +3,18 @@
25 - conffile=/etc/default/adjtimex
26 - startfile=/etc/init.d/adjtimex
27 -
28 -+# Get UTC setting
29 -+params=''
30 -+if [ -f /etc/conf.d/clock ]; then
31 -+ #baselayout-1
32 -+ source /etc/conf.d/clock
33 -+ [ "$CLOCK" == "UTC" ] && params='--utc'
34 -+elif [ -f /etc/conf.d/hwclock ]; then
35 -+ #baselayout-2
36 -+ source /etc/conf.d/hwclock
37 -+ [ "$clock" == "UTC" ] && params='--utc'
38 -+fi
39 -+
40 - echo -n "Comparing clocks (this will take 70 sec)..."
41 -
42 - # Get the parameters
43 -@@ -11,7 +23,7 @@
44 - baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust`
45 - hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust`
46 - /usr/sbin/adjtimex --tick $baseline --frequency 0
47 --/usr/sbin/adjtimex --adjust --force-adjust >/etc/adj.adjust
48 -+/usr/sbin/adjtimex ${params} --adjust --force-adjust >/etc/adj.adjust
49 - echo "done."
50 - ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'`
51 - freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'`