[meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[Alejandro Mery]

The following changes have been cherry-picked from master and are
available in the git repository at:

https://github.com/amery/meta-openembedded for-morty

for you to fetch

Alejandro Mery (4):
  gitver: fix try/except syntax for python3 support
  gitver: extend class to use EXTERNALSRC if set
  gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"
  gitver: skip packages instead of panic()ing if ${GITVER} fails to
    expand

Denys Dmytriyenko (1):
  devmem2: use different filename to avoid checksum conflicts

Nicolas Ferre (1):
  devmem2: Change source URL to regain access to it

 meta-oe/classes/gitver.bbclass             | 51 ++++++++++++++++++------------
 meta-oe/recipes-support/devmem2/devmem2.bb | 12 ++++---
 2 files changed, 38 insertions(+), 25 deletions(-)

-- 
2.13.0

[meta-oe][morty][PATCH 1/6] devmem2: Change source URL to regain access to it

[Alejandro Mery]

From: Nicolas Ferre <nicolas.ferre@microchip.com>

Change URL due to connexion error on the original page.
As the header of the new devmem2.c source file has changed, change the
signature and the LIC_FILES_CHKSUM specificaiton.

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/devmem2/devmem2.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
index e48cc9210..c42eb5e0b 100644
--- a/meta-oe/recipes-support/devmem2/devmem2.bb
+++ b/meta-oe/recipes-support/devmem2/devmem2.bb
@@ -1,9 +1,9 @@
 SUMMARY = "Simple program to read/write from/to any location in memory"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://devmem2.c;endline=28;md5=dd68f2b0a5184b3db3dc25c99e0bd0cd"
+LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
-SRC_URI = "http://www.lartmaker.nl/lartware/port/devmem2.c \
+SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
            file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
 S = "${WORKDIR}"
 
@@ -18,5 +18,5 @@ do_install() {
     install devmem2 ${D}${bindir}
 }
 
-SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
-SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
+SRC_URI[md5sum] = "e23f236e94be4c429aa1ceac0f01544b"
+SRC_URI[sha256sum] = "3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639"
-- 
2.13.0

[meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Alejandro Mery]

From: Denys Dmytriyenko <denys@ti.com>

The newly resurrected devmem2.c file besides having a new location, also
updates its header, producing different checksums, which would conflict
with any previously cached or mirrored instances. To avoid such conflicts,
use a different filename in fetch(). Rename it back to original name at
unpack() for devmem2-fixups-2.patch to succeed w/o modifications.

WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.

WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
index c42eb5e0b..c86eb2e4b 100644
--- a/meta-oe/recipes-support/devmem2/devmem2.bb
+++ b/meta-oe/recipes-support/devmem2/devmem2.bb
@@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
-SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
+SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
            file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
 S = "${WORKDIR}"
 
 CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
 
+python do_unpack_append() {
+    os.rename("devmem2-new.c", "devmem2.c")
+}
+
 do_compile() {
     ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
 }
-- 
2.13.0

Re: [meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Khem Raj]

On Fri, Jun 23, 2017 at 1:23 PM, Alejandro Mery
<amery@hanoverdisplays.com> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> The newly resurrected devmem2.c file besides having a new location, also
> updates its header, producing different checksums, which would conflict
> with any previously cached or mirrored instances. To avoid such conflicts,
> use a different filename in fetch(). Rename it back to original name at
> unpack() for devmem2-fixups-2.patch to succeed w/o modifications.
>
> WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
> File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
> File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
> If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
> SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
> SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
> Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.
>
> WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
> index c42eb5e0b..c86eb2e4b 100644
> --- a/meta-oe/recipes-support/devmem2/devmem2.bb
> +++ b/meta-oe/recipes-support/devmem2/devmem2.bb
> @@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
>  PR = "r7"
>
> -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
> +SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
>             file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
>  S = "${WORKDIR}"
>

can we explore use of downloadfilename= parameter of http/ftp fetcher

>  CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
>
> +python do_unpack_append() {
> +    os.rename("devmem2-new.c", "devmem2.c")
> +}
> +
>  do_compile() {
>      ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
>  }
> --
> 2.13.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Denys Dmytriyenko]

On Fri, Jun 23, 2017 at 01:46:28PM -0700, Khem Raj wrote:
> On Fri, Jun 23, 2017 at 1:23 PM, Alejandro Mery
> <amery@hanoverdisplays.com> wrote:
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > The newly resurrected devmem2.c file besides having a new location, also
> > updates its header, producing different checksums, which would conflict
> > with any previously cached or mirrored instances. To avoid such conflicts,
> > use a different filename in fetch(). Rename it back to original name at
> > unpack() for devmem2-fixups-2.patch to succeed w/o modifications.
> >
> > WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
> > File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
> > File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
> > If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
> > SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
> > SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
> > Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.
> >
> > WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
> > index c42eb5e0b..c86eb2e4b 100644
> > --- a/meta-oe/recipes-support/devmem2/devmem2.bb
> > +++ b/meta-oe/recipes-support/devmem2/devmem2.bb
> > @@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
> >  LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
> >  PR = "r7"
> >
> > -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
> > +SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
> >             file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
> >  S = "${WORKDIR}"
> >
> 
> can we explore use of downloadfilename= parameter of http/ftp fetcher

Sure, here are the corresponding sources where it's handled:
http://cgit.openembedded.org/bitbake/tree/lib/bb/fetch2/wget.py#n65


> >  CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
> >
> > +python do_unpack_append() {
> > +    os.rename("devmem2-new.c", "devmem2.c")
> > +}
> > +
> >  do_compile() {
> >      ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
> >  }
> > --
> > 2.13.0
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Khem Raj]

On Fri, Jun 23, 2017 at 1:52 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Fri, Jun 23, 2017 at 01:46:28PM -0700, Khem Raj wrote:
>> On Fri, Jun 23, 2017 at 1:23 PM, Alejandro Mery
>> <amery@hanoverdisplays.com> wrote:
>> > From: Denys Dmytriyenko <denys@ti.com>
>> >
>> > The newly resurrected devmem2.c file besides having a new location, also
>> > updates its header, producing different checksums, which would conflict
>> > with any previously cached or mirrored instances. To avoid such conflicts,
>> > use a different filename in fetch(). Rename it back to original name at
>> > unpack() for devmem2-fixups-2.patch to succeed w/o modifications.
>> >
>> > WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
>> > File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
>> > File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
>> > If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
>> > SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
>> > SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
>> > Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.
>> >
>> > WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d
>> >
>> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> > ---
>> >  meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
>> >  1 file changed, 5 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
>> > index c42eb5e0b..c86eb2e4b 100644
>> > --- a/meta-oe/recipes-support/devmem2/devmem2.bb
>> > +++ b/meta-oe/recipes-support/devmem2/devmem2.bb
>> > @@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
>> >  LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
>> >  PR = "r7"
>> >
>> > -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
>> > +SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
>> >             file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
>> >  S = "${WORKDIR}"
>> >
>>
>> can we explore use of downloadfilename= parameter of http/ftp fetcher
>
> Sure, here are the corresponding sources where it's handled:
> http://cgit.openembedded.org/bitbake/tree/lib/bb/fetch2/wget.py#n65
>

ah this is rightly being used, I somehow thought it was not used but
that actually the change above.
>
>> >  CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
>> >
>> > +python do_unpack_append() {
>> > +    os.rename("devmem2-new.c", "devmem2.c")
>> > +}
>> > +

perhaps we do not need to rename it we can say do

 ${CC} -o devmem2 devmem2-new.c ${CFLAGS} ${LDFLAGS}

>> >  do_compile() {
>> >      ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
>> >  }
>> > --
>> > 2.13.0
>> >
>> > --
>> > _______________________________________________
>> > Openembedded-devel mailing list
>> > Openembedded-devel@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Denys Dmytriyenko]

On Fri, Jun 23, 2017 at 02:08:06PM -0700, Khem Raj wrote:
> On Fri, Jun 23, 2017 at 1:52 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> > On Fri, Jun 23, 2017 at 01:46:28PM -0700, Khem Raj wrote:
> >> On Fri, Jun 23, 2017 at 1:23 PM, Alejandro Mery
> >> <amery@hanoverdisplays.com> wrote:
> >> > From: Denys Dmytriyenko <denys@ti.com>
> >> >
> >> > The newly resurrected devmem2.c file besides having a new location, also
> >> > updates its header, producing different checksums, which would conflict
> >> > with any previously cached or mirrored instances. To avoid such conflicts,
> >> > use a different filename in fetch(). Rename it back to original name at
> >> > unpack() for devmem2-fixups-2.patch to succeed w/o modifications.
> >> >
> >> > WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
> >> > File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
> >> > File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
> >> > If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
> >> > SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
> >> > SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
> >> > Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.
> >> >
> >> > WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d
> >> >
> >> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >> > ---
> >> >  meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
> >> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >> >
> >> > diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
> >> > index c42eb5e0b..c86eb2e4b 100644
> >> > --- a/meta-oe/recipes-support/devmem2/devmem2.bb
> >> > +++ b/meta-oe/recipes-support/devmem2/devmem2.bb
> >> > @@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
> >> >  LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
> >> >  PR = "r7"
> >> >
> >> > -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
> >> > +SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
> >> >             file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
> >> >  S = "${WORKDIR}"
> >> >
> >>
> >> can we explore use of downloadfilename= parameter of http/ftp fetcher
> >
> > Sure, here are the corresponding sources where it's handled:
> > http://cgit.openembedded.org/bitbake/tree/lib/bb/fetch2/wget.py#n65
> >
> 
> ah this is rightly being used, I somehow thought it was not used but
> that actually the change above.
> >
> >> >  CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
> >> >
> >> > +python do_unpack_append() {
> >> > +    os.rename("devmem2-new.c", "devmem2.c")
> >> > +}
> >> > +
> 
> perhaps we do not need to rename it we can say do
> 
>  ${CC} -o devmem2 devmem2-new.c ${CFLAGS} ${LDFLAGS}

This is the fourth or fifth time this is being suggested. We should merge it 
already, as I'm getting tired of explaining it... :)

http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113042.html


> >> >  do_compile() {
> >> >      ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
> >> >  }
> >> > --
> >> > 2.13.0
> >> >
> >> > --
> >> > _______________________________________________
> >> > Openembedded-devel mailing list
> >> > Openembedded-devel@lists.openembedded.org
> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 

Re: [meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Khem Raj]

On Fri, Jun 23, 2017 at 2:14 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Fri, Jun 23, 2017 at 02:08:06PM -0700, Khem Raj wrote:
>> On Fri, Jun 23, 2017 at 1:52 PM, Denys Dmytriyenko <denis@denix.org> wrote:
>> > On Fri, Jun 23, 2017 at 01:46:28PM -0700, Khem Raj wrote:
>> >> On Fri, Jun 23, 2017 at 1:23 PM, Alejandro Mery
>> >> <amery@hanoverdisplays.com> wrote:
>> >> > From: Denys Dmytriyenko <denys@ti.com>
>> >> >
>> >> > The newly resurrected devmem2.c file besides having a new location, also
>> >> > updates its header, producing different checksums, which would conflict
>> >> > with any previously cached or mirrored instances. To avoid such conflicts,
>> >> > use a different filename in fetch(). Rename it back to original name at
>> >> > unpack() for devmem2-fixups-2.patch to succeed w/o modifications.
>> >> >
>> >> > WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
>> >> > File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
>> >> > File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
>> >> > If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
>> >> > SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
>> >> > SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
>> >> > Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.
>> >> >
>> >> > WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d
>> >> >
>> >> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> >> > ---
>> >> >  meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
>> >> >  1 file changed, 5 insertions(+), 1 deletion(-)
>> >> >
>> >> > diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
>> >> > index c42eb5e0b..c86eb2e4b 100644
>> >> > --- a/meta-oe/recipes-support/devmem2/devmem2.bb
>> >> > +++ b/meta-oe/recipes-support/devmem2/devmem2.bb
>> >> > @@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
>> >> >  LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
>> >> >  PR = "r7"
>> >> >
>> >> > -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
>> >> > +SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
>> >> >             file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
>> >> >  S = "${WORKDIR}"
>> >> >
>> >>
>> >> can we explore use of downloadfilename= parameter of http/ftp fetcher
>> >
>> > Sure, here are the corresponding sources where it's handled:
>> > http://cgit.openembedded.org/bitbake/tree/lib/bb/fetch2/wget.py#n65
>> >
>>
>> ah this is rightly being used, I somehow thought it was not used but
>> that actually the change above.
>> >
>> >> >  CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
>> >> >
>> >> > +python do_unpack_append() {
>> >> > +    os.rename("devmem2-new.c", "devmem2.c")
>> >> > +}
>> >> > +
>>
>> perhaps we do not need to rename it we can say do
>>
>>  ${CC} -o devmem2 devmem2-new.c ${CFLAGS} ${LDFLAGS}
>
> This is the fourth or fifth time this is being suggested. We should merge it
> already, as I'm getting tired of explaining it... :)

Thanks for being patient. may I then suggest to host the patch locally
after refreshing it against the renamed file ? upstream patch might
change and break things eventually
down the lane. This will also insulate it from such problems.

>
> http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113042.html
>
>
>> >> >  do_compile() {
>> >> >      ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
>> >> >  }
>> >> > --
>> >> > 2.13.0
>> >> >
>> >> > --
>> >> > _______________________________________________
>> >> > Openembedded-devel mailing list
>> >> > Openembedded-devel@lists.openembedded.org
>> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >> --
>> >> _______________________________________________
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel@lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>

Re: [meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Denys Dmytriyenko]

On Fri, Jun 23, 2017 at 04:04:24PM -0700, Khem Raj wrote:
> On Fri, Jun 23, 2017 at 2:14 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> > On Fri, Jun 23, 2017 at 02:08:06PM -0700, Khem Raj wrote:
> >> On Fri, Jun 23, 2017 at 1:52 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> >> > On Fri, Jun 23, 2017 at 01:46:28PM -0700, Khem Raj wrote:
> >> >> On Fri, Jun 23, 2017 at 1:23 PM, Alejandro Mery
> >> >> <amery@hanoverdisplays.com> wrote:
> >> >> > From: Denys Dmytriyenko <denys@ti.com>
> >> >> >
> >> >> > The newly resurrected devmem2.c file besides having a new location, also
> >> >> > updates its header, producing different checksums, which would conflict
> >> >> > with any previously cached or mirrored instances. To avoid such conflicts,
> >> >> > use a different filename in fetch(). Rename it back to original name at
> >> >> > unpack() for devmem2-fixups-2.patch to succeed w/o modifications.
> >> >> >
> >> >> > WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
> >> >> > File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
> >> >> > File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
> >> >> > If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
> >> >> > SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
> >> >> > SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
> >> >> > Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.
> >> >> >
> >> >> > WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d
> >> >> >
> >> >> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >> >> > ---
> >> >> >  meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
> >> >> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >> >> >
> >> >> > diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
> >> >> > index c42eb5e0b..c86eb2e4b 100644
> >> >> > --- a/meta-oe/recipes-support/devmem2/devmem2.bb
> >> >> > +++ b/meta-oe/recipes-support/devmem2/devmem2.bb
> >> >> > @@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
> >> >> >  LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
> >> >> >  PR = "r7"
> >> >> >
> >> >> > -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
> >> >> > +SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
> >> >> >             file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
> >> >> >  S = "${WORKDIR}"
> >> >> >
> >> >>
> >> >> can we explore use of downloadfilename= parameter of http/ftp fetcher
> >> >
> >> > Sure, here are the corresponding sources where it's handled:
> >> > http://cgit.openembedded.org/bitbake/tree/lib/bb/fetch2/wget.py#n65
> >> >
> >>
> >> ah this is rightly being used, I somehow thought it was not used but
> >> that actually the change above.
> >> >
> >> >> >  CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
> >> >> >
> >> >> > +python do_unpack_append() {
> >> >> > +    os.rename("devmem2-new.c", "devmem2.c")
> >> >> > +}
> >> >> > +
> >>
> >> perhaps we do not need to rename it we can say do
> >>
> >>  ${CC} -o devmem2 devmem2-new.c ${CFLAGS} ${LDFLAGS}
> >
> > This is the fourth or fifth time this is being suggested. We should merge it
> > already, as I'm getting tired of explaining it... :)
> 
> Thanks for being patient. may I then suggest to host the patch locally
> after refreshing it against the renamed file ? upstream patch might
> change and break things eventually
> down the lane. This will also insulate it from such problems.

I was thinking of updating the patch locally, but decided to be less invasive. 
If we decide to do that, we need to do it in master first.

We can go even further and host this whole .c file in metadata, so we won't be 
affected by it disappearing again...


> > http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113042.html
> >
> >
> >> >> >  do_compile() {
> >> >> >      ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
> >> >> >  }
> >> >> > --
> >> >> > 2.13.0
> >> >> >
> >> >> > --
> >> >> > _______________________________________________
> >> >> > Openembedded-devel mailing list
> >> >> > Openembedded-devel@lists.openembedded.org
> >> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >> >> --
> >> >> _______________________________________________
> >> >> Openembedded-devel mailing list
> >> >> Openembedded-devel@lists.openembedded.org
> >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >>
> 

Re: [meta-oe][morty][PATCH 2/6] devmem2: use different filename to avoid checksum conflicts

[Alejandro Mery]

On 23/06/17 22:15, Denys Dmytriyenko wrote:
> On Fri, Jun 23, 2017 at 02:08:06PM -0700, Khem Raj wrote:
>> On Fri, Jun 23, 2017 at 1:52 PM, Denys Dmytriyenko <denis@denix.org> wrote:
>>> On Fri, Jun 23, 2017 at 01:46:28PM -0700, Khem Raj wrote:
>>>> On Fri, Jun 23, 2017 at 1:23 PM, Alejandro Mery
>>>> <amery@hanoverdisplays.com> wrote:
>>>>> From: Denys Dmytriyenko <denys@ti.com>
>>>>>
>>>>> The newly resurrected devmem2.c file besides having a new location, also
>>>>> updates its header, producing different checksums, which would conflict
>>>>> with any previously cached or mirrored instances. To avoid such conflicts,
>>>>> use a different filename in fetch(). Rename it back to original name at
>>>>> unpack() for devmem2-fixups-2.patch to succeed w/o modifications.
>>>>>
>>>>> WARNING: devmem2-1.0-r7 do_fetch: Fetcher failure for URL: 'http://www.free-electrons.com/pub/mirror/devmem2.c'. Checksum mismatch!
>>>>> File: '/OE/master/downloads/devmem2.c' has md5 checksum be12c0132a1ae118cbf5e79d98427c1d when e23f236e94be4c429aa1ceac0f01544b was expected
>>>>> File: '/OE/master/downloads/devmem2.c' has sha256 checksum ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 when 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 was expected
>>>>> If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
>>>>> SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
>>>>> SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
>>>>> Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.
>>>>>
>>>>> WARNING: devmem2-1.0-r7 do_fetch: Renaming /OE/sources/devmem2.c to /OE/sources/devmem2.c_bad-checksum_be12c0132a1ae118cbf5e79d98427c1d
>>>>>
>>>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>>>> ---
>>>>>  meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
>>>>>  1 file changed, 5 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
>>>>> index c42eb5e0b..c86eb2e4b 100644
>>>>> --- a/meta-oe/recipes-support/devmem2/devmem2.bb
>>>>> +++ b/meta-oe/recipes-support/devmem2/devmem2.bb
>>>>> @@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
>>>>>  LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
>>>>>  PR = "r7"
>>>>>
>>>>> -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c \
>>>>> +SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
>>>>>             file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
>>>>>  S = "${WORKDIR}"
>>>>>
>>>> can we explore use of downloadfilename= parameter of http/ftp fetcher
>>> Sure, here are the corresponding sources where it's handled:
>>> http://cgit.openembedded.org/bitbake/tree/lib/bb/fetch2/wget.py#n65
>>>
>> ah this is rightly being used, I somehow thought it was not used but
>> that actually the change above.
>>>>>  CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
>>>>>
>>>>> +python do_unpack_append() {
>>>>> +    os.rename("devmem2-new.c", "devmem2.c")
>>>>> +}
>>>>> +
>> perhaps we do not need to rename it we can say do
>>
>>  ${CC} -o devmem2 devmem2-new.c ${CFLAGS} ${LDFLAGS}
> This is the fourth or fifth time this is being suggested. We should merge it 
> already, as I'm getting tired of explaining it... :)
>
> http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113042.html

do you know when morty's maintainer will return?

[meta-oe][morty][PATCH 3/6] gitver: fix try/except syntax for python3 support

[Alejandro Mery]

https://www.python.org/dev/peps/pep-3110/

It's backward compatible with 2.6+

Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/gitver.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index e7b5155ee..b677996ea 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -27,13 +27,13 @@ def get_git_pv(path, d, tagadjust=None):
     gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git"))
     try:
         ver = gitrev_run("git describe --tags", gitdir)
-    except Exception, exc:
+    except Exception as exc:
         bb.fatal(str(exc))
 
     if not ver:
         try:
             ver = gitrev_run("git rev-parse --short HEAD", gitdir)
-        except Exception, exc:
+        except Exception as exc:
             bb.fatal(str(exc))
 
         if ver:
-- 
2.13.0

[meta-oe][morty][PATCH 4/6] gitver: extend class to use EXTERNALSRC if set

[Alejandro Mery]

Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/gitver.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index b677996ea..adb434a46 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -24,7 +24,8 @@ def get_git_pv(path, d, tagadjust=None):
     import os
     import bb.process
 
-    gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git"))
+    srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
+    gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
     try:
         ver = gitrev_run("git describe --tags", gitdir)
     except Exception as exc:
@@ -71,5 +72,6 @@ def mark_recipe_dependencies(path, d):
         mark_dependency(d, tagdir)
 
 python () {
-    mark_recipe_dependencies(d.getVar("S", True), d)
+    srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
+    mark_recipe_dependencies(srcdir, d)
 }
-- 
2.13.0

[meta-oe][morty][PATCH 4/6] gitver: extend class to use EXTERNALSRC if set

[Alejandro Mery]

Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/gitver.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index b677996ea..adb434a46 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -24,7 +24,8 @@ def get_git_pv(path, d, tagadjust=None):
     import os
     import bb.process
 
-    gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git"))
+    srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
+    gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
     try:
         ver = gitrev_run("git describe --tags", gitdir)
     except Exception as exc:
@@ -71,5 +72,6 @@ def mark_recipe_dependencies(path, d):
         mark_dependency(d, tagdir)
 
 python () {
-    mark_recipe_dependencies(d.getVar("S", True), d)
+    srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
+    mark_recipe_dependencies(srcdir, d)
 }
-- 
2.13.0

[meta-oe][morty][PATCH 5/6] gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"

[Alejandro Mery]

Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/gitver.bbclass | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index adb434a46..5ecfb54c8 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -13,16 +13,15 @@ def git_drop_tag_prefix(version):
         return version
 
 GIT_TAGADJUST = "git_drop_tag_prefix(version)"
-GITVER = "${@get_git_pv('${S}', d, tagadjust=lambda version:${GIT_TAGADJUST})}"
-GITSHA = "${@get_git_hash('${S}', d)}"
+GITVER = "${@get_git_pv(d, tagadjust=lambda version:${GIT_TAGADJUST})}"
+GITSHA = "${@get_git_hash(d)}"
 
 def gitrev_run(cmd, path):
     (output, error) = bb.process.run(cmd, cwd=path)
     return output.rstrip()
 
-def get_git_pv(path, d, tagadjust=None):
+def get_git_pv(d, tagadjust=None):
     import os
-    import bb.process
 
     srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
     gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
@@ -46,6 +45,17 @@ def get_git_pv(path, d, tagadjust=None):
             ver = tagadjust(ver)
         return ver
 
+def get_git_hash(d):
+    import os
+
+    srcdir = d.getVar("EXTERNALSRC") or d.getVar("S")
+    gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
+    try:
+        rev = gitrev_run("git rev-list HEAD -1")
+        return rev[:7]
+    except Exception as exc:
+        bb.fatal(str(exc))
+
 def mark_recipe_dependencies(path, d):
     from bb.parse import mark_dependency
 
-- 
2.13.0

[meta-oe][morty][PATCH 6/6] gitver: skip packages instead of panic()ing if ${GITVER} fails to expand

[Alejandro Mery]

`inherit externalsrc gitver` is a very useful combo to get development trees
in your workspace having a ${PN}_git.bb with PV=${GITVER} coexisting with a regular
${PN}_${PV}.bb

but not everyone wants to checkout all developments sources and managinging different
layers for each options is quite troublesome.

making `gitver` skip the .bb instead of panic()ing every time EXTERNALSRC is missing
allows people to have a single development layer where packages get enabled if
the right sources are present or falling back to the last release if not

Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/gitver.bbclass | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index 5ecfb54c8..b8f5cf2d2 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -27,23 +27,20 @@ def get_git_pv(d, tagadjust=None):
     gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
     try:
         ver = gitrev_run("git describe --tags", gitdir)
-    except Exception as exc:
-        bb.fatal(str(exc))
-
-    if not ver:
+    except:
         try:
             ver = gitrev_run("git rev-parse --short HEAD", gitdir)
+            if ver:
+                return "0.0+%s" % ver
+            else:
+                return "0.0"
+
         except Exception as exc:
-            bb.fatal(str(exc))
+            raise bb.parse.SkipPackage(str(exc))
 
-        if ver:
-            return "0.0+%s" % ver
-        else:
-            return "0.0"
-    else:
-        if tagadjust:
-            ver = tagadjust(ver)
-        return ver
+    if ver and tagadjust:
+        ver = tagadjust(ver)
+    return ver
 
 def get_git_hash(d):
     import os
-- 
2.13.0

Re: [meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[Denys Dmytriyenko]

Wasn't there already a submission for devmem2 backport on the list?

On Fri, Jun 23, 2017 at 09:23:18PM +0100, Alejandro Mery wrote:
> The following changes have been cherry-picked from master and are
> available in the git repository at:
> 
> https://github.com/amery/meta-openembedded for-morty
> 
> for you to fetch
> 
> Alejandro Mery (4):
>   gitver: fix try/except syntax for python3 support
>   gitver: extend class to use EXTERNALSRC if set
>   gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"
>   gitver: skip packages instead of panic()ing if ${GITVER} fails to
>     expand
> 
> Denys Dmytriyenko (1):
>   devmem2: use different filename to avoid checksum conflicts
> 
> Nicolas Ferre (1):
>   devmem2: Change source URL to regain access to it
> 
>  meta-oe/classes/gitver.bbclass             | 51 ++++++++++++++++++------------
>  meta-oe/recipes-support/devmem2/devmem2.bb | 12 ++++---
>  2 files changed, 38 insertions(+), 25 deletions(-)
> 
> -- 
> 2.13.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[Alejandro Mery]

On 23/06/17 21:37, Denys Dmytriyenko wrote:
> Wasn't there already a submission for devmem2 backport on the list?

yes, I did try back in May the first time but I just realised I had 
forgotten to CC morty's maintainer


> 
> On Fri, Jun 23, 2017 at 09:23:18PM +0100, Alejandro Mery wrote:
>> The following changes have been cherry-picked from master and are
>> available in the git repository at:
>>
>> https://github.com/amery/meta-openembedded for-morty
>>
>> for you to fetch
>>
>> Alejandro Mery (4):
>>    gitver: fix try/except syntax for python3 support
>>    gitver: extend class to use EXTERNALSRC if set
>>    gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"
>>    gitver: skip packages instead of panic()ing if ${GITVER} fails to
>>      expand
>>
>> Denys Dmytriyenko (1):
>>    devmem2: use different filename to avoid checksum conflicts
>>
>> Nicolas Ferre (1):
>>    devmem2: Change source URL to regain access to it
>>
>>   meta-oe/classes/gitver.bbclass             | 51 ++++++++++++++++++------------
>>   meta-oe/recipes-support/devmem2/devmem2.bb | 12 ++++---
>>   2 files changed, 38 insertions(+), 25 deletions(-)
>>
>> -- 
>> 2.13.0
>>
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 

Re: [meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[akuster808]

On 06/23/2017 01:37 PM, Denys Dmytriyenko wrote:
> Wasn't there already a submission for devmem2 backport on the list?

yes. running a bit behind. pulling in today.
-armin
>
> On Fri, Jun 23, 2017 at 09:23:18PM +0100, Alejandro Mery wrote:
>> The following changes have been cherry-picked from master and are
>> available in the git repository at:
>>
>> https://github.com/amery/meta-openembedded for-morty
>>
>> for you to fetch
>>
>> Alejandro Mery (4):
>>    gitver: fix try/except syntax for python3 support
>>    gitver: extend class to use EXTERNALSRC if set
>>    gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"
>>    gitver: skip packages instead of panic()ing if ${GITVER} fails to
>>      expand
>>
>> Denys Dmytriyenko (1):
>>    devmem2: use different filename to avoid checksum conflicts
>>
>> Nicolas Ferre (1):
>>    devmem2: Change source URL to regain access to it
>>
>>   meta-oe/classes/gitver.bbclass             | 51 ++++++++++++++++++------------
>>   meta-oe/recipes-support/devmem2/devmem2.bb | 12 ++++---
>>   2 files changed, 38 insertions(+), 25 deletions(-)
>>
>> -- 
>> 2.13.0
>>
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[Alejandro Mery]

On 26/06/17 19:38, akuster808 wrote:
> 
> 
> On 06/23/2017 01:37 PM, Denys Dmytriyenko wrote:
>> Wasn't there already a submission for devmem2 backport on the list?
> 
> yes. running a bit behind. pulling in today.

ping :)

Re: [meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[Alejandro Mery]

On 13/07/17 18:03, Alejandro Mery wrote:
> On 26/06/17 19:38, akuster808 wrote:
>>
>> On 06/23/2017 01:37 PM, Denys Dmytriyenko wrote:
>>> Wasn't there already a submission for devmem2 backport on the list?
>> yes. running a bit behind. pulling in today.
> ping :)

Hi Armin,

if you don't have time at the moment to take care of morty/pyro maybe
you could appoint someone to temporarily take over... or no?


Cheers,
Alejandro Mery

Re: [meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[akuster808]

On 07/27/2017 09:44 AM, Alejandro Mery wrote:
> On 13/07/17 18:03, Alejandro Mery wrote:
>> On 26/06/17 19:38, akuster808 wrote:
>>> On 06/23/2017 01:37 PM, Denys Dmytriyenko wrote:
>>>> Wasn't there already a submission for devmem2 backport on the list?
>>> yes. running a bit behind. pulling in today.
>> ping :)
> Hi Armin,
>
> if you don't have time at the moment to take care of morty/pyro maybe
> you could appoint someone to temporarily take over... or no?

I believe they are in pyro:
http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/devmem2?h=pyro&id=fc801961457fe2fbb24973bb43b302ad46044cb8
http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/devmem2?h=pyro&id=6c584374a599f6f8d3607f20ecfc13a67ccf1da1

so what is missing from Pyro?


Morty pull request sent.

- armin

>
>
> Cheers,
> Alejandro Mery

Re: [meta-oe][morty][PATCH 0/6] merge devmem2 and gitver fixes from master

[Alejandro Mery]

On 02/08/17 00:37, akuster808 wrote:
>
> On 07/27/2017 09:44 AM, Alejandro Mery wrote:
>> On 13/07/17 18:03, Alejandro Mery wrote:
>>> On 26/06/17 19:38, akuster808 wrote:
>>>> On 06/23/2017 01:37 PM, Denys Dmytriyenko wrote:
>>>>> Wasn't there already a submission for devmem2 backport on the list?
>>>> yes. running a bit behind. pulling in today.
>>> ping :)
>> Hi Armin,
>>
>> if you don't have time at the moment to take care of morty/pyro maybe
>> you could appoint someone to temporarily take over... or no?
> I believe they are in pyro:
> http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/devmem2?h=pyro&id=fc801961457fe2fbb24973bb43b302ad46044cb8
> http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/devmem2?h=pyro&id=6c584374a599f6f8d3607f20ecfc13a67ccf1da1
>
> so what is missing from Pyro?

nothing now :) I'll send the requests for the gitver.bbclass stuff soon


> Morty pull request sent.

thank you!

[meta-oe][morty][PATCH v2 5/6] gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"

[Alejandro Mery]

v2:
* use git rev-parse instead of rev-list for consistency with get_git_pv
* fix getVar() to pass `expand` as required by morty's bitbake

Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/gitver.bbclass | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index adb434a46..875a3d79d 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -13,16 +13,15 @@ def git_drop_tag_prefix(version):
         return version
 
 GIT_TAGADJUST = "git_drop_tag_prefix(version)"
-GITVER = "${@get_git_pv('${S}', d, tagadjust=lambda version:${GIT_TAGADJUST})}"
-GITSHA = "${@get_git_hash('${S}', d)}"
+GITVER = "${@get_git_pv(d, tagadjust=lambda version:${GIT_TAGADJUST})}"
+GITSHA = "${@get_git_hash(d)}"
 
 def gitrev_run(cmd, path):
     (output, error) = bb.process.run(cmd, cwd=path)
     return output.rstrip()
 
-def get_git_pv(path, d, tagadjust=None):
+def get_git_pv(d, tagadjust=None):
     import os
-    import bb.process
 
     srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
     gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
@@ -46,6 +45,17 @@ def get_git_pv(path, d, tagadjust=None):
             ver = tagadjust(ver)
         return ver
 
+def get_git_hash(d):
+    import os
+
+    srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
+    gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
+    try:
+        return gitrev_run("git rev-parse HEAD", gitdir)
+
+    except Exception as exc:
+        bb.fatal(str(exc))
+
 def mark_recipe_dependencies(path, d):
     from bb.parse import mark_dependency
 
-- 
2.13.0