dbus-broker: 16 -> 17
PATCH 1/1 dbus-broker: 16 -> 17
This change cleans up a number of things about the build
- Upstream no longer depends on glib
- We dont ever runtime depend on reference dbus
- Docs are disabled by default so we don't need to specify the option
- There is no native tooling so we shouldn't need a native bbclass
- No longer depend on gitsm since upstream provides release tarballs
---
.../{dbus-broker_git.bb => dbus-broker_17.bb} | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
rename meta-oe/recipes-core/dbus/{dbus-broker_git.bb => dbus-broker_17.bb} (60%)meta-oe/recipes-core/dbus/dbus-broker_17.bb renamed from meta-oe/recipes-core/dbus/dbus-broker_git.bb +3 -14
@@ -6,18 +6,12 @@ SECTION = "base" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" -DEPENDS = "dbus glib-2.0 expat" - -PV = "16+git${SRCPV}" -SRCREV = "fc874afa0992d0c75ec25acb43d344679f0ee7d2" - -SRC_URI = "gitsm://github.com/bus1/dbus-broker;protocol=git" - -S = "${WORKDIR}/git" +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI[sha256sum] = "4ec7491745a88ec5112644b0e2b9a0abe9107c85d7650be8988d88efb52da84b" inherit meson pkgconfig systemd distro_features_check -EXTRA_OEMESON += "-Ddocs=false" +DEPENDS = "expat systemd" REQUIRED_DISTRO_FEATURES = "systemd"
@@ -25,8 +19,3 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN} += "${systemd_user_unitdir}" - -RDEPENDS_${PN} = "dbus" - -BBCLASSEXTEND = "native" -
Signature · 1 line
2.20.1
Fails with musl/qemux86
| [45/177] /home/jenkins/oe/world/yoe/build/tmpfs/work/i586-yoe-linux-musl/dbus-broker/17-r0/recipe-sysroot-native/usr/bin/meson --internal symbolextractor subprojects/c-utf8/src/libcutf8.so.0 'subprojects/c-utf8/src/8c544e0@@cutf8@sha/libcutf8.so.0.symbols'
--cross-host=linux-musl
| ninja: build stopped: subcommand failed.
Quoted 60 lines · William A. Kennington III via Openembedded-devel
This change cleans up a number of things about the build
- Upstream no longer depends on glib
- We dont ever runtime depend on reference dbus
- Docs are disabled by default so we don't need to specify the option
- There is no native tooling so we shouldn't need a native bbclass
- No longer depend on gitsm since upstream provides release tarballsSigned-off-by William A. Kennington III <[email protected]>--- .../{dbus-broker_git.bb => dbus-broker_17.bb} | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) rename meta-oe/recipes-core/dbus/{dbus-broker_git.bb => dbus-broker_17.bb} (60%)meta-oe/recipes-core/dbus/dbus-broker_17.bb renamed from meta-oe/recipes-core/dbus/dbus-broker_git.bb +3
-15@@ -6,18 +6,12 @@ SECTION = "base" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" -DEPENDS = "dbus glib-2.0 expat" - -PV = "16+git${SRCPV}" -SRCREV = "fc874afa0992d0c75ec25acb43d344679f0ee7d2" - -SRC_URI = "gitsm://github.com/bus1/dbus-broker;protocol=git" - -S = "${WORKDIR}/git" +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI[sha256sum] = "4ec7491745a88ec5112644b0e2b9a0abe9107c85d7650be8988d88efb52da84b" inherit meson pkgconfig systemd distro_features_check -EXTRA_OEMESON += "-Ddocs=false" +DEPENDS = "expat systemd" REQUIRED_DISTRO_FEATURES = "systemd"@@ -25,8 +19,3 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN} += "${systemd_user_unitdir}" - -RDEPENDS_${PN} = "dbus" - -BBCLASSEXTEND = "native" - --2.20.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
here is full build error
https://errors.yoctoproject.org/Errors/Details/228429/
Quoted 72 lines · Khem Raj
Fails with musl/qemux86
| [45/177]
/home/jenkins/oe/world/yoe/build/tmpfs/work/i586-yoe-linux-musl/dbus-broker/17-r0/recipe-sysroot-native/usr/bin/meson--internal symbolextractor subprojects/c-utf8/src/libcutf8.so.0 'subprojects/c-utf8/src/8c544e0@@cutf8@sha/libcutf8.so.0.symbols'
--cross-host=linux-musl
| ninja: build stopped: subcommand failed.Quoted 60 lines · William A. Kennington III via Openembedded-devel
This change cleans up a number of things about the build
- Upstream no longer depends on glib
- We dont ever runtime depend on reference dbus
- Docs are disabled by default so we don't need to specify the option
- There is no native tooling so we shouldn't need a native bbclass
- No longer depend on gitsm since upstream provides release tarballsSigned-off-by William A. Kennington III <[email protected]>--- .../{dbus-broker_git.bb => dbus-broker_17.bb} | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) rename meta-oe/recipes-core/dbus/{dbus-broker_git.bb => dbus-broker_17.bb} (60%)meta-oe/recipes-core/dbus/dbus-broker_17.bb renamed from meta-oe/recipes-core/dbus/dbus-broker_git.bb +3
-15@@ -6,18 +6,12 @@ SECTION = "base" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" -DEPENDS = "dbus glib-2.0 expat" - -PV = "16+git${SRCPV}" -SRCREV = "fc874afa0992d0c75ec25acb43d344679f0ee7d2" - -SRC_URI = "gitsm://github.com/bus1/dbus-broker;protocol=git" - -S = "${WORKDIR}/git" +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI[sha256sum] = "4ec7491745a88ec5112644b0e2b9a0abe9107c85d7650be8988d88efb52da84b" inherit meson pkgconfig systemd distro_features_check -EXTRA_OEMESON += "-Ddocs=false" +DEPENDS = "expat systemd" REQUIRED_DISTRO_FEATURES = "systemd"@@ -25,8 +19,3 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN} += "${systemd_user_unitdir}" - -RDEPENDS_${PN} = "dbus" - -BBCLASSEXTEND = "native" - --2.20.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH v2 1/1 dbus-broker: 16 -> 18
In reply to William A. Kennington IIIAlso brings in a patch to fix up building against a musl libc that is not in a released build yet.
This change cleans up a number of things about the build
- Upstream no longer depends on glib
- We dont ever runtime depend on reference dbus
- Docs are disabled by default so we don't need to specify the option
- There is no native tooling so we shouldn't need a native bbclass
- No longer depend on gitsm since upstream provides release tarballs
---
...ini-Fix-missing-sys-types.h-includes.patch | 42 +++++++++++++++++++
.../{dbus-broker_git.bb => dbus-broker_18.bb} | 18 ++------
2 files changed, 46 insertions(+), 14 deletions(-)
create mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch
rename meta-oe/recipes-core/dbus/{dbus-broker_git.bb => dbus-broker_18.bb} (58%)meta-oe/recipes-core/dbus/dbus-broker/0001-c-ini-Fix-missing-sys-types.h-includes.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 0bb101ab41334588e366639e7bd41836e86f83be Mon Sep 17 00:00:00 2001 +From: "William A. Kennington III" <[email protected]> +Date: Sun, 24 Feb 2019 07:54:31 -0800 +Subject: [PATCH] c-ini: Fix missing sys/types.h includes + +Otherwise we see failures for a build against the musl libc which +doesn't include ssize_t definitions in c standard headers. + +Upstream-Status: dbus-broker@a145943ec5d1723647d3ba01ef5d0ef8f9f4a565 +Signed-off-by: William A. Kennington III <[email protected]> +--- + subprojects/c-ini/src/c-ini-reader.c | 1 + + subprojects/c-ini/src/c-ini.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/subprojects/c-ini/src/c-ini-reader.c b/subprojects/c-ini/src/c-ini-reader.c +index 1a25d5a..10de80e 100644 +--- a/subprojects/c-ini/src/c-ini-reader.c ++++ b/subprojects/c-ini/src/c-ini-reader.c +@@ -7,6 +7,7 @@ + #include <inttypes.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/types.h> + #include "c-ini.h" + #include "c-ini-private.h" + +diff --git a/subprojects/c-ini/src/c-ini.h b/subprojects/c-ini/src/c-ini.h +index 847e4d5..9c107b2 100644 +--- a/subprojects/c-ini/src/c-ini.h ++++ b/subprojects/c-ini/src/c-ini.h +@@ -66,6 +66,7 @@ extern "C" { + + #include <inttypes.h> + #include <stdlib.h> ++#include <sys/types.h> + + typedef struct CIniDomain CIniDomain; + typedef struct CIniEntry CIniEntry; +-- +2.21.0.392.gf8f6787159e-goog +
meta-oe/recipes-core/dbus/dbus-broker_18.bb renamed from meta-oe/recipes-core/dbus/dbus-broker_git.bb +4 -14
@@ -6,18 +6,13 @@ SECTION = "base" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" -DEPENDS = "dbus glib-2.0 expat" - -PV = "16+git${SRCPV}" -SRCREV = "fc874afa0992d0c75ec25acb43d344679f0ee7d2" - -SRC_URI = "gitsm://github.com/bus1/dbus-broker;protocol=git" - -S = "${WORKDIR}/git" +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI[sha256sum] = "f29e77a4d7b386e835dbe6379f4308f0503d6077834ba734ea6782359b34cbb9" +SRC_URI_append_libc-musl = "file://0001-c-ini-Fix-missing-sys-types.h-includes.patch" inherit meson pkgconfig systemd distro_features_check -EXTRA_OEMESON += "-Ddocs=false" +DEPENDS = "expat systemd" REQUIRED_DISTRO_FEATURES = "systemd"
@@ -25,8 +20,3 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN} += "${systemd_user_unitdir}" - -RDEPENDS_${PN} = "dbus" - -BBCLASSEXTEND = "native" -
Signature · 1 line
2.21.0