From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AB19D1381F3 for ; Sat, 10 Nov 2012 07:13:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5475821C002; Sat, 10 Nov 2012 07:13:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C15B021C002 for ; Sat, 10 Nov 2012 07:13:51 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCE0333D8B0 for ; Sat, 10 Nov 2012 07:13:50 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 863B620C63; Sat, 10 Nov 2012 07:13:49 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-embedded/u-boot-tools: u-boot-tools-2012.10.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: u-boot-tools-2012.10.ebuild ChangeLog X-VCS-Directories: dev-embedded/u-boot-tools X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121110071349.863B620C63@flycatcher.gentoo.org> Date: Sat, 10 Nov 2012 07:13:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f983eadc-22fe-4c22-9826-8863eb4681fc X-Archives-Hash: bc2f940bfc9960d3da924f33217ad6f9 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\":" common/image.c || die - # Fix headers so local copy is picked up first - grep -r "" tools/* | cut -d ":" -f 1 | \ - xargs sed -i -e "s::\"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 u-boot-tools-2012.10.ebuild: + Clean up build. 09 Nov 2012; Markos Chandras u-boot-tools-2012.10.ebuild: