[PATCH]Removing Legacy staging from genboot native recipe

[PATCH]Removing Legacy staging from genboot native recipe

[noor_ahsan]

genboot-native: Removing legacy staging

* Replaced do_stage function with do_install and replaced ${STAGING_BINDIR} with ${D}${bindir}
 
Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>

diff --git a/recipes/simpad-utilities/genboot-native.bb b/recipes/simpad-utilities/genboot-native.bb
index 47b9b34..f398a55 100644
--- a/recipes/simpad-utilities/genboot-native.bb
+++ b/recipes/simpad-utilities/genboot-native.bb
@@ -1,5 +1,5 @@
 SECTION = "console/utils"
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "Console utility for generating a SIMpad boot image for the proprietary SIEMENS Switzerland bootloader"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/genboot"
 SRC_URI = "file://gen_boot.c file://arnold_boot.h file://simpad-make-flashimg"
@@ -9,12 +9,15 @@ DEPENDS = "pad-native"
 
 inherit native
 
+NATIVE_INSTALL_WORKS = "1"
+
 do_compile() {
-	cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
-	${CC} -I. -o genboot gen_boot.c
+        cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
+        ${CC} -I. -o genboot gen_boot.c
 }
 
-do_stage() {
-	install -m 0755 genboot ${STAGING_BINDIR}/
-	install -m 0755 ${WORKDIR}/simpad-make-flashimg ${STAGING_BINDIR}/
+do_install() {
+        install -d ${D}${bindir}/
+        install -m 0755 genboot ${D}${bindir}/
+        install -m 0755 ${WORKDIR}/simpad-make-flashimg ${D}${bindir}/
 }

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 2183 bytes --]

Am Freitag, den 13.08.2010, 17:17 +0600 schrieb noor_ahsan@mentor.com:
> genboot-native: Removing legacy staging

You used `git-send-email`, but it looks strange since this line should
have been the subject line and not in the commit message.

Please also mark iteration of your patches. For example this with »PATCH
v2«. (See `--subject-prefix` in `git help format-patch`.) For clarity
also add a small comment, what changed after the S-o-b line like below
when you use `git commit`.

> * Replaced do_stage function with do_install and replaced ${STAGING_BINDIR} with ${D}${bindir}
>  
> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
---
v2: Increase `PR`.
---

> diff --git a/recipes/simpad-utilities/genboot-native.bb b/recipes/simpad-utilities/genboot-native.bb
> index 47b9b34..f398a55 100644
> --- a/recipes/simpad-utilities/genboot-native.bb
> +++ b/recipes/simpad-utilities/genboot-native.bb
> @@ -1,5 +1,5 @@
>  SECTION = "console/utils"
> -PR = "r1"
> +PR = "r2"
>  DESCRIPTION = "Console utility for generating a SIMpad boot image for the proprietary SIEMENS Switzerland bootloader"
>  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/genboot"
>  SRC_URI = "file://gen_boot.c file://arnold_boot.h file://simpad-make-flashimg"
> @@ -9,12 +9,15 @@ DEPENDS = "pad-native"
>  
>  inherit native
>  
> +NATIVE_INSTALL_WORKS = "1"

I am really a noob, but is not that for “normal”, i.e. no *-native,
recipes indicating no explicit native recipe is needed?

>  do_compile() {
> -	cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
> -	${CC} -I. -o genboot gen_boot.c
> +        cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
> +        ${CC} -I. -o genboot gen_boot.c
>  }

You changed the whitespace. I do not know if there are any
rules/recommendations in OE, but it bloats up the patch.

> -do_stage() {
> -	install -m 0755 genboot ${STAGING_BINDIR}/
> -	install -m 0755 ${WORKDIR}/simpad-make-flashimg ${STAGING_BINDIR}/
> +do_install() {
> +        install -d ${D}${bindir}/
> +        install -m 0755 genboot ${D}${bindir}/
> +        install -m 0755 ${WORKDIR}/simpad-make-flashimg ${D}${bindir}/
>  }


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Frans Meulenbroeks]

2010/8/13 Paul Menzel <paulepanter@users.sourceforge.net>:
> Am Freitag, den 13.08.2010, 17:17 +0600 schrieb noor_ahsan@mentor.com:
>> genboot-native: Removing legacy staging
>
> You used `git-send-email`, but it looks strange since this line should
> have been the subject line and not in the commit message.
>
> Please also mark iteration of your patches. For example this with »PATCH
> v2«. (See `--subject-prefix` in `git help format-patch`.) For clarity
> also add a small comment, what changed after the S-o-b line like below
> when you use `git commit`.

agree

>
>> * Replaced do_stage function with do_install and replaced ${STAGING_BINDIR} with ${D}${bindir}
>>
>> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
> ---
> v2: Increase `PR`.
> ---
>
>> diff --git a/recipes/simpad-utilities/genboot-native.bb b/recipes/simpad-utilities/genboot-native.bb
>> index 47b9b34..f398a55 100644
>> --- a/recipes/simpad-utilities/genboot-native.bb
>> +++ b/recipes/simpad-utilities/genboot-native.bb
>> @@ -1,5 +1,5 @@
>>  SECTION = "console/utils"
>> -PR = "r1"
>> +PR = "r2"
>>  DESCRIPTION = "Console utility for generating a SIMpad boot image for the proprietary SIEMENS Switzerland bootloader"
>>  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/genboot"
>>  SRC_URI = "file://gen_boot.c file://arnold_boot.h file://simpad-make-flashimg"
>> @@ -9,12 +9,15 @@ DEPENDS = "pad-native"
>>
>>  inherit native
>>
>> +NATIVE_INSTALL_WORKS = "1"
>
> I am really a noob, but is not that for “normal”, i.e. no *-native,
> recipes indicating no explicit native recipe is needed?

Afaik this is not needed.

>
>>  do_compile() {
>> -     cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
>> -     ${CC} -I. -o genboot gen_boot.c
>> +        cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
>> +        ${CC} -I. -o genboot gen_boot.c
>>  }
>
> You changed the whitespace. I do not know if there are any
> rules/recommendations in OE, but it bloats up the patch.

It indeed bloats. What happens is that tabs have been converted to
spaces (probably using oe-stylize.py). This is the preferred way in
oe.
We discussed this on irc and advised Noor to use spaces and/or oe-stylize.

Frans
>
>> -do_stage() {
>> -     install -m 0755 genboot ${STAGING_BINDIR}/
>> -     install -m 0755 ${WORKDIR}/simpad-make-flashimg ${STAGING_BINDIR}/
>> +do_install() {
>> +        install -d ${D}${bindir}/
>> +        install -m 0755 genboot ${D}${bindir}/
>> +        install -m 0755 ${WORKDIR}/simpad-make-flashimg ${D}${bindir}/
>>  }
>
>
> Thanks,
>
> Paul
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 13-08-10 14:25, Frans Meulenbroeks wrote:
> 2010/8/13 Paul Menzel <paulepanter@users.sourceforge.net>:
>> Am Freitag, den 13.08.2010, 17:17 +0600 schrieb noor_ahsan@mentor.com:

>>> +NATIVE_INSTALL_WORKS = "1"
>>
>> I am really a noob, but is not that for “normal”, i.e. no *-native,
>> recipes indicating no explicit native recipe is needed?
> 
> Afaik this is not needed.

If your -native recipe has something different than 'make install' in
do_install, it needs NATIVE_INSTALL_WORKS = "1" but only if you use
BBCLASSEXTEND to make it native.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMZVUnMkyGM64RGpERAmNcAJ45v9qAacER5cXEOEBSB/wqQv9gagCfXwSG
WR28gYaXsqvwUVbeCqC1hmE=
=MKz9
-----END PGP SIGNATURE-----

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Tom Rini]

Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 13-08-10 14:25, Frans Meulenbroeks wrote:
>> 2010/8/13 Paul Menzel <paulepanter@users.sourceforge.net>:
>>> Am Freitag, den 13.08.2010, 17:17 +0600 schrieb noor_ahsan@mentor.com:
> 
>>>> +NATIVE_INSTALL_WORKS = "1"
>>> I am really a noob, but is not that for “normal”, i.e. no *-native,
>>> recipes indicating no explicit native recipe is needed?
>> Afaik this is not needed.
> 
> If your -native recipe has something different than 'make install' in
> do_install, it needs NATIVE_INSTALL_WORKS = "1" but only if you use
> BBCLASSEXTEND to make it native.

Sounds like a tip for 
http://wiki.openembedded.org/index.php/Legacy_staging (which Noor and 
some other folks here have been looking at).  Thanks? :)

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Frans Meulenbroeks]

2010/8/13 Koen Kooi <k.kooi@student.utwente.nl>:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 13-08-10 14:25, Frans Meulenbroeks wrote:
>> 2010/8/13 Paul Menzel <paulepanter@users.sourceforge.net>:
>>> Am Freitag, den 13.08.2010, 17:17 +0600 schrieb noor_ahsan@mentor.com:
>
>>>> +NATIVE_INSTALL_WORKS = "1"
>>>
>>> I am really a noob, but is not that for “normal”, i.e. no *-native,
>>> recipes indicating no explicit native recipe is needed?
>>
>> Afaik this is not needed.
>
> If your -native recipe has something different than 'make install' in
> do_install, it needs NATIVE_INSTALL_WORKS = "1" but only if you use
> BBCLASSEXTEND to make it native.
>
The BBCLASSEXTEND part does not matter.

If you have a -native recipe that does not use autotools and does not
use make install
NATIVE_INSTALL_WORKS = "1"
is needed. Without it the following code is generated:

do_stage_native() {
        # If autotools is active, use the autotools staging function, else
        # use our "make install" equivalent
        if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ]
        then
                autotools_stage_all
        else
                oe_runmake install
        fi

}

BTW this is a recipe that has no target equivalent so there is no
non-native variant.

Frans

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Khem Raj]

On Sat, Aug 14, 2010 at 1:41 AM, Frans Meulenbroeks
<fransmeulenbroeks@gmail.com> wrote:
> 2010/8/13 Koen Kooi <k.kooi@student.utwente.nl>:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 13-08-10 14:25, Frans Meulenbroeks wrote:
>>> 2010/8/13 Paul Menzel <paulepanter@users.sourceforge.net>:
>>>> Am Freitag, den 13.08.2010, 17:17 +0600 schrieb noor_ahsan@mentor.com:
>>
>>>>> +NATIVE_INSTALL_WORKS = "1"
>>>>
>>>> I am really a noob, but is not that for “normal”, i.e. no *-native,
>>>> recipes indicating no explicit native recipe is needed?
>>>
>>> Afaik this is not needed.
>>
>> If your -native recipe has something different than 'make install' in
>> do_install, it needs NATIVE_INSTALL_WORKS = "1" but only if you use
>> BBCLASSEXTEND to make it native.
>>
> The BBCLASSEXTEND part does not matter.
>
> If you have a -native recipe that does not use autotools and does not
> use make install
> NATIVE_INSTALL_WORKS = "1"
> is needed. Without it the following code is generated:
>
> do_stage_native() {
>        # If autotools is active, use the autotools staging function, else
>        # use our "make install" equivalent
>        if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ]
>        then
>                autotools_stage_all
>        else
>                oe_runmake install
>        fi
>
> }
>
> BTW this is a recipe that has no target equivalent so there is no
> non-native variant.


if you have staging function which is not one of use_do_install_for_stage() or
autotools_stage_all() or do_stage_native() and
AUTOTOOLS_NATIVE_STAGE_INSTALL is 1

then legacy staging will be used. in such cases NATIVE_INSTALL_WORKS
is used to indicate
that whatever install function we have is good for staging so dont do
legacy staging.


>
> Frans
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

[PATCH]Removing Legacy staging from genboot native recipe

[noor_ahsan]

genboot: Removing legacy staging

* Replaced do_stage function with do_install and replaced ${STAGING_BINDIR} with ${D}${bindir} 
Signed-off-by: Noor Ahsan <noor_ahsan@mentorg.com>
diff --git a/recipes/simpad-utilities/genboot-native.bb b/recipes/simpad-utilities/genboot-native.bb
index 47b9b34..966a450 100644
--- a/recipes/simpad-utilities/genboot-native.bb
+++ b/recipes/simpad-utilities/genboot-native.bb
@@ -9,12 +9,15 @@ DEPENDS = "pad-native"
 
 inherit native
 
+NATIVE_INSTALL_WORKS = "1"
+
 do_compile() {
 	cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
 	${CC} -I. -o genboot gen_boot.c
 }
 
-do_stage() {
-	install -m 0755 genboot ${STAGING_BINDIR}/
-	install -m 0755 ${WORKDIR}/simpad-make-flashimg ${STAGING_BINDIR}/
+do_install() {
+	install -d ${D}${bindir}/
+	install -m 0755 genboot ${D}${bindir}/
+	install -m 0755 ${WORKDIR}/simpad-make-flashimg ${D}${bindir}/
 }

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Frans Meulenbroeks]

2010/8/13  <noor_ahsan@mentor.com>:
> genboot: Removing legacy staging
>
> * Replaced do_stage function with do_install and replaced ${STAGING_BINDIR} with ${D}${bindir}
> Signed-off-by: Noor Ahsan <noor_ahsan@mentorg.com>
> diff --git a/recipes/simpad-utilities/genboot-native.bb b/recipes/simpad-utilities/genboot-native.bb
> index 47b9b34..966a450 100644
> --- a/recipes/simpad-utilities/genboot-native.bb
> +++ b/recipes/simpad-utilities/genboot-native.bb
> @@ -9,12 +9,15 @@ DEPENDS = "pad-native"
>
>  inherit native
>
> +NATIVE_INSTALL_WORKS = "1"
> +
>  do_compile() {
>        cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
>        ${CC} -I. -o genboot gen_boot.c
>  }
>
> -do_stage() {
> -       install -m 0755 genboot ${STAGING_BINDIR}/
> -       install -m 0755 ${WORKDIR}/simpad-make-flashimg ${STAGING_BINDIR}/
> +do_install() {
> +       install -d ${D}${bindir}/
> +       install -m 0755 genboot ${D}${bindir}/
> +       install -m 0755 ${WORKDIR}/simpad-make-flashimg ${D}${bindir}/
>  }
>

You might also want to bumnp PR (although logically nothing changed so
this is perhaps not needed)
Can you also have a look at serload-native?
And maybe trun it to contrib/oe-stylize.py

Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Ahsan, Noor]

>-----Original Message-----
>From: openembedded-devel-bounces@lists.openembedded.org > > > > > > > > > > >[mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of >Frans Meulenbroeks
>Sent: Friday, August 13, 2010 11:30 AM
>To: openembedded-devel@lists.openembedded.org
>Subject: Re: [oe] [PATCH]Removing Legacy staging from genboot native recipe
>
>2010/8/13  <noor_ahsan@mentor.com>:
>> genboot: Removing legacy staging
>>
>> * Replaced do_stage function with do_install and replaced >${STAGING_BINDIR} with ${D}${bindir}
>> Signed-off-by: Noor Ahsan <noor_ahsan@mentorg.com>
>> diff --git a/recipes/simpad-utilities/genboot-native.bb b/recipes/simpad->utilities/genboot-native.bb
>> index 47b9b34..966a450 100644
>> --- a/recipes/simpad-utilities/genboot-native.bb>
>> +++ b/recipes/simpad-utilities/genboot-native.bb
>> @@ -9,12 +9,15 @@ DEPENDS = "pad-native"
>>
>>  inherit native
>>
>> +NATIVE_INSTALL_WORKS = "1"
>> +
>>  do_compile() {
>>        cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
>>        ${CC} -I. -o genboot gen_boot.c
>>  }
>>
>> -do_stage() {
>> -       install -m 0755 genboot ${STAGING_BINDIR}/
>> -       install -m 0755 ${WORKDIR}/simpad-make-flashimg >${STAGING_BINDIR}/
>> +do_install() {
>> +       install -d ${D}${bindir}/
>> +       install -m 0755 genboot ${D}${bindir}/
>> +       install -m 0755 ${WORKDIR}/simpad-make-flashimg ${D}${bindir}/
>>  }
>>

>You might also want to bumnp PR (although logically nothing changed so
>this is perhaps not needed)
>Can you also have a look at serload-native?
>And maybe trun it to contrib/oe-stylize.py

I also have patch for serload-native. Thanks for letting me know oe_stylize.py, I'll use it for sending the patch.


Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

Am Freitag, den 13.08.2010, 11:39 +0600 schrieb noor_ahsan@mentor.com:
> genboot: Removing legacy staging
> 
> * Replaced do_stage function with do_install and replaced ${STAGING_BINDIR} with ${D}${bindir} 
> Signed-off-by: Noor Ahsan <noor_ahsan@mentorg.com>

A »g« slipped in your email address.

[…]


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Ahsan, Noor]

Actually both works with me with "g" and without "g".

-----Original Message-----
From: openembedded-devel-bounces@lists.openembedded.org
[mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
Paul Menzel
Sent: Friday, August 13, 2010 1:07 PM
To: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [PATCH]Removing Legacy staging from genboot native
recipe

Am Freitag, den 13.08.2010, 11:39 +0600 schrieb noor_ahsan@mentor.com:
> genboot: Removing legacy staging
> 
> * Replaced do_stage function with do_install and replaced
${STAGING_BINDIR} with ${D}${bindir} 
> Signed-off-by: Noor Ahsan <noor_ahsan@mentorg.com>

A >g< slipped in your email address.

[...]


Thanks,

Paul

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

Am Freitag, den 13.08.2010, 11:01 +0200 schrieb Ahsan, Noor:
> Actually both works with me with "g" and without "g".

Sorry, I see.

It looks like this is your first patch. So just remember to always sign
off with the same address, so the statistics get right.


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Khem Raj]

On Fri, Aug 13, 2010 at 2:18 AM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Am Freitag, den 13.08.2010, 11:01 +0200 schrieb Ahsan, Noor:
>> Actually both works with me with "g" and without "g".
>
> Sorry, I see.
>
> It looks like this is your first patch. So just remember to always sign
> off with the same address, so the statistics get right.

also get rid of that FILESDIR

>
>
> Thanks,
>
> Paul
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Tom Rini]

Khem Raj wrote:
> On Fri, Aug 13, 2010 at 2:18 AM, Paul Menzel
> <paulepanter@users.sourceforge.net> wrote:
>> Am Freitag, den 13.08.2010, 11:01 +0200 schrieb Ahsan, Noor:
>>> Actually both works with me with "g" and without "g".
>> Sorry, I see.
>>
>> It looks like this is your first patch. So just remember to always sign
>> off with the same address, so the statistics get right.
> 
> also get rid of that FILESDIR

FILESDIR got put onto 
http://wiki.openembedded.org/index.php/OpenEmbeddedJanitors just the 
other day, with a quick one line explanation of what this means.  If 
someone else would like to expand on that a little more, that'd be 
great!  Thanks.

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH]Removing Legacy staging from genboot native recipe

[Frans Meulenbroeks]

reworked the patch a little bit, tested building and pushed.
FILEDIR is also gone

thanks for your contribution

Frans