Skip to contentSkip to conversation

gphoto2: Use :space: to identify space characters

PATCH In review Khem Raj 2 participants 6 messages Apr 19, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 gphoto2: Use :space: to identify space characters

Sometimes current sed expression does not work so use POSIX compliant expression

---
 meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +1 -1
index 6a2f7164b5..d46ed2b07a 100644
@@ -20,5 +20,5 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \
 "
 
 do_configure:append() {
-	sed -i 's/--sysroot[^ "]*//g' ${B}/config.h
+	sed -i -E 's/--sysroot=[^"'"'"' ]+//g' ${B}/config.h
 }
author
#1 lore raw

PATCH 2/4 python3-pydantic-core: Upgrade to 2.34.1

Fix RISCV-32 builds while here

---
 .../python/python3-pydantic-core-crates.inc   |  30 +-
 .../0001-Upgrade-radium-to-1.0.patch          | 540 ++++++++++++++++++
 ...toml-Update-bitvec-to-use-radium-1.x.patch |  82 +++
 ...3.1.bb => python3-pydantic-core_2.34.1.bb} |   7 +-
 4 files changed, 641 insertions(+), 18 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-Upgrade-radium-to-1.0.patch
 create mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch
 rename meta-python/recipes-devtools/python/{python3-pydantic-core_2.33.1.bb => python3-pydantic-core_2.34.1.bb} (84%)
meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +16 -14
index 8c2a25dd7a..86b72c0e9a 100644
@@ -48,14 +48,15 @@ SRC_URI += " \
     crate://crates.io/percent-encoding/2.3.1 \
     crate://crates.io/portable-atomic/1.6.0 \
     crate://crates.io/proc-macro2/1.0.86 \
-    crate://crates.io/pyo3/0.24.0 \
-    crate://crates.io/pyo3-build-config/0.24.0 \
-    crate://crates.io/pyo3-ffi/0.24.0 \
-    crate://crates.io/pyo3-macros/0.24.0 \
-    crate://crates.io/pyo3-macros-backend/0.24.0 \
+    crate://crates.io/pyo3/0.24.1 \
+    crate://crates.io/pyo3-build-config/0.24.1 \
+    crate://crates.io/pyo3-ffi/0.24.1 \
+    crate://crates.io/pyo3-macros/0.24.1 \
+    crate://crates.io/pyo3-macros-backend/0.24.1 \
     crate://crates.io/python3-dll-a/0.2.13 \
     crate://crates.io/quote/1.0.36 \
     crate://crates.io/radium/0.7.0 \
+    crate://crates.io/radium/1.1.0 \
     crate://crates.io/regex/1.11.1 \
     crate://crates.io/regex-automata/0.4.8 \
     crate://crates.io/regex-syntax/0.8.5 \
@@ -63,7 +64,7 @@ SRC_URI += " \
     crate://crates.io/ryu/1.0.18 \
     crate://crates.io/serde/1.0.218 \
     crate://crates.io/serde_derive/1.0.218 \
-    crate://crates.io/serde_json/1.0.138 \
+    crate://crates.io/serde_json/1.0.140 \
     crate://crates.io/smallvec/1.14.0 \
     crate://crates.io/speedate/0.15.0 \
     crate://crates.io/stable_deref_trait/1.2.0 \
@@ -80,7 +81,7 @@ SRC_URI += " \
     crate://crates.io/url/2.5.4 \
     crate://crates.io/utf16_iter/1.0.5 \
     crate://crates.io/utf8_iter/1.0.4 \
-    crate://crates.io/uuid/1.15.1 \
+    crate://crates.io/uuid/1.16.0 \
     crate://crates.io/version_check/0.9.5 \
     crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
     crate://crates.io/write16/1.0.0 \
@@ -142,14 +143,15 @@ SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa
 SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-SRC_URI[pyo3-0.24.0.sha256sum] = "7f1c6c3591120564d64db2261bec5f910ae454f01def849b9c22835a84695e86"
-SRC_URI[pyo3-build-config-0.24.0.sha256sum] = "e9b6c2b34cf71427ea37c7001aefbaeb85886a074795e35f161f5aecc7620a7a"
-SRC_URI[pyo3-ffi-0.24.0.sha256sum] = "5507651906a46432cdda02cd02dd0319f6064f1374c9147c45b978621d2c3a9c"
-SRC_URI[pyo3-macros-0.24.0.sha256sum] = "b0d394b5b4fd8d97d48336bb0dd2aebabad39f1d294edd6bcd2cccf2eefe6f42"
-SRC_URI[pyo3-macros-backend-0.24.0.sha256sum] = "fd72da09cfa943b1080f621f024d2ef7e2773df7badd51aa30a2be1f8caa7c8e"
+SRC_URI[pyo3-0.24.1.sha256sum] = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229"
+SRC_URI[pyo3-build-config-0.24.1.sha256sum] = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1"
+SRC_URI[pyo3-ffi-0.24.1.sha256sum] = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc"
+SRC_URI[pyo3-macros-0.24.1.sha256sum] = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44"
+SRC_URI[pyo3-macros-backend-0.24.1.sha256sum] = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855"
 SRC_URI[python3-dll-a-0.2.13.sha256sum] = "49fe4227a288cf9493942ad0220ea3f185f4d1f2a14f197f7344d6d02f4ed4ed"
 SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+SRC_URI[radium-1.1.0.sha256sum] = "db0b76288902db304c864a12046b73d2d895cc34a4bb8137baaeebe9978a072c"
 SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 SRC_URI[regex-automata-0.4.8.sha256sum] = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
@@ -157,7 +159,7 @@ SRC_URI[rustversion-1.0.17.sha256sum] = "955d28af4278de8121b7ebeb796b6a45735dc01
 SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 SRC_URI[serde-1.0.218.sha256sum] = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 SRC_URI[serde_derive-1.0.218.sha256sum] = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
-SRC_URI[serde_json-1.0.138.sha256sum] = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 SRC_URI[smallvec-1.14.0.sha256sum] = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 SRC_URI[speedate-0.15.0.sha256sum] = "9a5e7adf4e07e7de39a64d77962ca14a09165e592d42d0c9f9acadb679f4f937"
 SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
@@ -174,7 +176,7 @@ SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd8
 SRC_URI[url-2.5.4.sha256sum] = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-SRC_URI[uuid-1.15.1.sha256sum] = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
+SRC_URI[uuid-1.16.0.sha256sum] = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
meta-python/recipes-devtools/python/python3-pydantic-core/0001-Upgrade-radium-to-1.0.patch new file +540 -0

540 lines not on this page · raw message

meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch new file +82 -0

82 lines not on this page · raw message

meta-python/recipes-devtools/python/python3-pydantic-core_2.34.1.bb renamed from meta-python/recipes-devtools/python/python3-pydantic-core_2.33.1.bb +3 -4
similarity index 84%
rename from meta-python/recipes-devtools/python/python3-pydantic-core_2.33.1.bb
rename to meta-python/recipes-devtools/python/python3-pydantic-core_2.34.1.bb
index c7e57cff5b..0e2d065128 100644
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c"
 
 require ${BPN}-crates.inc
 
-SRC_URI[sha256sum] = "bcc9c6fdb0ced789245b02b7d6603e17d1563064ddcfc36f046b61c0c05dd9df"
+SRC_URI += "file://0001-Upgrade-radium-to-1.0.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/bitvec-1.0.1/"
+SRC_URI += "file://0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch"
+SRC_URI[sha256sum] = "6bf31628ab6d0e7c7c0372419898c52ef0a447b33ab47c7f62053bd013cc5b09"
 
 DEPENDS = "python3-maturin-native python3-typing-extensions"
 
@@ -46,6 +48,3 @@ do_install_ptest:append () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
-
-# It needs bitvec to adopt radum 1.x see https://github.com/ferrilab/bitvec/pull/220
-COMPATIBLE_HOST:riscv32 = "null"
author
#2 lore raw

PATCH 3/4 python3-pydantic: Enable riscv32 builds

In reply to Khem Raj

python3-pydantic-core has been fixed to work with riscv32

---
 meta-python/recipes-devtools/python/python3-pydantic_2.11.3.bb | 3 ---
 1 file changed, 3 deletions(-)
meta-python/recipes-devtools/python/python3-pydantic_2.11.3.bb +0 -3
index 03a9483f5b..704d4ad98b 100644
@@ -70,6 +70,3 @@ do_install_ptest:append() {
 }
 
 BBCLASSEXTEND = "native nativesdk"
-
-# Needs pydantic-core to be buildable
-COMPATIBLE_HOST:riscv32 = "null"
author
#3 lore raw

PATCH 4/4 python3-web3: Re-enable on riscv32

In reply to Khem Raj

pydantic-core module has been fixed to build on riscv32 so re-enable it

---
 .../recipes-core/packagegroups/packagegroup-meta-python.bb     | 2 --
 meta-python/recipes-devtools/python/python3-web3_7.10.0.bb     | 3 ---
 2 files changed, 5 deletions(-)
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +0 -2
index b8cb47538c..6866ed93cb 100644
@@ -471,8 +471,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
     telepathy-python3 \
     unattended-upgrades \
 "
-# Due to pydantic not being buildable on rv32
-RDEPENDS:packagegroup-meta-python3:remove:riscv32 = "python3-web3"
 
 RDEPENDS:packagegroup-meta-python3-ptest = "\
     python3-ansicolors-ptest \
meta-python/recipes-devtools/python/python3-web3_7.10.0.bb +0 -3
index f677585638..e9f067aa96 100644
@@ -24,6 +24,3 @@ RDEPENDS:${PN} += " \
     python3-websockets \
     python3-pyunormalize \
 "
-
-# Needs python3-pydantic to be buildable on rv32
-COMPATIBLE_HOST:riscv32 = "null"
#4 lore raw
In reply to Khem Raj

meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \ · line 24

Quoted 5 lines

do_configure:append() {

meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +1 -1
-	sed -i 's/--sysroot[^ "]*//g' ${B}/config.h
+	sed -i -E 's/--sysroot=[^"'"'"' ]+//g' ${B}/config.h
 }

The summary claims to use :space: characters, but in the change there is no [:space:] here.

That regex isn't too easy to parse with those quote-marks. Isn't it equivalent to
sed -i -E "s/--sysroot=[^'\" ]+//g" ${B}/config.h
?

author
#5 lore raw
Quoted 5 lines · Gyorgy Sarvari

meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \ · line 24

Quoted 5 lines

do_configure:append() {

meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +1 -1
-     sed -i 's/--sysroot[^ "]*//g' ${B}/config.h
+     sed -i -E 's/--sysroot=[^"'"'"' ]+//g' ${B}/config.h
 }
Quoted 7 lines

The summary claims to use :space: characters, but in the change there is no [:space:] here.

That regex isn't too easy to parse with those quote-marks. Isn't it equivalent to
sed -i -E "s/--sysroot=[^'\" ]+//g" ${B}/config.h
?

Seems that way

Quoted 3 lines