Patchwork [1/2] Revert "kernel.bbclass: move bundle_initramfs after kernel_link_vmlinux"

login
register
mail settings
Submitter Mike Crowe
Date Nov. 22, 2013, 2:04 p.m.
Message ID <1385129059-941-2-git-send-email-mac@mcrowe.com>
Download mbox | patch
Permalink /patch/62231/
State New
Headers show

Comments

Mike Crowe - Nov. 22, 2013, 2:04 p.m.
This reverts commit 3baa63b4d588c3262254528b406ede265dd117bf. It broke
builds that aren't using kernel-yocto.

Signed-off-by: Mike Crowe <mcrowe@brightsign.biz>
---
 meta/classes/kernel.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Bruce Ashfield - Nov. 22, 2013, 3:53 p.m.
On Fri, Nov 22, 2013 at 9:04 AM, Mike Crowe <mac@mcrowe.com> wrote:
> This reverts commit 3baa63b4d588c3262254528b406ede265dd117bf. It broke
> builds that aren't using kernel-yocto.

Can we get a log message of the breakage in the commit ? And a follow up
question, have we simply restored the issue that the original commit was
fixing ?

Bruce

>
> Signed-off-by: Mike Crowe <mcrowe@brightsign.biz>
> ---
>  meta/classes/kernel.bbclass |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 48999fe..ba13e67 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -152,7 +152,7 @@ python do_devshell_prepend () {
>      os.environ["LDFLAGS"] = ''
>  }
>
> -addtask bundle_initramfs after do_kernel_link_vmlinux before do_build
> +addtask bundle_initramfs after do_compile before do_build
>
>  kernel_do_compile() {
>         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
> --
> 1.7.10.4
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Bruce Ashfield - Nov. 22, 2013, 3:54 p.m.
On Fri, Nov 22, 2013 at 10:53 AM, Bruce Ashfield
<bruce.ashfield@gmail.com> wrote:
> On Fri, Nov 22, 2013 at 9:04 AM, Mike Crowe <mac@mcrowe.com> wrote:
>> This reverts commit 3baa63b4d588c3262254528b406ede265dd117bf. It broke
>> builds that aren't using kernel-yocto.
>
> Can we get a log message of the breakage in the commit ? And a follow up
> question, have we simply restored the issue that the original commit was
> fixing ?

Aha. I see the other patch makes sure that we haven't re-broken anything.

Cheers,

Bruce

>
> Bruce
>
>>
>> Signed-off-by: Mike Crowe <mcrowe@brightsign.biz>
>> ---
>>  meta/classes/kernel.bbclass |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index 48999fe..ba13e67 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -152,7 +152,7 @@ python do_devshell_prepend () {
>>      os.environ["LDFLAGS"] = ''
>>  }
>>
>> -addtask bundle_initramfs after do_kernel_link_vmlinux before do_build
>> +addtask bundle_initramfs after do_compile before do_build
>>
>>  kernel_do_compile() {
>>         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
>> --
>> 1.7.10.4
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 48999fe..ba13e67 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -152,7 +152,7 @@  python do_devshell_prepend () {
     os.environ["LDFLAGS"] = ''
 }
 
-addtask bundle_initramfs after do_kernel_link_vmlinux before do_build
+addtask bundle_initramfs after do_compile before do_build
 
 kernel_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE