Skip to contentSkip to conversation

merge devmem2 and gitver fixes from master

PATCH In review Alejandro Mery 4 participants 23 messages Jun 23, 2017 – Aug 2, 2017

lore
Share & tools
lore
#0 lore raw

cover merge devmem2 and gitver fixes from master

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(-)
Signature · 1 line
2.13.0
#1 lore raw

PATCH 1/6 devmem2: Change source URL to regain access to it

From: Nicolas Ferre <[email protected]>

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.

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-support/devmem2/devmem2.bb +4 -4
index e48cc9210..c42eb5e0b 100644
@@ -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"
Signature · 1 line
2.13.0
#2 lore raw

PATCH 2/6 devmem2: use different filename to avoid checksum conflicts

In reply to Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +5 -1
index c42eb5e0b..c86eb2e4b 100644
@@ -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}
 }
Signature · 1 line
2.13.0
#3 lore raw

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

Quoted 29 lines · Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
index c42eb5e0b..c86eb2e4b 100644

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 9

Quoted 8 lines
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
@@ -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

Quoted 17 lines
meta-oe/recipes-support/devmem2/devmem2.bb +4 -1
 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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#4 lore raw

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

Quoted 34 lines · Khem Raj
Quoted 32 lines · Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
index c42eb5e0b..c86eb2e4b 100644
@@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 9

Quoted 5 lines
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
-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

Quoted 22 lines
Quoted 17 lines
meta-oe/recipes-support/devmem2/devmem2.bb +4 -1
 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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 4 lines
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
#5 lore raw

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

Quoted 43 lines · Denys Dmytriyenko
Quoted 34 lines · Khem Raj
Quoted 32 lines · Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
index c42eb5e0b..c86eb2e4b 100644
@@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 9

Quoted 5 lines
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
-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

Quoted 3 lines

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.

Quoted 7 lines
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 15

Quoted 7 lines
meta-oe/recipes-support/devmem2/devmem2.bb +4 -0
 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}

Quoted 16 lines
Quoted 16 lines
Quoted 11 lines
meta-oe/recipes-support/devmem2/devmem2.bb +0 -1
 do_compile() {
     ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
 }
--

2.13.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#6 lore raw

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

Quoted 53 lines · Khem Raj
Quoted 43 lines · Denys Dmytriyenko
Quoted 34 lines · Khem Raj
Quoted 32 lines · Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
index c42eb5e0b..c86eb2e4b 100644
@@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 9

Quoted 5 lines
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
-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

Quoted 3 lines

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.

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
 CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
 
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 15

Quoted 4 lines
meta-oe/recipes-support/devmem2/devmem2.bb +4 -0
+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

Quoted 17 lines
Quoted 16 lines
Quoted 16 lines
Quoted 11 lines
meta-oe/recipes-support/devmem2/devmem2.bb +0 -1
 do_compile() {
     ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
 }
--

2.13.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#7 lore raw

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

Quoted 61 lines · Denys Dmytriyenko
Quoted 60 lines · Khem Raj
Quoted 43 lines · Denys Dmytriyenko
Quoted 34 lines · Khem Raj
Quoted 32 lines · Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
index c42eb5e0b..c86eb2e4b 100644
@@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 9

Quoted 5 lines
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
-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

Quoted 3 lines

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.

Quoted 7 lines
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 15

Quoted 7 lines
meta-oe/recipes-support/devmem2/devmem2.bb +4 -0
 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

Quoted 4 lines
Quoted 1 line

${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.

Quoted 21 lines

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

Quoted 17 lines
Quoted 16 lines
Quoted 16 lines
Quoted 11 lines
meta-oe/recipes-support/devmem2/devmem2.bb +0 -1
 do_compile() {
     ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
 }
--

2.13.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#8 lore raw

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

Quoted 64 lines · Khem Raj
Quoted 63 lines · Denys Dmytriyenko
Quoted 61 lines · Khem Raj
Quoted 43 lines · Denys Dmytriyenko
Quoted 34 lines · Khem Raj
Quoted 32 lines · Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
index c42eb5e0b..c86eb2e4b 100644
@@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 9

Quoted 5 lines
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
-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

Quoted 3 lines

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.

Quoted 7 lines
Quoted 7 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 15

Quoted 7 lines
meta-oe/recipes-support/devmem2/devmem2.bb +4 -0
 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}

Quoted 7 lines
Quoted 2 lines

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...

Quoted 21 lines
Quoted 20 lines

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

Quoted 17 lines
Quoted 16 lines
Quoted 16 lines
Quoted 11 lines
meta-oe/recipes-support/devmem2/devmem2.bb +0 -1
 do_compile() {
     ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
 }
--

2.13.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#9 lore raw

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

In reply to Denys Dmytriyenko
Quoted 56 lines · Denys Dmytriyenko
Quoted 55 lines · Khem Raj
Quoted 35 lines · Denys Dmytriyenko
Quoted 34 lines · Khem Raj
Quoted 32 lines · Alejandro Mery

From: Denys Dmytriyenko <[email protected]>

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

---
 meta-oe/recipes-support/devmem2/devmem2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +0 -0
index c42eb5e0b..c86eb2e4b 100644
@@ -3,12 +3,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
 PR = "r7"
 
Quoted 9 lines
Quoted 6 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 9

Quoted 5 lines
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
-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.

Quoted 6 lines
Quoted 6 lines

meta-oe/recipes-support/devmem2/devmem2.bb LICENSE = "GPLv2+" · line 15

Quoted 6 lines
meta-oe/recipes-support/devmem2/devmem2.bb +4 -0
 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

Quoted 5 lines
Quoted 1 line

${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?

#10 lore raw

PATCH 3/6 gitver: fix try/except syntax for python3 support

In reply to Alejandro Mery

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

It's backward compatible with 2.6+

---
 meta-oe/classes/gitver.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/classes/gitver.bbclass +2 -2
index e7b5155ee..b677996ea 100644
@@ -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:
Signature · 1 line
2.13.0
#11 lore raw

PATCH 4/6 gitver: extend class to use EXTERNALSRC if set

In reply to Alejandro Mery
---
 meta-oe/classes/gitver.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta-oe/classes/gitver.bbclass +4 -2
index b677996ea..adb434a46 100644
@@ -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)
 }
Signature · 1 line
2.13.0
#12 lore raw

PATCH 4/6 gitver: extend class to use EXTERNALSRC if set

In reply to Alejandro Mery
---
 meta-oe/classes/gitver.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta-oe/classes/gitver.bbclass +4 -2
index b677996ea..adb434a46 100644
@@ -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)
 }
Signature · 1 line
2.13.0
#13 lore raw

PATCH 5/6 gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"

---
 meta-oe/classes/gitver.bbclass | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
meta-oe/classes/gitver.bbclass +14 -4
index adb434a46..5ecfb54c8 100644
@@ -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
 
Signature · 1 line
2.13.0
#14 lore raw

PATCH 6/6 gitver: skip packages instead of panic()ing if ${GITVER} fails to expand

In reply to 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

---
 meta-oe/classes/gitver.bbclass | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
meta-oe/classes/gitver.bbclass +10 -13
index 5ecfb54c8..b8f5cf2d2 100644
@@ -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
Signature · 1 line
2.13.0
#15 lore raw
In reply to Alejandro Mery

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

Quoted 32 lines · 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(-)
Signature · 7 lines
2.13.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
#16 lore raw
Quoted 1 line · Denys Dmytriyenko

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

Quoted 35 lines · Alejandro Mery
Quoted 32 lines

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(-)
Signature · 7 lines
2.13.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
#17 lore raw
In reply to Denys Dmytriyenko
Quoted 1 line · Denys Dmytriyenko

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

yes. running a bit behind. pulling in today.
-armin

Quoted 34 lines · Alejandro Mery
Quoted 32 lines

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(-)
Signature · 7 lines
2.13.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
#18 lore raw
Quoted 6 lines · On 26/06/17 19:38, akuster808 wrote:
Quoted 1 line · Denys Dmytriyenko

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

yes. running a bit behind. pulling in today.

ping :)

#19 lore raw
Quoted 6 lines · Alejandro Mery
Quoted 4 lines · On 26/06/17 19:38, akuster808 wrote:
Quoted 1 line · Denys Dmytriyenko

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

#20 lore raw
Quoted 10 lines · Alejandro Mery
Quoted 5 lines · Alejandro Mery
Quoted 3 lines · On 26/06/17 19:38, akuster808 wrote:
Quoted 1 line · Denys Dmytriyenko

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

Quoted 4 lines

Cheers,
Alejandro Mery

#21 lore raw
Quoted 10 lines · On 02/08/17 00:37, akuster808 wrote:
Quoted 8 lines · Alejandro Mery
Quoted 5 lines · Alejandro Mery
Quoted 3 lines · On 26/06/17 19:38, akuster808 wrote:
Quoted 1 line · Denys Dmytriyenko

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

yes. running a bit behind. pulling in today.

ping :)

Hi Armin,

Quoted 7 lines
Quoted 2 lines

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

Quoted 1 line

Morty pull request sent.

thank you!

#22 lore raw

PATCH v2 5/6 gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"

In reply to 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

---
 meta-oe/classes/gitver.bbclass | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
meta-oe/classes/gitver.bbclass +14 -4
index adb434a46..875a3d79d 100644
@@ -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
 
Signature · 1 line
2.13.0