Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/
Date: Sun, 24 May 2020 14:37:43
Message-Id: 1590331054.c80ef390a412bee4dd3fca0c35566af740396d61.slyfox@gentoo
1 commit: c80ef390a412bee4dd3fca0c35566af740396d61
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun May 24 13:14:29 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun May 24 14:37:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80ef390
7
8 sys-apps/dtc: remove unused patches
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/15951
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 sys-apps/dtc/files/dtc-1.4.1-echo-n.patch | 95 -------------------------
16 sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch | 30 --------
17 2 files changed, 125 deletions(-)
18
19 diff --git a/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch b/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
20 deleted file mode 100644
21 index cd45b952a49..00000000000
22 --- a/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
23 +++ /dev/null
24 @@ -1,95 +0,0 @@
25 -From ed3d76cd1c8f91f5e86424e899448d6221b0f76c Mon Sep 17 00:00:00 2001
26 -From: Mike Frysinger <vapier@××××××××.org>
27 -Date: Wed, 6 May 2015 01:53:39 -0400
28 -Subject: [PATCH] tests: convert `echo -n` to `printf`
29 -
30 -The -n option is not standard in POSIX, so convert to printf which should
31 -work the same in every shell.
32 -
33 -Signed-off-by: Mike Frysinger <vapier@××××××××.org>
34 ----
35 - tests/run_tests.sh | 20 ++++++++++----------
36 - 1 file changed, 10 insertions(+), 10 deletions(-)
37 -
38 -diff --git a/tests/run_tests.sh b/tests/run_tests.sh
39 -index c870432..0dda54a 100755
40 ---- a/tests/run_tests.sh
41 -+++ b/tests/run_tests.sh
42 -@@ -42,20 +42,20 @@ base_run_test() {
43 -
44 - shorten_echo () {
45 - limit=32
46 -- echo -n "$1"
47 -+ printf "$1"
48 - shift
49 - for x; do
50 - if [ ${#x} -le $limit ]; then
51 -- echo -n " $x"
52 -+ printf " $x"
53 - else
54 - short=$(echo "$x" | head -c$limit)
55 -- echo -n " \"$short\"...<${#x} bytes>"
56 -+ printf " \"$short\"...<${#x} bytes>"
57 - fi
58 - done
59 - }
60 -
61 - run_test () {
62 -- echo -n "$@: "
63 -+ printf "$@: "
64 - if [ -n "$VALGRIND" -a -f $1.supp ]; then
65 - VGSUPP="--suppressions=$1.supp"
66 - fi
67 -@@ -63,7 +63,7 @@ run_test () {
68 - }
69 -
70 - run_sh_test () {
71 -- echo -n "$@: "
72 -+ printf "$@: "
73 - base_run_test sh "$@"
74 - }
75 -
76 -@@ -106,12 +106,12 @@ wrap_error () {
77 -
78 - run_wrap_error_test () {
79 - shorten_echo "$@"
80 -- echo -n " {!= 0}: "
81 -+ printf " {!= 0}: "
82 - base_run_test wrap_error "$@"
83 - }
84 -
85 - run_dtc_test () {
86 -- echo -n "dtc $@: "
87 -+ printf "dtc $@: "
88 - base_run_test wrap_test $VALGRIND $DTC "$@"
89 - }
90 -
91 -@@ -126,7 +126,7 @@ asm_to_so_test () {
92 - run_fdtget_test () {
93 - expect="$1"
94 - shift
95 -- echo -n "fdtget-runtest.sh "$expect" $@: "
96 -+ printf "fdtget-runtest.sh "$expect" $@: "
97 - base_run_test sh fdtget-runtest.sh "$expect" "$@"
98 - }
99 -
100 -@@ -134,14 +134,14 @@ run_fdtput_test () {
101 - expect="$1"
102 - shift
103 - shorten_echo fdtput-runtest.sh "$expect" "$@"
104 -- echo -n ": "
105 -+ printf ": "
106 - base_run_test sh fdtput-runtest.sh "$expect" "$@"
107 - }
108 -
109 - run_fdtdump_test() {
110 - file="$1"
111 - shorten_echo fdtdump-runtest.sh "$file"
112 -- echo -n ": "
113 -+ printf ": "
114 - base_run_test sh fdtdump-runtest.sh "$file"
115 - }
116 -
117 ---
118 -2.4.0
119 -
120
121 diff --git a/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch b/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
122 deleted file mode 100644
123 index 7057be7bd8a..00000000000
124 --- a/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
125 +++ /dev/null
126 @@ -1,30 +0,0 @@
127 -From a4b093f7366fdb429ca1781144d3985fa50d0fbb Mon Sep 17 00:00:00 2001
128 -From: Julien Grall <julien.grall@××××××.org>
129 -Date: Tue, 17 Mar 2015 16:00:34 +0000
130 -Subject: [PATCH] libfdt: Add missing functions to shared library
131 -
132 -The commit 4e76ec7 "libfdt: Add fdt_next_subnode() to permit easy
133 -subnode iteration" adds new functions (fdt_{first,next}_subnode) but
134 -forgot to mark them as 'global' in the shared library.
135 -
136 -Signed-off-by: Julien Grall <julien.grall@××××××.org>
137 ----
138 - libfdt/version.lds | 2 ++
139 - 1 file changed, 2 insertions(+)
140 -
141 -diff --git a/libfdt/version.lds b/libfdt/version.lds
142 -index 80b322b..941208e 100644
143 ---- a/libfdt/version.lds
144 -+++ b/libfdt/version.lds
145 -@@ -54,6 +54,8 @@ LIBFDT_1.2 {
146 - fdt_get_property_by_offset;
147 - fdt_getprop_by_offset;
148 - fdt_next_property_offset;
149 -+ fdt_first_subnode;
150 -+ fdt_next_subnode;
151 -
152 - local:
153 - *;
154 ---
155 -2.4.0
156 -