Package-Manager: portage-2.2.8-r1
RepoMan-Options: --force
This commit is contained in:
Mario Fetka 2014-10-15 15:55:08 +02:00
parent 1aa10fa499
commit b7c9510269
7 changed files with 262 additions and 13 deletions

View File

@ -1,7 +1,17 @@
# ChangeLog for dev-embedded/u-boot-tools # ChangeLog for dev-embedded/u-boot-tools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.26 2012/09/05 04:51:29 radhermit Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.26 2012/09/05 04:51:29 radhermit Exp $
*u-boot-tools-2014.01 (15 Oct 2014)
*u-boot-tools-2014.10 (15 Oct 2014)
15 Oct 2014; Mario Fetka <mario.fetka@gmail.com>
+files/u-boot-no-config.h.patch,
+files/uboot-tools-01-drop-configh-from-tools.patch,
+files/uboot-tools-02-nostrip.patch, +u-boot-tools-2014.01.ebuild,
+u-boot-tools-2014.10.ebuild, -u-boot-tools-2012.10.ebuild:
Bump
05 Sep 2012; Tim Harder <radhermit@gentoo.org> 05 Sep 2012; Tim Harder <radhermit@gentoo.org>
-files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch, -files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch,
-u-boot-tools-2011.06.ebuild, -u-boot-tools-2011.06.ebuild,

View File

@ -1,5 +1,10 @@
DIST u-boot-2012.10.tar.bz2 9449657 SHA256 dddec75070b5faa5df463085e3e1d27c6d058ec3481c666917baa961956d4d17 SHA512 026d17ce767f27dd282c91a626e6ff41cd6bcad375186732c8933956974d7412076ae28ef59263ed880055d4e8dbb20c09144b24d678fa3b9955b500f1c7e402 WHIRLPOOL 5e6a78cf65e904a5b082800cea8a511369296226812039409defdebf1e825823bf224b6b51447c839fe20edb61f42cf1703dff98f97ce9b553171c7ac72f44bf AUX u-boot-no-config.h.patch 2909 SHA256 a0a862b536d23b2fb110e48d0b7c8ad8e81dfaf50b5952485df490db4ec5a986 SHA512 ddd42863ea74918915846c7b1e561807904875860a33348e72458be85d86fa040ad9b44155de631b0b6731a16660defc88ef712b4ab94484c92d6535fbd76535 WHIRLPOOL 7340f72f16c4dfca164335dc4ccd733b11686962b3bfd8fd8669b20166351d1906885ba7bd2bc8b19210621715fd6b2a6fd7f42fa4e272e4b52bbbae780ec5aa
DIST u-boot_2012.04.01-2.debian.tar.gz 31374 SHA256 2516dd9007d64d749a5194e845d47721110f0efd70a954966c0d43ba34fc0d14 SHA512 7294620a0a21267e487b5783ffcc55a00f4ab0e132573bbedb7e017dc7af44f9830a937f65bf045f8183422c999950dc40af9ef52aa2cb0e72cf221474e2fd33 WHIRLPOOL e3dd871a689c853135dbe4652d40e05e8a983514680f0a70d940b33322efb388be4095c64f667f07e794f5bd3be9375897b758b3211b991851827cf2eae5735c AUX uboot-tools-01-drop-configh-from-tools.patch 732 SHA256 69a69e130350091a7cbc9102163d0e5468068e45a0534bdf49f2e7ec225fddad SHA512 09914602462df0265b0d3701e9c3711e23f74364d5ba564e5ed6d40a0a90a848c8357014dc6ae54fb663c894e8eac3ceca41cda0129866b72c5772e944bc55f6 WHIRLPOOL b50c7646a19cb2de6ca71519832c8fb676d4a6db42c371657f3897e887f1a03a5b454a4e021a7cbb336459fc068f2f598562e67ee1f7ec83892d985c5a02edca
EBUILD u-boot-tools-2012.10.ebuild 1235 SHA256 a4c9cb74ed22b2748ef486d77839080c7b25cf15e3d8089cfeb3b0dc048bedf9 SHA512 8effa97e7821b6c2bdcd3c153efe05b84cca3210d2df6af6d47ce8a3ed2542d0fb8f77991464a260fa55dceaee1bda0cf2e744b2d519675a050dc9b152d25c52 WHIRLPOOL 3d1e41b90adee4dd39eeb38d309842e80e6f8a8e78528914f60453761aff9ae74f51aea661eac9634afa8de4e56d7acf325d210877432d461cea34378c38fb89 AUX uboot-tools-02-nostrip.patch 2193 SHA256 346a68cea01baf61de34efdc93dfe7d93d34de5a3fcb4cdc6257cf08c65d9cde SHA512 251c636272d1d90e42a8d67837de8a61aececf4ac49edcc5a70183606cb39682ea18afac40c982f8899350b97ad0a4e01495c497221ad3f1abf42039488dc9a0 WHIRLPOOL 2e142f77af0ecc662e6262ecf858dcc924d386533319c9b250e3ca35a96f0b9901cc77c70de99afcb1f61841ef66227540af0e7f70ed75801f28d74ce03b4984
MISC ChangeLog 4232 SHA256 6c16aa03624c5afa919f46b77d45aeab7b300a0a05b413f1c79db4a3c7f66dff SHA512 b474798191aaedd8144b7bf11b82fa12473e97988955ead137f0e5dbe5b75e8216c8fa2c8d676669ea854ffef9788b1467cdc0a5204aa3051d2ddf57d8c34147 WHIRLPOOL f53fffd3a21f122e7dee66993a33c0be6855de9257fe8ef70b108b171c51ee81f691b66eba763de53c305fa888b549fc8d8c7eb50179591afe8a6364a51f1025 DIST u-boot-2014.01.tar.bz2 10180625 SHA256 cdaf8c81583abfa2e73da46cfcf87b0cbd9741d9aa766f3b905376e3652d543d SHA512 c6e4f6f9a2dae1a50b7dd94dad13ef5d0ce440c3f0401de3f0ecf907c8fca0ff183077ec3b2c4da42b0fa9775450b03571725c76dfd2419a4ee7b982c261ccb1 WHIRLPOOL 9964abde477ce54dfe0a0972920e19c6d60209e8a19819c98b955a9a8b23cc57ac8e687d9ced65411eb6ff1ac40121edac154e754b3b5a2f037cf3a7724de374
DIST u-boot-2014.10.tar.bz2 10217685 SHA256 d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71 SHA512 2cc51b54fbaa26a32ceb9559bcc2ce986163a06e1fcad1b8be236c3e3bcf1fcf6662e083efda76a58d769cd3e95544b0934ca8d02521568096fb290ee7617153 WHIRLPOOL ba00103ebbfac03d9ed6b806e62e8d88d45925b5388cb221b143727bf55a340f0dca7837ee181f47ee7b08701847427d5f9b2bdffdb19a9b60d67f90ef60a6df
DIST u-boot_2014.07+dfsg1-2.debian.tar.xz 57996 SHA256 86d69f4cfd252d27c9f89639f580815c321017395f6f6e7ce4091c1ed642e55d SHA512 7490a28862f026a06f5fc400b1d9c8324a435c364d9006b50511b8fa7fc1e57efe4914d36969094113fd22e4a4dbe1a13264cd9a61eab51dbe502ea770cb2d89 WHIRLPOOL 7e3a7ed7c0f09445765c619247715ab81d2c1492ae50d67fe3f397bb09feb47a10ce20f55e92614afbd4da02767aa7be7c174df8e38b8feb830c05bb39bf118c
EBUILD u-boot-tools-2014.01.ebuild 1360 SHA256 245bf428b69c286a94196257e42aeaa705a73618ac139919525efc6f1d510746 SHA512 96ad0d17d5d5486f9c3c0367054da8de109ddcc456e1bd6f20dd67abe8bd7859106463a2e95038e185aae9710bd98df519508ab6fc866c560756f9be0a341a54 WHIRLPOOL 2423c8e58328c78677ca0a9e484cea533c8a32d111e6dc4e367176d4fd63e1e53ebb7d56e549f85117ddec2a3e76db5b56fa96f27a8f1cddb433849b5ca8d252
EBUILD u-boot-tools-2014.10.ebuild 1434 SHA256 436e987c67aca1f63e1dfc61388bff6ddd95225eb79acadab180842c1c6b6fac SHA512 8f495750e188efa77fc06043fad804b89049a5b55754092ecd717fb6da6351952facd1a53a118a34488776a598e03fd7d9fad5c86381ac9f865e6c759582a733 WHIRLPOOL ed084f4f8b4aab0dbdbe5b03bc37ca2e3266f50cd10dcc15c61a82e4d8cc48f1f6d08b2bb9161c2795bea49db96b698622758808aa52b95dd85e60a291147d29
MISC ChangeLog 4585 SHA256 5d7b0ef2176ba027ffcb9479a54b80c7cb52808c96404b24ec3e942ec8a5d728 SHA512 1812aae7f509fe1f43314dfade02d09061384bdb3d1dd43868c16e1f2ee93417314703c549904600511fdad14f6488fc5eca643abcd90ee870843b8f311f6e56 WHIRLPOOL d58b9eafb5b0ba814f0d2ba82dbb31679e7a6140a9ec53ca26581f32a363df86e803ac0b7f377c2cd729cdf93e371f44be19b67c7e612e672942ef40f07a4f3e
MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe

View File

@ -0,0 +1,92 @@
This patch has been reverted later on by
http://git.denx.de/?p=u-boot.git;a=commit;h=e3c52f2b8779469c843eb79282396f1a5ca3fef5
but we still need it to build the tools without having to configure
a full u-boot environment.
Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 10 Nov 2012 19:47:47 +0000 (+0000)
Subject: fw_env: fix building w/out a config.h
X-Git-Tag: v2013.01-rc3~19
X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=92ace272d06cec1d7f1533bb9edf914fb5845fba;hp=7a546db2ffc6a713fb8009d8246c29da5420f6a7
fw_env: fix building w/out a config.h
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
---
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 0e798e0..e6dc5f3 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c
HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
-HEADERS := fw_env.h $(OBJTREE)/include/config.h
+HEADERS := fw_env.h
# Compile for a hosted environment on the target
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
@@ -36,6 +36,15 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-DUSE_HOSTCC \
-DTEXT_BASE=$(TEXT_BASE)
+# Pass CONFIG_xxx settings via the command line so that we can build w/out
+# a config.h file existing in the first place. Useful for generic builds.
+CONFIG_VARS_TO_PASS = \
+ ENV_OVERWRITE \
+ OVERWRITE_ETHADDR_ONCE \
+ ETHADDR
+HOSTCPPFLAGS += \
+ $(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x))))
+
ifeq ($(MTD_VERSION),old)
HOSTCPPFLAGS += -DMTD_OLD
endif
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index a1a6807..19703c7 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -21,15 +21,6 @@
* MA 02111-1307 USA
*/
-/* Pull in the current config to define the default environment */
-#ifndef __ASSEMBLY__
-#define __ASSEMBLY__ /* get only #defines from config.h */
-#include <config.h>
-#undef __ASSEMBLY__
-#else
-#include <config.h>
-#endif
-
/*
* To build the utility with the static configuration
* comment out the next line.
@@ -52,22 +43,6 @@
#define DEVICE2_ENVSECTORS 2
#endif
-#ifndef CONFIG_BAUDRATE
-#define CONFIG_BAUDRATE 115200
-#endif
-
-#ifndef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
-#endif
-
-#ifndef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND \
- "bootp; " \
- "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
- "bootm"
-#endif
-
extern int fw_printenv(int argc, char *argv[]);
extern char *fw_getenv (char *name);
extern int fw_setenv (int argc, char *argv[]);

View File

@ -0,0 +1,25 @@
We need to build u-boot tools without a board configuration for the target.
fw_env just uses config.h to define the default environment of the created
image, so it really isn't mandatory.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index aff471b..dfe7439 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -5,14 +5,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-/* Pull in the current config to define the default environment */
-#ifndef __ASSEMBLY__
-#define __ASSEMBLY__ /* get only #defines from config.h */
-#include <config.h>
-#undef __ASSEMBLY__
-#else
-#include <config.h>
-#endif
/*
* To build the utility with the static configuration

View File

@ -0,0 +1,61 @@
From 17e0d6ddd1dc5d04b8032bde2f2076134b0c6dd7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 27 Aug 2014 14:21:32 +0200
Subject: [PATCH] tools/env: change stripping strategy to allow no-stripping
When building the U-Boot tools for non-ELF platforms (such as Blackfin
FLAT), since commit 79fc0c5f498c3982aa4740c273ab1a9255063d9c
("tools/env: cross-compile fw_printenv without setting HOSTCC"), the
build fails because it tries to strip a FLAT binary, which does not
make sense.
This commit solves this by changing the stripping logic in
tools/env/Makefile to be similar to the one in tools/Makefile. This
logic continues to apply strip to the final binary, but does not abort
the build if it fails, and does the stripping in place on the final
binary. This allows the logic to work fine if stripping doesn't work,
as it leaves the final binary untouched.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Sonic Zhang <sonic.zhang@analog.com>
---
An improved solution would be to be able to override STRIP completely
by setting it to /bin/true, but the main Makefile enforces STRIP =
$(CROSS_COMPILE)strip.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
tools/env/Makefile | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/tools/env/Makefile b/tools/env/Makefile
index f5368bc..d047aa5 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -21,14 +21,16 @@ HOST_EXTRACFLAGS += -DMTD_OLD
endif
always := fw_printenv
-hostprogs-y := fw_printenv_unstripped
+hostprogs-y := fw_printenv
-fw_printenv_unstripped-objs := fw_env.o fw_env_main.o \
+fw_printenv-objs := fw_env.o fw_env_main.o \
crc32.o ctype.o linux_string.o \
env_attr.o env_flags.o aes.o
-quiet_cmd_strip = STRIP $@
- cmd_strip = $(STRIP) -o $@ $<
+quiet_cmd_crosstools_strip = STRIP $^
+ cmd_crosstools_strip = $(STRIP) $^; touch $@
-$(obj)/fw_printenv: $(obj)/fw_printenv_unstripped FORCE
- $(call if_changed,strip)
+$(obj)/.strip: $(obj)/fw_printenv
+ $(call cmd,crosstools_strip)
+
+always += .strip
--
2.0.0

View File

@ -0,0 +1,51 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild,v 1.4 2014/05/03 14:44:01 zlogene Exp $
EAPI="5"
inherit eutils toolchain-funcs
MY_P="u-boot-${PV/_/-}"
DEB_PV="2014.07+dfsg1-2"
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
mirror://debian/pool/main/u/u-boot/u-boot_${DEB_PV}.debian.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm x86"
IUSE=""
S=${WORKDIR}/${MY_P}
src_prepare() {
sed -i "s:-g ::" tools/Makefile || die
# Make sure we find local u-boot headers first #429302
ln -s ../include/image.h tools/ || die
epatch "${FILESDIR}"/u-boot-no-config.h.patch
}
src_compile() {
emake \
HOSTSTRIP=: \
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 mkenvimage 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/*.1 "${WORKDIR}"/debian/manpages/*.8
insinto /etc/fw_env.d
"${WORKDIR}"/debian/env-configs/*.config
}

View File

@ -1,37 +1,42 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2011.12.ebuild,v 1.4 2012/08/08 15:09:18 nativemad Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2011.12.ebuild,v 1.4 2012/08/08 15:09:18 nativemad Exp $
EAPI="4" EAPI="4"
inherit toolchain-funcs inherit eutils toolchain-funcs
MY_P="u-boot-${PV/_/-}" MY_P="u-boot-${PV/_/-}"
DEB_PV="2012.04.01-2" DEB_PV="2014.07+dfsg1-2"
DESCRIPTION="utilities for working with Das U-Boot" DESCRIPTION="utilities for working with Das U-Boot"
HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome" HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2 SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2
http://ftp.de.debian.org/debian/pool/main/u/u-boot/u-boot_${DEB_PV}.debian.tar.gz" mirror://debian/pool/main/u/u-boot/u-boot_${DEB_PV}.debian.tar.xz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="amd64 arm x86" KEYWORDS=""
IUSE="" IUSE=""
S=${WORKDIR}/${MY_P} S=${WORKDIR}/${MY_P}
src_prepare() { src_prepare() {
sed -i -e "s:-g ::" tools/Makefile || die sed -i "s:-g ::" tools/Makefile || die
touch include/config.h || die # Make sure we find local u-boot headers first #429302
ln -s ../include/image.h tools/ || die
epatch "${FILESDIR}"/uboot-tools-01-drop-configh-from-tools.patch
epatch "${FILESDIR}"/uboot-tools-02-nostrip.patch
} }
src_compile() { src_compile() {
emake \ emake \
HOSTSTRIP=echo \ HOSTSTRIP=: \
HOSTCC="$(tc-getCC)" \ HOSTCC="$(tc-getCC)" \
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
HOSTLDFLAGS="${LDFLAGS}" \ HOSTLDFLAGS="${LDFLAGS}" \
CONFIG_ENV_OVERWRITE=y \
tools-all tools-all
#tools-only
} }
src_install() { src_install() {