Skip to contentSkip to conversation

restinio: fix S variable in multilib builds

PATCH New Martin Jansa 1 participant 2 messages Apr 7, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 restinio: fix S variable in multilib builds

* do_populate_lic as well as do_configure fails in multilib builds, because S points to empty:
lib32-restinio/0.6.13-r0/lib32-restinio-0.6.13/dev

---
 .../recipes-connectivity/restinio/restinio_0.6.13.bb          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb +2 -2
index e715135dc3..03eff43dd2 100644
@@ -9,11 +9,11 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=f399b62ce0a152525d1589a5a40c0ff6"
 DEPENDS = "asio fmt http-parser"
 
-SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/restinio-${PV}.tar.bz2"
+SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/${BP}.tar.bz2"
 SRC_URI[md5sum] = "37a4310e98912030a74bdd4ed789f33c"
 SRC_URI[sha256sum] = "b35d696e6fafd4563ca708fcecf9d0cf6705c846d417b5000f5252e0188848e7"
 
-S = "${WORKDIR}/${PN}-${PV}/dev"
+S = "${WORKDIR}/${BP}/dev"
 
 inherit cmake
 
Signature · 1 line
2.40.0
#1 lore raw

PATCH 2/2 mongodb: fix chown user for multilib builds

* the user is named mongodb (BPN) and in multilib builds this fails with:
chown: invalid user: 'lib32-mongodb:lib32-mongodb'

---
 .../meta-python/recipes-dbs/mongodb/mongodb_git.bb              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +1 -1
index 7b85bdddab..550fbc30d3 100644
@@ -127,7 +127,7 @@ scons_do_install() {
 
     # install mongo data folder
     install -m 755 -d ${D}${localstatedir}/lib/${BPN}
-    chown ${PN}:${PN} ${D}${localstatedir}/lib/${BPN}
+    chown ${BPN}:${BPN} ${D}${localstatedir}/lib/${BPN}
 
     # Create /var/log/mongodb in runtime.
     if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then
Signature · 1 line
2.40.0