Skip to contentSkip to conversation

sip: Upgrade to 4.19.19

PATCH In review Khem Raj 2 participants 3 messages Nov 9, 2019 – Nov 13, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 sip: Upgrade to 4.19.19

Needed for QT 5.13 based python modules

---
 meta-oe/recipes-devtools/sip/sip.inc                        | 6 +++---
 .../sip/{sip3_4.19.16.bb => sip3_4.19.19.bb}                | 0
 .../recipes-devtools/sip/{sip_4.19.16.bb => sip_4.19.19.bb} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-devtools/sip/{sip3_4.19.16.bb => sip3_4.19.19.bb} (100%)
 rename meta-oe/recipes-devtools/sip/{sip_4.19.16.bb => sip_4.19.19.bb} (100%)
meta-oe/recipes-devtools/sip/sip.inc +3 -3
index 092531b322..d8e32a7687 100644
@@ -5,9 +5,9 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
 
 SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \
-          "
-SRC_URI[md5sum] = "7e854b0da395ddc8fb5da82d0321994d"                           
-SRC_URI[sha256sum] = "184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620"
+"
+SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88"
+SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44"
 
 S = "${WORKDIR}/sip-${PV}"
 
meta-oe/recipes-devtools/sip/sip3_4.19.19.bb renamed from meta-oe/recipes-devtools/sip/sip3_4.19.16.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/sip/sip3_4.19.16.bb
rename to meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
meta-oe/recipes-devtools/sip/sip_4.19.19.bb renamed from meta-oe/recipes-devtools/sip/sip_4.19.16.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/sip/sip_4.19.16.bb
rename to meta-oe/recipes-devtools/sip/sip_4.19.19.bb
Signature · 1 line
2.24.0
#1 lore raw

Any idea why it built ok for me when testing 5.13 with glibc?

In the e-mail you mentioned failures with musl, is this upgrade needed only together with musl? You also mentioned it's new failure and 5.13 is in meta-qt5 for quite some time, the recent upgrade was just from 5.13.0 to 5.13.2, maybe it got caused by
https://github.com/meta-qt5/meta-qt5/pull/243 instead?
Still this PR builds fine here with 5.13.2, glibc, qemux86-64.

If that is the case, then we might need this upgrade in zeus branch as well (5.13 is in meta-qt5/zeus)

Cheers,

Quoted 56 lines · Khem Raj

Needed for QT 5.13 based python modules

---
 meta-oe/recipes-devtools/sip/sip.inc                        | 6 +++---
 .../sip/{sip3_4.19.16.bb => sip3_4.19.19.bb}                | 0
 .../recipes-devtools/sip/{sip_4.19.16.bb => sip_4.19.19.bb} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-devtools/sip/{sip3_4.19.16.bb => sip3_4.19.19.bb}
(100%)
 rename meta-oe/recipes-devtools/sip/{sip_4.19.16.bb => sip_4.19.19.bb}

(100%)

meta-oe/recipes-devtools/sip/sip.inc +0 -0
index 092531b322..d8e32a7687 100644
@@ -5,9 +5,9 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM =

"file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"

SRC_URI = "
https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz
\

meta-oe/recipes-devtools/sip/sip.inc +0 -3
-          "
-SRC_URI[md5sum] = "7e854b0da395ddc8fb5da82d0321994d"
 
-SRC_URI[sha256sum] =

"184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620" +"

meta-oe/recipes-devtools/sip/sip.inc +2 -0
+SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88"
+SRC_URI[sha256sum] =

"5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44"

S = "${WORKDIR}/sip-${PV}"

meta-oe/recipes-devtools/sip/sip3_4.19.19.bb renamed from meta-oe/recipes-devtools/sip/sip3_4.19.16.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/sip/sip3_4.19.16.bb
rename to meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
meta-oe/recipes-devtools/sip/sip_4.19.19.bb renamed from meta-oe/recipes-devtools/sip/sip_4.19.16.bb +0 -1
similarity index 100%
rename from meta-oe/recipes-devtools/sip/sip_4.19.16.bb
rename to meta-oe/recipes-devtools/sip/sip_4.19.19.bb
--

2.24.0

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

author
#2 lore raw
Quoted 9 lines · Martin Jansa

Any idea why it built ok for me when testing 5.13 with glibc?

In the e-mail you mentioned failures with musl, is this upgrade needed only together with musl? You also mentioned it's new failure and 5.13 is in meta-qt5 for quite some time, the recent upgrade was just from 5.13.0 to 5.13.2, maybe it got caused by
https://github.com/meta-qt5/meta-qt5/pull/243 instead? Still this PR builds fine here with 5.13.2, glibc, qemux86-64.

it seems likely the cause, I have posted a pull request

https://github.com/meta-qt5/meta-qt5/pull/255

Which upgrades pyqt5 to 5.13.2 as well, secondly it disables/blacklists py2 version of recipe, I think py2 is on its way out anyway so we can ignore that, second patch adds a patch to qtwebengine to fix the do_install issue with musl. Please take a look at this pull.

Quoted 2 lines

If that is the case, then we might need this upgrade in zeus branch as well (5.13 is in meta-qt5/zeus)

I guess, just blacklist py2 version of pyqt5 in zeus would be sufficient.

Quoted 55 lines

Cheers,

Quoted 51 lines · Khem Raj

Needed for QT 5.13 based python modules

---
 meta-oe/recipes-devtools/sip/sip.inc                        | 6
+++---
 .../sip/{sip3_4.19.16.bb => sip3_4.19.19.bb}                | 0
 .../recipes-devtools/sip/{sip_4.19.16.bb => sip_4.19.19.bb} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-devtools/sip/{sip3_4.19.16.bb =>
sip3_4.19.19.bb} (100%)
 rename meta-oe/recipes-devtools/sip/{sip_4.19.16.bb =>

sip_4.19.19.bb} (100%)

meta- renamed from meta-oe/recipes-devtools/sip/sip.inc +0 -0

oe/recipes-devtools/sip/sip.inc
index 092531b322..d8e32a7687 100644

meta-oe/recipes-devtools/sip/sip.inc +0 -0
@@ -5,9 +5,9 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE-

GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"

SRC_URI = "
https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz
\

meta-oe/recipes-devtools/sip/sip.inc +0 -3
-          "
-SRC_URI[md5sum] = "7e854b0da395ddc8fb5da82d0321994d"             
 
-SRC_URI[sha256sum] =

"184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620" +"

meta-oe/recipes-devtools/sip/sip.inc +2 -0
+SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88"
+SRC_URI[sha256sum] =

"5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44"

S = "${WORKDIR}/sip-${PV}"

meta- renamed from meta-oe/recipes-devtools/sip/sip3_4.19.16.bb +0 -0

oe/recipes-devtools/sip/sip3_4.19.19.bb similarity index 100%
rename from meta-oe/recipes-devtools/sip/sip3_4.19.16.bb rename to meta-oe/recipes-devtools/sip/sip3_4.19.19.bb

meta- renamed from meta-oe/recipes-devtools/sip/sip_4.19.16.bb +0 -0

oe/recipes-devtools/sip/sip_4.19.19.bb similarity index 100%
rename from meta-oe/recipes-devtools/sip/sip_4.19.16.bb rename to meta-oe/recipes-devtools/sip/sip_4.19.19.bb

Signature · 1 line
2.24.0