Op 10 apr. 2012, om 16:19 heeft Stefan Herbrechtsmeier het volgende geschreven:
> Am 10.04.2012 15:56, schrieb Koen Kooi: >> Op 10 apr. 2012, om 15:41 heeft Richard Purdie het volgende geschreven: >> >>> On Fri, 2012-04-06 at 06:29 -0700, Koen Kooi wrote: >>>> Op 5 apr. 2012 om 20:18 heeft Saul Wold<s...@linux.intel.com> het >>>> volgende geschreven: >>>> >>>>> On 04/05/2012 04:48 AM, Stefan Herbrechtsmeier wrote: >>>>>> Signed-off-by: Stefan Herbrechtsmeier<ste...@herbrechtsmeier.net> >>>>>> --- >>>>>> 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. >> Can we back it out? It breaks a ton of buildscripts. SPL_SYMLINK already has >> the machine. > But this means that your SPL_SYMLINK can point to a wrong SPL_IMAGE if you > don't use machine in the tmpdir path and build more than one machine. I guess I'll have a suggestion for the 1.3 release: [koen@Angstrom-F16-vm-rpm meta-angstrom]$ git grep DEPLOY_DIR_IMAGE conf/distro/include/angstrom.inc:DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core