Revert "kernel: restore scripts in the sysroot"

Submitted by Richard Purdie on Nov. 27, 2013, 1:44 p.m.

Details

Message ID 1385559899.11222.0.camel@ted
State Accepted
Commit b2c948d56241ff7cdea2e9e68b740f305c72f5ca
Headers show

Commit Message

Richard Purdie Nov. 27, 2013, 1:44 p.m.
This reverts commit 6a6735cb98d529c8c5376aedb5c951339f54fe96.

The module class already ensures the scripts are rebuilt correctly. Running
this at sstate installation time is problematic since it can require the
cross compiler. Adding such a dependency would cause issues of its own.

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

Patch hide | download patch | download mbox

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 4974507..24ac778 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -290,17 +290,6 @@  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
-}
-
 python sysroot_stage_all () {
     oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}"))
 }

Comments

Bruce Ashfield Nov. 27, 2013, 1:46 p.m.
On 13-11-27 08:44 AM, Richard Purdie wrote:
> This reverts commit 6a6735cb98d529c8c5376aedb5c951339f54fe96.
>
> The module class already ensures the scripts are rebuilt correctly. Running
> this at sstate installation time is problematic since it can require the
> cross compiler. Adding such a dependency would cause issues of its own.

I was waiting for the dust to clear and have been running with the
same thing here, saves me from sending it and I've removed it from
my queue.

Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 4974507..24ac778 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -290,17 +290,6 @@ 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
> -}
> -
>   python sysroot_stage_all () {
>       oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}"))
>   }
>
>
Khem Raj Nov. 27, 2013, 3:43 p.m.
On Wednesday, November 27, 2013, Bruce Ashfield wrote:

> On 13-11-27 08:44 AM, Richard Purdie wrote:
>
>> This reverts commit 6a6735cb98d529c8c5376aedb5c951339f54fe96.
>>
>> The module class already ensures the scripts are rebuilt correctly.
>> Running
>> this at sstate installation time is problematic since it can require the
>> cross compiler. Adding such a dependency would cause issues of its own.
>>
>
> I was waiting for the dust to clear and have been running with the
> same thing here, saves me from sending it and I've removed it from
> my queue.
>
> Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>
>
Looks ok to me


>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index 4974507..24ac778 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -290,17 +290,6 @@ 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
>> -}
>> -
>>   python sysroot_stage_all () {
>>       oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"),
>> d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}"))
>>   }
>>
>>
>>
>