fails with systemd https://errors.yoctoproject.org/Errors/Details/233766/
On Tue, Mar 19, 2019 at 11:51 AM Oleksandr Kravchuk <[email protected]> wrote: > > Signed-off-by: Oleksandr Kravchuk <[email protected]> > --- > .../blueman/0001-Fix-building-on-musl.patch | 56 +++++++++++++++++++ > .../{blueman_git.bb => blueman_2.0.8.bb} | 8 +-- > 2 files changed, 60 insertions(+), 4 deletions(-) > create mode 100644 > meta-networking/recipes-connectivity/blueman/blueman/0001-Fix-building-on-musl.patch > rename meta-networking/recipes-connectivity/blueman/{blueman_git.bb => > blueman_2.0.8.bb} (78%) > > diff --git > a/meta-networking/recipes-connectivity/blueman/blueman/0001-Fix-building-on-musl.patch > > b/meta-networking/recipes-connectivity/blueman/blueman/0001-Fix-building-on-musl.patch > new file mode 100644 > index 000000000..beef5d7c5 > --- /dev/null > +++ > b/meta-networking/recipes-connectivity/blueman/blueman/0001-Fix-building-on-musl.patch > @@ -0,0 +1,56 @@ > +From ff03542e1ff24646ef16754157a6eb6437172153 Mon Sep 17 00:00:00 2001 > +From: Kylie McClain <[email protected]> > +Date: Sun, 13 Dec 2015 21:32:05 -0500 > +Subject: [PATCH] Fix building on musl libc > + > +The addition of sys/time.h to libblueman.c is needed for `tv`'s usage, > +which is defined by musl's time.h. > + > +In addition, XCASE must be defined since it is normally provided by > +glibc's termios.h. > +--- > + blueman/main/PPPConnection.py | 2 +- > + module/libblueman.c | 1 + > + module/modem-prober.c | 4 ++++ > + 3 files changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/blueman/main/PPPConnection.py b/blueman/main/PPPConnection.py > +index 0aab1d98..1a3a9925 100644 > +--- a/blueman/main/PPPConnection.py > ++++ b/blueman/main/PPPConnection.py > +@@ -131,7 +131,7 @@ def Connect(self): > + attrs[0] &= ~(termios.IGNCR | termios.ICRNL | termios.IUCLC | > termios.INPCK | termios.IXON | termios.IXANY | > + termios.IGNPAR) > + attrs[1] &= ~(termios.OPOST | termios.OLCUC | termios.OCRNL | > termios.ONLCR | termios.ONLRET) > +- attrs[3] &= ~(termios.ICANON | termios.XCASE | termios.ECHO | > termios.ECHOE | termios.ECHONL) > ++ attrs[3] &= ~(termios.ICANON | getattr(termios, 'XCASE', 4) | > termios.ECHO | termios.ECHOE | termios.ECHONL) > + attrs[3] &= ~(termios.ECHO | termios.ECHOE) > + attrs[6][termios.VMIN] = 1 > + attrs[6][termios.VTIME] = 0 > +diff --git a/module/libblueman.c b/module/libblueman.c > +index 7f1626bc..a86fad59 100644 > +--- a/module/libblueman.c > ++++ b/module/libblueman.c > +@@ -28,6 +28,7 @@ > + #include <string.h> > + #include <sys/ioctl.h> > + #include <sys/socket.h> > ++#include <sys/time.h> > + #include <unistd.h> > + #include <linux/sockios.h> > + #include <linux/if.h> > +diff --git a/module/modem-prober.c b/module/modem-prober.c > +index daffaa4e..972ec146 100644 > +--- a/module/modem-prober.c > ++++ b/module/modem-prober.c > +@@ -34,6 +34,10 @@ > + > + #include "modem-prober.h" > + > ++#ifndef XCASE > ++#define XCASE 0000004 > ++#endif > ++ > + #if PY_MAJOR_VERSION >= 3 > + #define PyString_FromString PyUnicode_FromString > + #endif > diff --git a/meta-networking/recipes-connectivity/blueman/blueman_git.bb > b/meta-networking/recipes-connectivity/blueman/blueman_2.0.8.bb > similarity index 78% > rename from meta-networking/recipes-connectivity/blueman/blueman_git.bb > rename to meta-networking/recipes-connectivity/blueman/blueman_2.0.8.bb > index 947db7836..459db2a73 100644 > --- a/meta-networking/recipes-connectivity/blueman/blueman_git.bb > +++ b/meta-networking/recipes-connectivity/blueman/blueman_2.0.8.bb > @@ -7,12 +7,12 @@ DEPENDS = "bluez5 python3-pygobject python3-cython-native > python3-setuptools-nat > inherit autotools systemd gsettings python3native gtk-icon-cache > > SRC_URI = " \ > - git://github.com/blueman-project/blueman.git \ > + > https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz > \ > file://0001-Search-for-cython3.patch \ > + file://0001-Fix-building-on-musl.patch \ > " > -SRCREV = "c4a03417e81e21543d4568e8e7f7de307582eb50" > -PV = "2.0.5+git${SRCPV}" > -S = "${WORKDIR}/git" > +SRC_URI[md5sum] = "51dc07d48125ee9600e7f6168d6e67f6" > +SRC_URI[sha256sum] = > "04afd07b4c900a401f39e711dedbf8b9cf12000ddeda0d8ef3c3327caf34704e" > > EXTRA_OECONF = " \ > --disable-runtime-deps-check \ > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
