[PATCH] image: Add missing depends on virtual/kernel for depmod data

[PATCH] image: Add missing depends on virtual/kernel for depmod data

[Richard Purdie]

We need the depmod data so that the kernel depmod command works successfully
at rootfs time. The fact this was working inconsistently is now highlighted
after the command was made to error out. A simple test case is:

bitbake virtual/kernel image
bitbake vrituak/kernel -c clean
bitbake image -c rootfs -f

We fix it by adding the missing dependency.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 22b6970..5b88f53 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -72,8 +72,10 @@ LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
 LDCONFIGDEPEND_libc-uclibc = ""
 LDCONFIGDEPEND_libc-musl = ""
 
-do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
-do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
+do_rootfs[depends] += " \
+    makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \
+    virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \
+    virtual/kernel:do_populate_sysroot"
 do_rootfs[recrdeptask] += "do_packagedata"
 
 def command_variables(d):

Re: [PATCH] image: Add missing depends on virtual/kernel for depmod data

[Bruce Ashfield]

On 15-01-27 10:29 AM, Richard Purdie wrote:
> We need the depmod data so that the kernel depmod command works successfully
> at rootfs time. The fact this was working inconsistently is now highlighted
> after the command was made to error out. A simple test case is:
>
> bitbake virtual/kernel image
> bitbake vrituak/kernel -c clean
> bitbake image -c rootfs -f
>
> We fix it by adding the missing dependency.

Looks good here.

Out of curiosity, was this hiding before, or did it only come about due
to our recent moves to the work-shared kernel builds ?

Bruce


>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 22b6970..5b88f53 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -72,8 +72,10 @@ LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
>   LDCONFIGDEPEND_libc-uclibc = ""
>   LDCONFIGDEPEND_libc-musl = ""
>
> -do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
> -do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
> +do_rootfs[depends] += " \
> +    makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \
> +    virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \
> +    virtual/kernel:do_populate_sysroot"
>   do_rootfs[recrdeptask] += "do_packagedata"
>
>   def command_variables(d):
>
>

Re: [PATCH] image: Add missing depends on virtual/kernel for depmod data

[Hart, Darren]

On 1/27/15, 7:45 AM, "Bruce Ashfield" <bruce.ashfield@windriver.com> wrote:

>On 15-01-27 10:29 AM, Richard Purdie wrote:
>> We need the depmod data so that the kernel depmod command works
>>successfully
>> at rootfs time. The fact this was working inconsistently is now
>>highlighted
>> after the command was made to error out. A simple test case is:
>>
>> bitbake virtual/kernel image
>> bitbake vrituak/kernel -c clean
>> bitbake image -c rootfs -f
>>
>> We fix it by adding the missing dependency.
>
>Looks good here.
>
>Out of curiosity, was this hiding before, or did it only come about due
>to our recent moves to the work-shared kernel builds ?

I'm being dense I guess. I went to go verify what virtual/kernel
do_populate_sysroot is doing in the current state of things, in order to
be sure it copied over the right files, and I couldn't find it quickly.
Where is this defined?

-- 
Darren Hart
Intel Open Source Technology Center

Re: [PATCH] image: Add missing depends on virtual/kernel for depmod data

[Richard Purdie]

On Tue, 2015-01-27 at 15:48 +0000, Hart, Darren wrote:
> On 1/27/15, 7:45 AM, "Bruce Ashfield" <bruce.ashfield@windriver.com> wrote:
> 
> >On 15-01-27 10:29 AM, Richard Purdie wrote:
> >> We need the depmod data so that the kernel depmod command works
> >>successfully
> >> at rootfs time. The fact this was working inconsistently is now
> >>highlighted
> >> after the command was made to error out. A simple test case is:
> >>
> >> bitbake virtual/kernel image
> >> bitbake vrituak/kernel -c clean
> >> bitbake image -c rootfs -f
> >>
> >> We fix it by adding the missing dependency.
> >
> >Looks good here.
> >
> >Out of curiosity, was this hiding before, or did it only come about due
> >to our recent moves to the work-shared kernel builds ?
> 
> I'm being dense I guess. I went to go verify what virtual/kernel
> do_populate_sysroot is doing in the current state of things, in order to
> be sure it copied over the right files, and I couldn't find it quickly.
> Where is this defined?

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=11ef55a93bd2bbd95e203fab3aa237322923ffd9

Specifically:

sysroot_stage_all () {
 sysroot_stage_dir ${D}${datadir}/kernel-depmod ${SYSROOT_DESTDIR}${datadir}/kernel-depmod
}

Cheers,

Richard

Re: [PATCH] image: Add missing depends on virtual/kernel for depmod data

[Hart, Darren]

On 1/27/15, 8:18 AM, "Richard Purdie" <richard.purdie@linuxfoundation.org>
wrote:

>On Tue, 2015-01-27 at 15:48 +0000, Hart, Darren wrote:
>> On 1/27/15, 7:45 AM, "Bruce Ashfield" <bruce.ashfield@windriver.com>
>>wrote:
>> 
>> >On 15-01-27 10:29 AM, Richard Purdie wrote:
>> >> We need the depmod data so that the kernel depmod command works
>> >>successfully
>> >> at rootfs time. The fact this was working inconsistently is now
>> >>highlighted
>> >> after the command was made to error out. A simple test case is:
>> >>
>> >> bitbake virtual/kernel image
>> >> bitbake vrituak/kernel -c clean
>> >> bitbake image -c rootfs -f
>> >>
>> >> We fix it by adding the missing dependency.
>> >
>> >Looks good here.
>> >
>> >Out of curiosity, was this hiding before, or did it only come about due
>> >to our recent moves to the work-shared kernel builds ?
>> 
>> I'm being dense I guess. I went to go verify what virtual/kernel
>> do_populate_sysroot is doing in the current state of things, in order to
>> be sure it copied over the right files, and I couldn't find it quickly.
>> Where is this defined?
>
>http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=11ef55a93bd2bbd95e203
>fab3aa237322923ffd9
>
>Specifically:
>
>sysroot_stage_all () {
> sysroot_stage_dir ${D}${datadir}/kernel-depmod
>${SYSROOT_DESTDIR}${datadir}/kernel-depmod
>}

Right, I thought of this while driving in :-) -ENOCOFFEE

Reviewed-by: Darren Hart <dvhart@linux.intel.com>

-- 
Darren Hart
Intel Open Source Technology Center

Re: [PATCH] image: Add missing depends on virtual/kernel for depmod data

[Richard Purdie]

On Tue, 2015-01-27 at 10:45 -0500, Bruce Ashfield wrote:
> On 15-01-27 10:29 AM, Richard Purdie wrote:
> > We need the depmod data so that the kernel depmod command works successfully
> > at rootfs time. The fact this was working inconsistently is now highlighted
> > after the command was made to error out. A simple test case is:
> >
> > bitbake virtual/kernel image
> > bitbake vrituak/kernel -c clean
> > bitbake image -c rootfs -f
> >
> > We fix it by adding the missing dependency.
> 
> Looks good here.
> 
> Out of curiosity, was this hiding before, or did it only come about due
> to our recent moves to the work-shared kernel builds ?

It was hiding before, it just used to silently do things differently
depending on whether certain files were present or not. Now we get a
hard error.

Cheers,

Richard

Re: [PATCH] image: Add missing depends on virtual/kernel for depmod data

[Dan McGregor]

On 27 January 2015 at 09:29, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> We need the depmod data so that the kernel depmod command works successfully
> at rootfs time. The fact this was working inconsistently is now highlighted
> after the command was made to error out. A simple test case is:
>
> bitbake virtual/kernel image
> bitbake vrituak/kernel -c clean
> bitbake image -c rootfs -f
>
> We fix it by adding the missing dependency.

On a similar note, I have a patch that makes kernel depmod optional
when generating images. I used it to create an image that can be used
as a container without also including kernel depmod info. I shall post
it.

Re: [PATCH] image: Add missing depends on virtual/kernel for depmod data

[Paul Eggleton]

On Tuesday 27 January 2015 11:20:53 Dan McGregor wrote:
> On 27 January 2015 at 09:29, Richard Purdie
> 
> <richard.purdie@linuxfoundation.org> wrote:
> > We need the depmod data so that the kernel depmod command works
> > successfully at rootfs time. The fact this was working inconsistently is
> > now highlighted after the command was made to error out. A simple test
> > case is:
> > 
> > bitbake virtual/kernel image
> > bitbake vrituak/kernel -c clean
> > bitbake image -c rootfs -f
> > 
> > We fix it by adding the missing dependency.
> 
> On a similar note, I have a patch that makes kernel depmod optional
> when generating images. I used it to create an image that can be used
> as a container without also including kernel depmod info. I shall post
> it.

Thanks - that's part of a task that's been on my list for a while:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=6478

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre