From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-embedded/u-boot-tools: u-boot-tools-2012.10.ebuild ChangeLog
Date: Sat, 10 Nov 2012 07:13:49 +0000 (UTC) [thread overview]
Message-ID: <20121110071349.863B620C63@flycatcher.gentoo.org> (raw)
vapier 12/11/10 07:13:49
Modified: u-boot-tools-2012.10.ebuild ChangeLog
Log:
Clean up build.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.4 dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild?r1=1.3&r2=1.4
Index: u-boot-tools-2012.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- u-boot-tools-2012.10.ebuild 9 Nov 2012 21:57:35 -0000 1.3
+++ u-boot-tools-2012.10.ebuild 10 Nov 2012 07:13:49 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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-2012.10.ebuild,v 1.3 2012/11/09 21:57:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild,v 1.4 2012/11/10 07:13:49 vapier Exp $
EAPI="4"
@@ -20,36 +20,24 @@
src_prepare() {
sed -i -e "s:-g ::" tools/Makefile || die
- # We don't have a config.h as we are building
- # for host and not for a board
- sed -i -e "/config.h/d" tools/env/fw_env.c || die
- # All this insanity is not required if there is no
- # /usr/include/image.h installed
- if [[ -e ${ROOT}/usr/include/image.h ]]; then
- einfo "A image.h header is installed in /usr/include/"
- einfo "Fixing u-boot files to use the local image.h header"
- # FIXME: HACK. media-libs/lensfun installs image.h
- # Copy local image.h to tools/ and common/ directory
- cp include/image.h common/image.h || die
- cp include/image.h tools/image.h || die
- sed -i -e "s:<image.h>:\"image.h\":" common/image.c || die
- # Fix headers so local copy is picked up first
- grep -r "<image\.h>" tools/* | cut -d ":" -f 1 | \
- xargs sed -i -e "s:<image.h>:\"image.h\":" || die
- fi
+ # This has been fixed upstream after 2012.10
+ sed -i '/include.*config.h/d' tools/env/fw_env.[ch] || die
+ # Make sure we find local u-boot headers first #429302
+ ln -s ../include/image.h tools/ || die
}
src_compile() {
emake \
- HOSTSTRIP=echo \
+ HOSTSTRIP=: \
HOSTCC="$(tc-getCC)" \
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
HOSTLDFLAGS="${LDFLAGS}" \
+ CONFIG_ENV_OVERWRITE=y \
tools-all
}
src_install() {
- cd tools env
+ cd tools
dobin bmp_logo gen_eth_addr img2srec mkimage
dobin easylogo/easylogo
dobin env/fw_printenv
1.30 dev-embedded/u-boot-tools/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog?r1=1.29&r2=1.30
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog 9 Nov 2012 21:57:35 -0000 1.29
+++ ChangeLog 10 Nov 2012 07:13:49 -0000 1.30
@@ -1,6 +1,9 @@
# ChangeLog for dev-embedded/u-boot-tools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.29 2012/11/09 21:57:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.30 2012/11/10 07:13:49 vapier Exp $
+
+ 10 Nov 2012; Mike Frysinger <vapier@gentoo.org> u-boot-tools-2012.10.ebuild:
+ Clean up build.
09 Nov 2012; Markos Chandras <hwoarang@gentoo.org>
u-boot-tools-2012.10.ebuild:
next reply other threads:[~2012-11-10 7:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-10 7:13 Mike Frysinger (vapier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-09 21:57 [gentoo-commits] gentoo-x86 commit in dev-embedded/u-boot-tools: u-boot-tools-2012.10.ebuild ChangeLog Markos Chandras (hwoarang)
2012-11-09 21:56 Markos Chandras (hwoarang)
2012-11-09 21:53 Markos Chandras (hwoarang)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121110071349.863B620C63@flycatcher.gentoo.org \
--to=vapier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox