Skip to contentSkip to conversation

dbus-cxx: fix fetch error.

PATCH New Armin Kuster 1 participant 3 messages Jan 29, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 dbus-cxx: fix fetch error.

Upstream created a branch for the sources for this version. update accordingly

---
 meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb +1 -1
index 79fb2f5100..099564eb34 100644
@@ -5,7 +5,7 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83"
 
 FILEEXTRAPATHS_prepend = "${THISDIR}/files"
-SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=dbus-cxx-0.y;protocol=https"
 SRC_URI += "file://fix_build_musl.patch"
 SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e"
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 spidev-test: Update common-licenses reference

From: Daniel Klauer <[email protected]>

The license files were renamed in oe-core to match the SPDX names.

Most recipes here were already updated in commit ed54f12e19 ("recipes: Update common-licenses references to match new names"), but spidev-test was still missing.

---
 meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-kernel/spidev-test/spidev-test.bb +1 -1
index 6626302919..974cb1e93c 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Test SPI devices"
 DESCRIPTION = "SPI testing utility using the spidev driver"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 PROVIDES = "virtual/spidev-test"
 
 inherit bash-completion kernelsrc kernel-arch
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/3 dbus-daemon-proxy: add missing `return` statement

In reply to Armin Kuster

From: Leif Middelschulte <[email protected]>

The missing return statement leads to a SIGABRT.

---
 ...1-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch +1 -1
index 2c4ca057f2..1c2fc3813f 100644
@@ -21,7 +21,7 @@ index 009e4fd..f3f0d80 100644
  
    if (!dbus_conn)
 -    return;
-+    DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
++    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
  
    if (verbose)
      g_print ("New message from server: type='%d' path='%s' iface='%s'"
Signature · 1 line
2.25.1