[PATCH] base.bbclass: add SRCREV to do_fetch() hash

[PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Ross Burton]

Without this changing just the SRCREV won't re-fetch unless you embed the SRCREV
into PV.

The downside here is that every hash changes, so this causes a full rebuild.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/base.bbclass |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c0d61fe..ff8c633 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -97,6 +97,7 @@ PATH_prepend = "${@extra_path_elements(d)}"
 addtask fetch
 do_fetch[dirs] = "${DL_DIR}"
 do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}"
+do_fetch[vardeps] += "SRCREV"
 python base_do_fetch() {
 
     src_uri = (d.getVar('SRC_URI', True) or "").split()
-- 
1.7.10.4

Re: [PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Maciej Borzecki]

On Monday 29 of September 2014 15:40:14 Ross Burton wrote:
> Without this changing just the SRCREV won't re-fetch unless you embed the
> SRCREV into PV.

So a trick like this will not be needed anymore to automatically rebuild 
whenever sources in SCM change?

SRCREV = "${AUTOREV}"
PVBASE := "${PV}"
PV = "${PVBASE}.${SRCPV}"

> 
> The downside here is that every hash changes, so this causes a full rebuild.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/classes/base.bbclass |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index c0d61fe..ff8c633 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -97,6 +97,7 @@ PATH_prepend = "${@extra_path_elements(d)}"
>  addtask fetch
>  do_fetch[dirs] = "${DL_DIR}"
>  do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}"
> +do_fetch[vardeps] += "SRCREV"
>  python base_do_fetch() {
> 
>      src_uri = (d.getVar('SRC_URI', True) or "").split()


-- 

Maciej Borzęcki 
Senior Software Engineer Open-RnD Sp. z o.o. 
www.open-rnd.pl, Facebook, Twitter 
mobile: +48 telefon, fax: +48 42 657 9079 

Niniejsza wiadomość wraz z załącznikami może zawierać chronione prawem lub 
poufne informacje i została wysłana wyłącznie do wiadomości i użytku osób, do 
których została zaadresowana. Jeśli wiadomość została otrzymana przypadkowo 
zabrania się jej kopiowania lub rozsyłania do osób trzecich. W takim przypadku 
uprasza się o natychmiastowe zniszczenie wiadomości oraz poinformowanie 
nadawcy o zaistniałej sytuacji za pomocą wiadomości zwrotnej. Dziękujemy. 

This message, including any attachments hereto, may contain privileged or 
confidential information and is sent solely for the attention and use of the 
intended addressee(s). If you are not an intended addressee, you may neither 
use this message nor copy or deliver it to anyone. In such case, you should 
immediately destroy this message and kindly notify the sender by reply email. 
Thank you.

Re: [PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Burton, Ross]

On 29 September 2014 15:52, Maciej Borzecki <maciej.borzecki@open-rnd.pl> wrote:
> So a trick like this will not be needed anymore to automatically rebuild
> whenever sources in SCM change?
>
> SRCREV = "${AUTOREV}"
> PVBASE := "${PV}"
> PV = "${PVBASE}.${SRCPV}"

That's right, you don't need to embed SRCREV in PV to get a rebuild.
For many recipes it's still a sensible thing to do, but it won't be
mandatory.

Ross

Re: [PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Martin Jansa]

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

On Mon, Sep 29, 2014 at 03:56:44PM +0100, Burton, Ross wrote:
> On 29 September 2014 15:52, Maciej Borzecki <maciej.borzecki@open-rnd.pl> wrote:
> > So a trick like this will not be needed anymore to automatically rebuild
> > whenever sources in SCM change?
> >
> > SRCREV = "${AUTOREV}"
> > PVBASE := "${PV}"
> > PV = "${PVBASE}.${SRCPV}"
> 
> That's right, you don't need to embed SRCREV in PV to get a rebuild.
> For many recipes it's still a sensible thing to do, but it won't be
> mandatory.

It will be still mandatory for recipes with multiple SRCREVs (and
SRCREV_FORMAT).

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Burton, Ross]

On 29 September 2014 18:14, Martin Jansa <martin.jansa@gmail.com> wrote:
> It will be still mandatory for recipes with multiple SRCREVs (and
> SRCREV_FORMAT).

Hm, should SRCREV_FORMAT also be in the hash?

Ross

Re: [PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Martin Jansa]

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

On Mon, Sep 29, 2014 at 06:23:39PM +0100, Burton, Ross wrote:
> On 29 September 2014 18:14, Martin Jansa <martin.jansa@gmail.com> wrote:
> > It will be still mandatory for recipes with multiple SRCREVs (and
> > SRCREV_FORMAT).
> 
> Hm, should SRCREV_FORMAT also be in the hash?

That probably won't be enough, you would need to include all
SRCREV_foo
SRCREV_bar
variables when
SRCREV_FORMAT = "foo_bar"

Maybe we can include SRCPV in hash to cover both cases.
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Khem Raj]

On Mon, Sep 29, 2014 at 11:48 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> Hm, should SRCREV_FORMAT also be in the hash?
>
> That probably won't be enough, you would need to include all
> SRCREV_foo
> SRCREV_bar
> variables when
> SRCREV_FORMAT = "foo_bar"
>
> Maybe we can include SRCPV in hash to cover both cases.

I think above fix is not fully solving the issue. As stated above

Re: [PATCH] base.bbclass: add SRCREV to do_fetch() hash

[Khem Raj]

On Mon, Sep 29, 2014 at 7:40 AM, Ross Burton <ross.burton@intel.com> wrote:
> Without this changing just the SRCREV won't re-fetch unless you embed the SRCREV
> into PV.
>
> The downside here is that every hash changes, so this causes a full rebuild.
>

can we back port this to daisy as well.

> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/classes/base.bbclass |    1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index c0d61fe..ff8c633 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -97,6 +97,7 @@ PATH_prepend = "${@extra_path_elements(d)}"
>  addtask fetch
>  do_fetch[dirs] = "${DL_DIR}"
>  do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}"
> +do_fetch[vardeps] += "SRCREV"
>  python base_do_fetch() {
>
>      src_uri = (d.getVar('SRC_URI', True) or "").split()
> --
> 1.7.10.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core