Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/
Date: Fri, 26 Aug 2016 02:09:41
Message-Id: 1472177303.bb811a008db572dc5e6e18a062071cca3236fdf4.radhermit@gentoo
1 commit: bb811a008db572dc5e6e18a062071cca3236fdf4
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 26 02:08:23 2016 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 26 02:08:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb811a00
7
8 dev-embedded/u-boot-tools: remove old
9
10 dev-embedded/u-boot-tools/Manifest | 4 -
11 .../u-boot-tools/files/u-boot-no-config.h.patch | 92 ----------------------
12 .../u-boot-tools/u-boot-tools-2013.07.ebuild | 46 -----------
13 .../u-boot-tools/u-boot-tools-2014.01.ebuild | 46 -----------
14 .../u-boot-tools/u-boot-tools-2015.01.ebuild | 42 ----------
15 .../u-boot-tools/u-boot-tools-2015.04.ebuild | 44 -----------
16 6 files changed, 274 deletions(-)
17
18 diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
19 index 9b429ac..ffb45d4 100644
20 --- a/dev-embedded/u-boot-tools/Manifest
21 +++ b/dev-embedded/u-boot-tools/Manifest
22 @@ -1,6 +1,2 @@
23 -DIST u-boot-2013.07.tar.bz2 10067674 SHA256 2bbd440c1b29928d230604eac372fda5152d3ae23f52b1910c77fc5bf531250b SHA512 5c0725c9c5c7c9101d7ef8eb659aafb513ca5742fbafec55e0b64cd68b3e37520de55f71aebba59bf979b8daef2b0c71645b5ab343b7057d601b3cd6ffc6e763 WHIRLPOOL 41f1a78b6f7af206bb2a6c04be23ad1aceaa4a105ede4794b4a9d6777e3e92ae2014906be30c749cae51ea9d865f7e565185d9baaa0e953b01a053b62621ad66
24 -DIST u-boot-2014.01.tar.bz2 10180625 SHA256 cdaf8c81583abfa2e73da46cfcf87b0cbd9741d9aa766f3b905376e3652d543d SHA512 c6e4f6f9a2dae1a50b7dd94dad13ef5d0ce440c3f0401de3f0ecf907c8fca0ff183077ec3b2c4da42b0fa9775450b03571725c76dfd2419a4ee7b982c261ccb1 WHIRLPOOL 9964abde477ce54dfe0a0972920e19c6d60209e8a19819c98b955a9a8b23cc57ac8e687d9ced65411eb6ff1ac40121edac154e754b3b5a2f037cf3a7724de374
25 -DIST u-boot-2015.01.tar.bz2 9982195 SHA256 383051a656ebe11757b17d38a3326387e4a1b0949ca8a9e8ee506bf71dac9fde SHA512 6697c6da5f463bdfa75b8025a2dd302e9cda58ce36bc3252590f11976807aeccc1ca76be93cbc83d3367a7557878516bb57130ffb76197ffd513640c48e18938 WHIRLPOOL 7ed552f0f32d061c1723c42f0230611d6552068765ea3130fe070d1a906da2defafa14a67078ef7feda4ed29857f51a5b47b3595aa7a8eb07bf26778a3517aff
26 -DIST u-boot-2015.04.tar.bz2 9471487 SHA256 0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60 SHA512 e50a3d7e44bf588a7cf8e28cdf3342bc38bd1bf55231d579c2501b75386cfff0fbc7a34648d893971e0095510c9d582b7180427832cb78470b4e7af2ce0e3646 WHIRLPOOL dbfd4b13b82505ef94e8b394ba260684ee18c881bd84adfc841194ce6a4b967c8514cedfcac6777045a50b940e3a1882af667e152dc0fc0d3b9254a7dfca89d0
27 DIST u-boot-2016.03.tar.bz2 11076762 SHA256 e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb SHA512 d3a8d5f334a1a1a33756d9ac33d14eca689cafe1ada478e61b51dcbff1781266d4f0ea121e25d0232b292475721c04be63e5a153715b91a14dfc82656a54de6f WHIRLPOOL 32f246e3bdb71648f47a4246602b6f27de5dbae9834aed71880c5d5e737dfd63adcd03e9b47874b4fa61c0336fe13b8b079693baec633bd428d991abb47a88f0
28 DIST u-boot-2016.07.tar.bz2 11506848 SHA256 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 SHA512 fa76dbd7e654ff9e4b3166162be6c0a77ecf2eb2a952b4865df3c818ebcdca7e2bb75e5ba19bf0346000c3d185888552193bb74510b115426cfe444b78efd3ef WHIRLPOOL 066019af0e8fd04d53569ebd001309238514daa757be6cc50db6d4544f34d0c720ff420811d44d88af6028d02dfb02667e44d8d1abb23bb364baff46c5a26a9f
29
30 diff --git a/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch b/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch
31 deleted file mode 100644
32 index 1009ab0..00000000
33 --- a/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch
34 +++ /dev/null
35 @@ -1,92 +0,0 @@
36 -This patch has been reverted later on by
37 -http://git.denx.de/?p=u-boot.git;a=commit;h=e3c52f2b8779469c843eb79282396f1a5ca3fef5
38 -
39 -but we still need it to build the tools without having to configure
40 -a full u-boot environment.
41 -
42 -Signed-off-by: Markos Chandras <hwoarang@g.o>
43 -
44 -From: Mike Frysinger <vapier@g.o>
45 -Date: Sat, 10 Nov 2012 19:47:47 +0000 (+0000)
46 -Subject: fw_env: fix building w/out a config.h
47 -X-Git-Tag: v2013.01-rc3~19
48 -X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=92ace272d06cec1d7f1533bb9edf914fb5845fba;hp=7a546db2ffc6a713fb8009d8246c29da5420f6a7
49 -
50 -fw_env: fix building w/out a config.h
51 -
52 -Signed-off-by: Mike Frysinger <vapier@g.o>
53 -Acked-by: Peter Korsgaard <jacmet@×××××××.dk>
54 ----
55 -
56 -diff --git a/tools/env/Makefile b/tools/env/Makefile
57 -index 0e798e0..e6dc5f3 100644
58 ---- a/tools/env/Makefile
59 -+++ b/tools/env/Makefile
60 -@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
61 - HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c
62 - HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
63 - HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
64 --HEADERS := fw_env.h $(OBJTREE)/include/config.h
65 -+HEADERS := fw_env.h
66 -
67 - # Compile for a hosted environment on the target
68 - HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
69 -@@ -36,6 +36,15 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
70 - -DUSE_HOSTCC \
71 - -DTEXT_BASE=$(TEXT_BASE)
72 -
73 -+# Pass CONFIG_xxx settings via the command line so that we can build w/out
74 -+# a config.h file existing in the first place. Useful for generic builds.
75 -+CONFIG_VARS_TO_PASS = \
76 -+ ENV_OVERWRITE \
77 -+ OVERWRITE_ETHADDR_ONCE \
78 -+ ETHADDR
79 -+HOSTCPPFLAGS += \
80 -+ $(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x))))
81 -+
82 - ifeq ($(MTD_VERSION),old)
83 - HOSTCPPFLAGS += -DMTD_OLD
84 - endif
85 -diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
86 -index a1a6807..19703c7 100644
87 ---- a/tools/env/fw_env.h
88 -+++ b/tools/env/fw_env.h
89 -@@ -21,15 +21,6 @@
90 - * MA 02111-1307 USA
91 - */
92 -
93 --/* Pull in the current config to define the default environment */
94 --#ifndef __ASSEMBLY__
95 --#define __ASSEMBLY__ /* get only #defines from config.h */
96 --#include <config.h>
97 --#undef __ASSEMBLY__
98 --#else
99 --#include <config.h>
100 --#endif
101 --
102 - /*
103 - * To build the utility with the static configuration
104 - * comment out the next line.
105 -@@ -52,22 +43,6 @@
106 - #define DEVICE2_ENVSECTORS 2
107 - #endif
108 -
109 --#ifndef CONFIG_BAUDRATE
110 --#define CONFIG_BAUDRATE 115200
111 --#endif
112 --
113 --#ifndef CONFIG_BOOTDELAY
114 --#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
115 --#endif
116 --
117 --#ifndef CONFIG_BOOTCOMMAND
118 --#define CONFIG_BOOTCOMMAND \
119 -- "bootp; " \
120 -- "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \
121 -- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
122 -- "bootm"
123 --#endif
124 --
125 - extern int fw_printenv(int argc, char *argv[]);
126 - extern char *fw_getenv (char *name);
127 - extern int fw_setenv (int argc, char *argv[]);
128
129 diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild
130 deleted file mode 100644
131 index b07f862..00000000
132 --- a/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild
133 +++ /dev/null
134 @@ -1,46 +0,0 @@
135 -# Copyright 1999-2013 Gentoo Foundation
136 -# Distributed under the terms of the GNU General Public License v2
137 -# $Id$
138 -
139 -EAPI="5"
140 -
141 -inherit eutils toolchain-funcs
142 -
143 -MY_P="u-boot-${PV/_/-}"
144 -DESCRIPTION="utilities for working with Das U-Boot"
145 -HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
146 -SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
147 -
148 -LICENSE="GPL-2"
149 -SLOT="0"
150 -KEYWORDS="amd64 arm x86"
151 -IUSE=""
152 -
153 -S=${WORKDIR}/${MY_P}
154 -
155 -src_prepare() {
156 - sed -i -e "s:-g ::" tools/Makefile || die
157 - # Make sure we find local u-boot headers first #429302
158 - ln -s ../include/image.h tools/ || die
159 - epatch "${FILESDIR}"/u-boot-no-config.h.patch
160 -}
161 -
162 -src_compile() {
163 - emake \
164 - HOSTSTRIP=: \
165 - HOSTCC="$(tc-getCC)" \
166 - HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
167 - HOSTLDFLAGS="${LDFLAGS}" \
168 - CONFIG_ENV_OVERWRITE=y \
169 - tools-all
170 -}
171 -
172 -src_install() {
173 - cd tools
174 - dobin bmp_logo gen_eth_addr img2srec mkimage
175 - dobin easylogo/easylogo
176 - dobin env/fw_printenv
177 - dosym fw_printenv /usr/bin/fw_setenv
178 - insinto /etc
179 - doins env/fw_env.config
180 -}
181
182 diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
183 deleted file mode 100644
184 index f7fee91..00000000
185 --- a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
186 +++ /dev/null
187 @@ -1,46 +0,0 @@
188 -# Copyright 1999-2014 Gentoo Foundation
189 -# Distributed under the terms of the GNU General Public License v2
190 -# $Id$
191 -
192 -EAPI="5"
193 -
194 -inherit eutils toolchain-funcs
195 -
196 -MY_P="u-boot-${PV/_/-}"
197 -DESCRIPTION="utilities for working with Das U-Boot"
198 -HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
199 -SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
200 -
201 -LICENSE="GPL-2"
202 -SLOT="0"
203 -KEYWORDS="amd64 arm x86"
204 -IUSE=""
205 -
206 -S=${WORKDIR}/${MY_P}
207 -
208 -src_prepare() {
209 - sed -i "s:-g ::" tools/Makefile || die
210 - # Make sure we find local u-boot headers first #429302
211 - ln -s ../include/image.h tools/ || die
212 - epatch "${FILESDIR}"/u-boot-no-config.h.patch
213 -}
214 -
215 -src_compile() {
216 - emake \
217 - HOSTSTRIP=: \
218 - HOSTCC="$(tc-getCC)" \
219 - HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
220 - HOSTLDFLAGS="${LDFLAGS}" \
221 - CONFIG_ENV_OVERWRITE=y \
222 - tools-all
223 -}
224 -
225 -src_install() {
226 - cd tools
227 - dobin bmp_logo gen_eth_addr img2srec mkimage
228 - dobin easylogo/easylogo
229 - dobin env/fw_printenv
230 - dosym fw_printenv /usr/bin/fw_setenv
231 - insinto /etc
232 - doins env/fw_env.config
233 -}
234
235 diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2015.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2015.01.ebuild
236 deleted file mode 100644
237 index 3a0bedb..00000000
238 --- a/dev-embedded/u-boot-tools/u-boot-tools-2015.01.ebuild
239 +++ /dev/null
240 @@ -1,42 +0,0 @@
241 -# Copyright 1999-2015 Gentoo Foundation
242 -# Distributed under the terms of the GNU General Public License v2
243 -# $Id$
244 -
245 -EAPI="5"
246 -
247 -inherit eutils toolchain-funcs
248 -
249 -MY_P="u-boot-${PV/_/-}"
250 -DESCRIPTION="utilities for working with Das U-Boot"
251 -HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
252 -SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
253 -
254 -LICENSE="GPL-2"
255 -SLOT="0"
256 -KEYWORDS="~amd64 ~arm ~x86"
257 -IUSE=""
258 -
259 -S=${WORKDIR}/${MY_P}
260 -
261 -src_compile() {
262 - # Unset a few KBUILD variables. Bug #540476
263 - unset KBUILD_OUTPUT KBUILD_SRC
264 - emake defconfig
265 - emake \
266 - HOSTSTRIP=: \
267 - HOSTCC="$(tc-getCC)" \
268 - HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
269 - HOSTLDFLAGS="${LDFLAGS}" \
270 - CONFIG_ENV_OVERWRITE=y \
271 - tools-all
272 -}
273 -
274 -src_install() {
275 - cd tools
276 - dobin bmp_logo gen_eth_addr img2srec mkimage
277 - dobin easylogo/easylogo
278 - dobin env/fw_printenv
279 - dosym fw_printenv /usr/bin/fw_setenv
280 - insinto /etc
281 - doins env/fw_env.config
282 -}
283
284 diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild
285 deleted file mode 100644
286 index 1bce507..00000000
287 --- a/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild
288 +++ /dev/null
289 @@ -1,44 +0,0 @@
290 -# Copyright 1999-2016 Gentoo Foundation
291 -# Distributed under the terms of the GNU General Public License v2
292 -# $Id$
293 -
294 -EAPI="5"
295 -
296 -inherit eutils toolchain-funcs
297 -
298 -MY_P="u-boot-${PV/_/-}"
299 -DESCRIPTION="utilities for working with Das U-Boot"
300 -HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
301 -SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
302 -
303 -LICENSE="GPL-2"
304 -SLOT="0"
305 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
306 -IUSE=""
307 -
308 -S=${WORKDIR}/${MY_P}
309 -
310 -src_compile() {
311 - # Unset a few KBUILD variables. Bug #540476
312 - unset KBUILD_OUTPUT KBUILD_SRC
313 - emake defconfig
314 - emake \
315 - HOSTSTRIP=: \
316 - STRIP=: \
317 - HOSTCC="$(tc-getCC)" \
318 - HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
319 - HOSTLDFLAGS="${LDFLAGS}" \
320 - CONFIG_ENV_OVERWRITE=y \
321 - tools-all
322 -}
323 -
324 -src_install() {
325 - cd tools
326 - dobin bmp_logo gen_eth_addr img2srec mkimage
327 - dobin easylogo/easylogo
328 - dobin env/fw_printenv
329 - dosym fw_printenv /usr/bin/fw_setenv
330 - insinto /etc
331 - doins env/fw_env.config
332 - doman "${S}/doc/mkimage.1"
333 -}