All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bruce Ashfield <bruce.ashfield@windriver.com>
To: Darren Hart <dvhart@linux.intel.com>
Cc: Yocto Project <yocto@yoctoproject.org>
Subject: Re: linux-yocto: doesn't maintain patch order from SRC_URI?
Date: Tue, 29 Nov 2011 18:14:05 -0500	[thread overview]
Message-ID: <4ED5673D.4070304@windriver.com> (raw)
In-Reply-To: <4ED550FD.7090105@linux.intel.com>

On 11-11-29 04:39 PM, Darren Hart wrote:
> I'm experimenting with Matt Fleming's EFI_STUB patches. The first 10 patches were working fine, but when I try to add the 11th, the do_patch fails. I found that it isn't trying to apply the patches in the order listed in the recipe - no in any other recognizable pattern for that matter.
>

It's shell order. You really should just create a .scc file, put IT
on the SRC_URI and list the patches. You'll have no problems after
that.

I do have a fix for this, but can't send it right now due to travel.

You are using the compatibility mode for more than I originally intended
it for. So just dropping a .scc file into place will fix things
up nicely.

Bruce

> The recipe contains:
>
> # Add the efi-stub
> SRC_URI += "file://0001-x86-Add-missing-bzImage-fields-to-struct-setup_heade.patch \
>              file://0002-x86-efi-Make-efi_call_phys_prelog-CONFIG_RELOCATABLE.patch \
>              file://0003-x86-Don-t-use-magic-strings-for-EFI-loader-signature.patch \
>              file://0004-efi.h-Add-struct-definition-for-boot-time-services.patch \
>              file://0005-efi.h-Add-efi_image_loaded_t.patch \
>              file://0006-efi.h-Add-allocation-types-for-boottime-allocate_pag.patch \
>              file://0007-efi.h-Add-graphics-protocol-guids.patch \
>              file://0008-efi.h-Add-boottime-locate_handle-search-types.patch \
>              file://0009-efi-Add-EFI-file-I-O-data-types.patch \
>              file://0010-x86-efi-EFI-boot-stub-support.patch \
> 	    file://0011-x86-efi-Break-up-large-initrd-reads.patch \
>              "
>
> do_patch fails with:
> Log data follows:
> | Deleted branch meta-temp (was 620917d).
> | warning: could not find (or was already included): ktypes/yocto.scc
> | ./0-standard-yocto-61b5e146f9d113375883df8c51449722.sco: line 14: yocto_68b329da9893e34099c7d8ad5cb9c940: command not found
> | [INFO] validating against known patches  (standard-yocto-meta)
> error: arch/x86/boot/compressed/eboot.c: does not exist in index09 %)
> | To force apply this patch, use 'guilt push -f'
> | [ERROR] unable to complete push
> | pending patches are:
> | Patches directory doesn't exist, try guilt-init
> | ERROR. could not update git tree
> | ERROR: Function 'do_patch' failed (see /build/poky/ie/tmp/work/ie_phase1-poky-linux/linux-yocto-ie-3.0.4+git1+d51b0e743599a41a42e119f29f8dfa89854b3b5e_1+6b2c7d65b844e686eae7d5cccb9b638887afe28e-r4/temp/log.do_patch.2768 for further information)
>
> and meta/patches/standard/series contains:
>
> $ cat standard/series
> links/scratch/obj/0002-x86-efi-Make-efi_call_phys_prelog-CONFIG_RELOCATABLE.patch
> links/scratch/obj/0003-x86-Don-t-use-magic-strings-for-EFI-loader-signature.patch
> links/scratch/obj/0004-efi.h-Add-struct-definition-for-boot-time-services.patch
> links/scratch/obj/0005-efi.h-Add-efi_image_loaded_t.patch
> links/scratch/obj/0011-x86-efi-Break-up-large-initrd-reads.patch
>
> This needs to come after 10.
>
> links/scratch/obj/0007-efi.h-Add-graphics-protocol-guids.patch
> links/scratch/obj/0001-x86-Add-missing-bzImage-fields-to-struct-setup_heade.patch
> links/scratch/obj/0009-efi-Add-EFI-file-I-O-data-types.patch
> links/scratch/obj/0008-efi.h-Add-boottime-locate_handle-search-types.patch
> links/scratch/obj/0006-efi.h-Add-allocation-types-for-boottime-allocate_pag.patch
> links/scratch/obj/0010-x86-efi-EFI-boot-stub-support.patch
>
>
>



  reply	other threads:[~2011-11-29 23:14 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-29 21:39 linux-yocto: doesn't maintain patch order from SRC_URI? Darren Hart
2011-11-29 23:14 ` Bruce Ashfield [this message]
2011-11-30  0:41   ` Darren Hart
2011-11-30  0:56     ` Bruce Ashfield
2011-11-30  1:15     ` Darren Hart
2011-11-30  1:21       ` Darren Hart
2011-11-30 19:11         ` Bruce Ashfield
2011-11-30  0:46   ` Darren Hart
2011-11-30  0:55     ` Bruce Ashfield

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=4ED5673D.4070304@windriver.com \
    --to=bruce.ashfield@windriver.com \
    --cc=dvhart@linux.intel.com \
    --cc=yocto@yoctoproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.