[gentoo-commits] proj/musl:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/

[Jory Pratt]

commit:     cbac0c51832ecc772ae353910253bff66f61853d
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 22:52:42 2016 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 22:52:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=cbac0c51

dev-embedded/u-boot-tools: Add patch for missing includes for musl

 dev-embedded/u-boot-tools/ChangeLog-2015           | 193 +++++++++++++++++++++
 dev-embedded/u-boot-tools/Manifest                 |   5 +
 .../files/u-boot-tools-2015.04-musl-support.patch  |  49 ++++++
 dev-embedded/u-boot-tools/metadata.xml             |   5 +
 .../u-boot-tools/u-boot-tools-2015.04.ebuild       |  48 +++++
 5 files changed, 300 insertions(+)

diff --git a/dev-embedded/u-boot-tools/ChangeLog-2015 b/dev-embedded/u-boot-tools/ChangeLog-2015
new file mode 100644
index 0000000..033f78c
--- /dev/null
+++ b/dev-embedded/u-boot-tools/ChangeLog-2015
@@ -0,0 +1,193 @@
+# ChangeLog for dev-embedded/u-boot-tools
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.40 2015/05/05 09:19:51 aballier Exp $
+
+*u-boot-tools-2015.04 (05 May 2015)
+
+  05 May 2015; Alexis Ballier <aballier@g.o>
+  +u-boot-tools-2015.04.ebuild:
+  bump to 2015.04; install mkimage man page
+
+  02 Mar 2015; Markos Chandras <hwoarang@g.o>
+  u-boot-tools-2015.01.ebuild:
+  unset a few KBUILD variables. Bug #540476
+
+*u-boot-tools-2015.01 (11 Feb 2015)
+
+  11 Feb 2015; Markos Chandras <hwoarang@g.o>
+  +u-boot-tools-2015.01.ebuild:
+  Version bump
+
+  03 May 2014; Mikle Kolyada <zlogene@g.o> u-boot-tools-2014.01.ebuild:
+  x86 stable wrt bug #502646
+
+  03 May 2014; Mikle Kolyada <zlogene@g.o> u-boot-tools-2014.01.ebuild:
+  amd64 stable wrt bug #502646
+
+  01 Apr 2014; Markus Meier <maekke@g.o> u-boot-tools-2014.01.ebuild:
+  arm stable, bug #502646
+
+  25 Jan 2014; Tim Harder <radhermit@g.o> -u-boot-tools-2011.12.ebuild,
+  -u-boot-tools-2012.10.ebuild:
+  Remove old.
+
+*u-boot-tools-2014.01 (25 Jan 2014)
+
+  25 Jan 2014; Tim Harder <radhermit@g.o> +u-boot-tools-2014.01.ebuild:
+  Version bump.
+
+  26 Dec 2013; Mike Frysinger <vapier@g.o> u-boot-tools-2013.07.ebuild:
+  Stabilize for all #495366.
+
+*u-boot-tools-2013.07 (27 Sep 2013)
+
+  27 Sep 2013; Markos Chandras <hwoarang@g.o>
+  +files/u-boot-no-config.h.patch, +u-boot-tools-2013.07.ebuild:
+  Version bump
+
+  10 Nov 2012; Mike Frysinger <vapier@g.o> u-boot-tools-2012.10.ebuild:
+  Clean up build.
+
+  09 Nov 2012; Markos Chandras <hwoarang@g.o>
+  u-boot-tools-2012.10.ebuild:
+  s/ewarn/einfo/
+
+  09 Nov 2012; Markos Chandras <hwoarang@g.o>
+  u-boot-tools-2012.10.ebuild:
+  Fix typo in comment
+
+*u-boot-tools-2012.10 (09 Nov 2012)
+
+  09 Nov 2012; Markos Chandras <hwoarang@g.o>
+  +u-boot-tools-2012.10.ebuild:
+  Version bump. Bug #437576
+
+  05 Sep 2012; Tim Harder <radhermit@g.o>
+  -files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch,
+  -u-boot-tools-2011.06.ebuild,
+  -files/2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch,
+  -u-boot-tools-2011.09.ebuild,
+  -files/2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch:
+  Remove old.
+
+  08 Aug 2012; Andreas Schuerch <nativemad@g.o>
+  u-boot-tools-2011.12.ebuild:
+  x86 stable, see bug 418675
+
+  05 Aug 2012; Markus Meier <maekke@g.o> u-boot-tools-2011.12.ebuild:
+  arm stable, bug #418675
+
+  03 Aug 2012; Markos Chandras <hwoarang@g.o>
+  u-boot-tools-2011.12.ebuild:
+  Stable on amd64 wrt bug #418675
+
+  16 Jan 2012; Tim Harder <radhermit@g.o> -u-boot-tools-2010.06.ebuild,
+  -u-boot-tools-2010.12.ebuild:
+  Remove old.
+
+*u-boot-tools-2011.12 (01 Jan 2012)
+
+  01 Jan 2012; Tim Harder <radhermit@g.o> +u-boot-tools-2011.12.ebuild:
+  Version bump.
+
+*u-boot-tools-2011.09 (14 Oct 2011)
+
+  14 Oct 2011; Mike Frysinger <vapier@g.o>
+  +files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch,
+  +files/2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch,
+  +files/2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch,
+  +u-boot-tools-2011.09.ebuild:
+  Version bump.
+
+  14 Oct 2011; Mike Frysinger <vapier@g.o> u-boot-tools-2011.06.ebuild:
+  Stabilize for all.
+
+*u-boot-tools-2011.06 (21 Aug 2011)
+
+  21 Aug 2011; Tim Harder <radhermit@g.o> +u-boot-tools-2011.06.ebuild:
+  Version bump
+
+*u-boot-tools-2010.12 (14 Mar 2011)
+
+  14 Mar 2011; Tim Harder <radhermit@g.o> -u-boot-tools-2009.03.ebuild,
+  -u-boot-tools-2009.11.1.ebuild, +u-boot-tools-2010.12.ebuild:
+  Version bump (bug #355669 by Jacob Galbreath) and remove old. Update to EAPI
+  4 and remove unnecessary compile setup and die usage.
+
+  07 Mar 2011; Raúl Porcel <armin76@g.o> u-boot-tools-2010.06.ebuild:
+  x86stable wrt #355671
+
+  06 Mar 2011; Michael Weber <xmw@g.o> u-boot-tools-2010.06.ebuild:
+  arm stable (bug 355671)
+
+  21 Feb 2011; Markos Chandras <hwoarang@g.o>
+  u-boot-tools-2010.06.ebuild:
+  Stable on amd64 wrt bug #355671
+
+*u-boot-tools-2010.06 (15 Aug 2010)
+
+  15 Aug 2010; Mike Frysinger <vapier@g.o> +u-boot-tools-2010.06.ebuild:
+  Version bump #319647 by Jesse Adelman.
+
+*u-boot-tools-2009.11.1 (05 Jun 2010)
+
+  05 Jun 2010; Raúl Porcel <armin76@g.o>
+  +u-boot-tools-2009.11.1.ebuild:
+  Version bump
+
+*u-boot-tools-2009.08 (04 Sep 2009)
+
+  04 Sep 2009; Mike Frysinger <vapier@g.o>
+  +u-boot-tools-2009.08.ebuild:
+  Version bump.
+
+*u-boot-tools-2009.08_rc3 (26 Aug 2009)
+
+  26 Aug 2009; Raúl Porcel <armin76@g.o>
+  +u-boot-tools-2009.08_rc3.ebuild:
+  Version bump
+
+*u-boot-tools-2009.06 (19 Jul 2009)
+
+  19 Jul 2009; Mike Frysinger <vapier@g.o>
+  +u-boot-tools-2009.06.ebuild:
+  Version bump.
+
+  07 May 2009; Raúl Porcel <armin76@g.o>
+  u-boot-tools-2009.03.ebuild:
+  amd64/arm/x86 stable
+
+*u-boot-tools-2009.03 (29 Mar 2009)
+
+  29 Mar 2009; Raúl Porcel <armin76@g.o>
+  +u-boot-tools-2009.03.ebuild:
+  Version bump
+
+*u-boot-tools-2009.01 (16 Mar 2009)
+
+  16 Mar 2009; Raúl Porcel <armin76@g.o>
+  +u-boot-tools-2009.01.ebuild:
+  Version bump wrt #258414
+
+  25 Nov 2008; Raúl Porcel <armin76@g.o>
+  u-boot-tools-2008.10.ebuild:
+  arm stable
+
+  26 Oct 2008; Markus Meier <maekke@g.o> u-boot-tools-1.3.1.ebuild:
+  amd64/x86 stable, bug #242518
+
+*u-boot-tools-2008.10 (26 Oct 2008)
+
+  26 Oct 2008; Mike Frysinger <vapier@g.o>
+  +u-boot-tools-2008.10.ebuild:
+  Version bump.
+
+  12 May 2008; <solar@g.o> u-boot-tools-1.3.1.ebuild:
+  - keyworded ~arm per request. Builds native but fails at cross-compiles.
+  TODO: Fix CROSS_COMPILE= logic to allow the variable to be passed so it gets
+  the right CTARGET-CC
+
+*u-boot-tools-1.3.1 (24 Dec 2007)
+
+  24 Dec 2007; Mike Frysinger <vapier@g.o> +u-boot-tools-1.3.1.ebuild:
+  Initial import.  Ebuild by me.

diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
new file mode 100644
index 0000000..d638d5f
--- /dev/null
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -0,0 +1,5 @@
+AUX u-boot-tools-2015.04-musl-support.patch 1132 SHA256 a76b667d2c53151e28ad1e834dc058dda053fdb0488b02b143eaa65b21a06f0d SHA512 e7e96944ff82a56fee2c032f2503b48e50a4e9a1654445f305963b65a8d97046d1f284a25a5033f4ce25359bb296927b1520ceb553436b2b26f50b13d73d225e WHIRLPOOL cd1de1ebd12580156193db07da9fe8505ed28bc6db8a029b1a8a8c40a4c45bebb04690f50f64b55ee0db1a823536d51471ae832dcb17dec1598a3486af3e4628
+DIST u-boot-2015.04.tar.bz2 9471487 SHA256 0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60 SHA512 e50a3d7e44bf588a7cf8e28cdf3342bc38bd1bf55231d579c2501b75386cfff0fbc7a34648d893971e0095510c9d582b7180427832cb78470b4e7af2ce0e3646 WHIRLPOOL dbfd4b13b82505ef94e8b394ba260684ee18c881bd84adfc841194ce6a4b967c8514cedfcac6777045a50b940e3a1882af667e152dc0fc0d3b9254a7dfca89d0
+EBUILD u-boot-tools-2015.04.ebuild 1015 SHA256 bce3a8289d663e8301ce26861a77e5454421b2fa31b067e22ee3ea14cf348569 SHA512 fb9c881e000d51de5d799c4576b552fddbb90ed427eaa5a695003e175daa50182688f56b29bb88343ec6e600e0e921ce96b3df4f703d10eff7abaa27c80f9730 WHIRLPOOL 11c9a786f22da21c62e76e5e7a13ad3469a82d8ee189ef55826d40b61fac5f588c73755ee2cdda02fad59a9b00cf5c362be23dcff585b16c153dac504009f50c
+MISC ChangeLog-2015 5985 SHA256 42713615155e36eef4d72dfdb4200b01ef285a4343145e8cf57d3a4023c290d8 SHA512 dc39ecc02c08703c4315f19e6d02fa5fb15b464d366a790ed9edaf8cff4fd3e30e810c32a9244cce452a010383479340aac4b0c29ce766abf8cc54d77d8eb20f WHIRLPOOL e55bd174beb38ad6f55f0a4a487af10c3d3321f198a0d7ea281fd8e1aeb57c034a6ce53a7b44c97b975cac6514e3223b688cd432db7e540d11bd9aa680125302
+MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe

diff --git a/dev-embedded/u-boot-tools/files/u-boot-tools-2015.04-musl-support.patch b/dev-embedded/u-boot-tools/files/u-boot-tools-2015.04-musl-support.patch
new file mode 100644
index 0000000..a4e7245
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/u-boot-tools-2015.04-musl-support.patch
@@ -0,0 +1,49 @@
+diff --git a/include/image.h b/include/image.h
+index 3844be6..60b924a 100644
+--- a/include/image.h
++++ b/include/image.h
+@@ -23,6 +23,7 @@
+ struct lmb;
+ 
+ #ifdef USE_HOSTCC
++#include <sys/types.h>
+ 
+ /* new uImage format support enabled on host */
+ #define CONFIG_FIT		1
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index 1173eea..daa02a7 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -8,6 +8,8 @@
+  * SPDX-License-Identifier:	GPL-2.0+
+  */
+ 
++#define _GNU_SOURCE
++
+ #include <errno.h>
+ #include <env_flags.h>
+ #include <fcntl.h>
+diff --git a/tools/imagetool.h b/tools/imagetool.h
+index 3e15b4e..b7874f4 100644
+--- a/tools/imagetool.h
++++ b/tools/imagetool.h
+@@ -16,6 +16,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <time.h>
+ #include <unistd.h>
+ #include <u-boot/sha1.h>
+diff --git a/tools/proftool.c b/tools/proftool.c
+index 3482951..9ce7a77 100644
+--- a/tools/proftool.c
++++ b/tools/proftool.c
+@@ -16,6 +16,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/param.h>
++#include <sys/types.h>
+ 
+ #include <compiler.h>
+ #include <trace.h>

diff --git a/dev-embedded/u-boot-tools/metadata.xml b/dev-embedded/u-boot-tools/metadata.xml
new file mode 100644
index 0000000..9211408
--- /dev/null
+++ b/dev-embedded/u-boot-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>dev-embedded</herd>
+</pkgmetadata>

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
new file mode 100644
index 0000000..0c145d4
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-musl-support.patch
+}
+
+src_compile() {
+	# Unset a few KBUILD variables. Bug #540476
+	unset KBUILD_OUTPUT KBUILD_SRC
+	emake defconfig
+	emake \
+		HOSTSTRIP=: \
+		STRIP=: \
+		HOSTCC="$(tc-getCC)" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		CONFIG_ENV_OVERWRITE=y \
+		tools-all
+}
+
+src_install() {
+	cd tools
+	dobin bmp_logo gen_eth_addr img2srec mkimage
+	dobin easylogo/easylogo
+	dobin env/fw_printenv
+	dosym fw_printenv /usr/bin/fw_setenv
+	insinto /etc
+	doins env/fw_env.config
+	doman "${S}/doc/mkimage.1"
+}