From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 93-97-173-237.zone5.bethere.co.uk ([93.97.173.237] helo=tim.rpsys.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SHbT2-00048G-MQ for openembedded-core@lists.openembedded.org; Tue, 10 Apr 2012 15:50:44 +0200 Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q3ADfQVs027324 for ; Tue, 10 Apr 2012 14:41:26 +0100 Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 26433-07 for ; Tue, 10 Apr 2012 14:41:21 +0100 (BST) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q3ADfJFf027318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 10 Apr 2012 14:41:20 +0100 Message-ID: <1334065279.10826.14.camel@ted> From: Richard Purdie To: Patches and discussions about the oe-core layer Date: Tue, 10 Apr 2012 14:41:19 +0100 In-Reply-To: <1967D97F-63A7-49DA-930F-A0C6F1F4112F@dominion.thruhere.net> References: <1333626507-32182-1-git-send-email-stefan@herbrechtsmeier.net> <4F7E607E.9050101@linux.intel.com> <1967D97F-63A7-49DA-930F-A0C6F1F4112F@dominion.thruhere.net> X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 X-Virus-Scanned: amavisd-new at rpsys.net Subject: Re: [PATCH] u-boot: add machine name to spl image name X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2012 13:50:44 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Fri, 2012-04-06 at 06:29 -0700, Koen Kooi wrote: > > Op 5 apr. 2012 om 20:18 heeft Saul Wold het volgende geschreven: > > > On 04/05/2012 04:48 AM, Stefan Herbrechtsmeier wrote: > >> Signed-off-by: Stefan Herbrechtsmeier > >> --- > >> meta/recipes-bsp/u-boot/u-boot.inc | 2 +- > >> meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 2 +- > >> meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 2 +- > >> 3 files changed, 3 insertions(+), 3 deletions(-) > >> > >> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc > >> index 700d5d3..0445c34 100644 > >> --- a/meta/recipes-bsp/u-boot/u-boot.inc > >> +++ b/meta/recipes-bsp/u-boot/u-boot.inc > >> @@ -32,7 +32,7 @@ UBOOT_MAKE_TARGET ?= "all" > >> # deploy directory. For those versions they can set the following variables > >> # to allow packaging the SPL. > >> SPL_BINARY ?= "" > >> -SPL_IMAGE ?= "${SPL_BINARY}-${PV}-${PR}" > >> +SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}" > >> SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" > >> > >> do_compile () { > >> diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb > >> index 1ebdbea..e99bc2c 100644 > >> --- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb > >> +++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb > >> @@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" > >> SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" > >> > >> PV = "v2011.03+git${SRCPV}" > >> -PR = "r5" > >> +PR = "r6" > >> > >> SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" > >> > >> diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb > >> index 8ebdbff..680401f 100644 > >> --- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb > >> +++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb > >> @@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" > >> SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" > >> > >> PV = "v2011.06+git${SRCPV}" > >> -PR = "r0" > >> +PR = "r1" > >> > >> SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" > >> > > > > Merged into OE-Core > > wait a minute, why was this merged? In retrospect it shouldn't. It was presented to me as part of a series and I wasn't careful enough about sifting through the commits, likely the jetlag wasn't helping. I'll aim to try harder, people can help by pointing out patches they don't think should be going into the release at this point... Cheers, Richard