[OE-core] [PATCH 1/1] kernel: restore scripts in the sysroot

Khem Raj raj.khem at gmail.com
Tue Nov 19 22:29:20 UTC 2013


On Nov 19, 2013, at 10:17 AM, Bruce Ashfield <bruce.ashfield at gmail.com> wrote:

> Adding Khem.
> 
> Khem .. see below.
> 
> On Tue, Nov 19, 2013 at 12:54 PM, Bruce Ashfield
> <bruce.ashfield at gmail.com> wrote:
>> On Tue, Nov 19, 2013 at 12:46 PM, Phil Blundell <pb at pbcl.net> wrote:
>>> On Tue, 2013-11-19 at 17:37 +0000, Mike Crowe wrote:
>>>> On Tuesday 08 October 2013 at 17:12:54 -0400, Bruce Ashfield wrote:
>>>>> When building against the sysroot, out of tree modules can require modpost
>>>>> and other utilities normally found in the kernel's scripts directory. For
>>>>> the kernel source in the staging dir, these scripts have been removed to
>>>>> avoid mixing archiectures when packaging kernel-dev (among other things).
>>>>> 
>>>>> Rather than further complicate the kernel's install rule, or its packaging,
>>>>> we can restore the scripts by building them in the kernel staging directory
>>>>> after the sstate is installed, making them available to packages that need them.
>>>>> 
>>>>> Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
>>>>> ---
>>>>> meta/classes/kernel.bbclass | 11 +++++++++++
>>>>> 1 file changed, 11 insertions(+)
>>>>> 
>>>>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>>>>> index 4acfb7e..d5fa801 100644
>>>>> --- a/meta/classes/kernel.bbclass
>>>>> +++ b/meta/classes/kernel.bbclass
>>>>> @@ -292,6 +292,17 @@ kernel_do_install() {
>>>>> }
>>>>> do_install[prefuncs] += "package_get_auto_pr"
>>>>> 
>>>>> +
>>>>> +SSTATEPOSTINSTFUNCS += "kernelscripts_sstate_postinst"
>>>>> +kernelscripts_sstate_postinst () {
>>>>> +   if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then
>>>>> +           (
>>>>> +             cd ${STAGING_KERNEL_DIR}
>>>>> +             oe_runmake scripts
>>>>> +           )
>>>>> +   fi
>>>>> +}
>>>>> +
>>>>> sysroot_stage_all_append() {
>>>>>    sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}
>>>>> }
>>>> 
>>>> This sstate_postinst fails for me when the compiler isn't already present
>>>> in the sysroot.
>>>> 
>>>> Also, I notice that the environment and parameters passed to oe_runmake are
>>>> not the same as those used by kernel_do_compile etc.
>>> 
>>> Also note that module.bbclass already does "make scripts" before
>>> do_compile() so out-of-tree modules should already have access to all
>>> the files that they need.
>> 
>> Ah, but they didn't. Otherwise we wouldn't have mucked about in the routines.
>> Khem was building out of the sysroot and the support scripts weren't present,
>> something which we were able to consistently reproduce.
>> 
>> Perhaps the whole problem was just a misordering of the tasks. I'll take another
>> look.
>> 
>> But yes, we need one way or the other .. not both. I'd prefer to not fiddle with
>> sstate, so I'll go back and see why the module.bbclass code wasn't working
>> for the reported error.
> 
> Khem: I wasn't working from a bugzilla when making these changes, so I
> can't find your original reproducer for the missing recordmcount script.
> 
> Do you recall what it was ? I'm revisiting this and would like to understand
> why the make scripts in module-base.bbclass wasn't properly restoring
> the support scripts for your build.
> 
> I'm leaning towards reverting the whole mess, but without the reproducing
> case, I can't be sure that I'm not breaking you again.

Well reproducer case is that build from sstate but such that an external module needs to be rebuilt
if external module also comes from sstate then it all is fine. Its only when everything is coming from
sstate except this external module which needs to be rebuilt then you see this problem.

now, I see the code in module-base.class

#
# Ensure the hostprogs are available for module compilation. Modules that
# inherit this recipe and override do_compile() should be sure to call
# do_make_scripts() or ensure the scripts are built independently.
#
do_make_scripts() {
        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 
        make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
                   -C ${STAGING_KERNEL_DIR} scripts
}

so it expects that, do_make_scripts is explicitly called by external module recipes

and my recipes did override module_do_compile task but not do_compile like below

module_do_compile() {
        oe_runmake
}

so, is comment wrong there should it say module_do_compile instead ?

will it work with sstate always ?

it will be OK to revert it if thats the case.

> 
> Bruce
> 
>> 
>> Bruce
>> 
>> 
>>> 
>>> If we're going to make a policy decision that the kernel is responsible
>>> for making scripts then I guess that's fine (modulo the implementation
>>> problems that Mike describes) but in that case the code in
>>> module{-base}.bbclass is redundant and ought to be removed.
>>> 
>>> p.
>>> 
>>> 
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core at 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"
> 
> 
> 
> -- 
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"




More information about the Openembedded-core mailing list