diff options
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman-conf.bb | 3 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 6 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb index a1a0e08faa..73c54cddae 100644 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ b/meta/recipes-connectivity/connman/connman-conf.bb | |||
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m | |||
8 | SRC_URI = "file://main.conf \ | 8 | SRC_URI = "file://main.conf \ |
9 | " | 9 | " |
10 | 10 | ||
11 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}/sources" |
12 | UNPACKDIR = "${S}" | ||
12 | 13 | ||
13 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
14 | 15 | ||
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index fcd154b4b0..46b3f854c5 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb | |||
@@ -26,5 +26,9 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
26 | RDEPENDS:${PN} = "connman" | 26 | RDEPENDS:${PN} = "connman" |
27 | 27 | ||
28 | do_install:append() { | 28 | do_install:append() { |
29 | install -m 0644 ${WORKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ | 29 | install -m 0644 ${UNPACKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ |
30 | } | 30 | } |
31 | |||
32 | # http://errors.yoctoproject.org/Errors/Details/766926/ | ||
33 | # connman-client.c:200:15: error: assignment to 'GtkTreeModel *' {aka 'struct _GtkTreeModel *'} from incompatible pointer type 'GtkTreeStore *' {aka 'struct _GtkTreeStore *'} [-Wincompatible-pointer-types] | ||
34 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 7487ca0d0c..073061eeda 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -86,7 +86,7 @@ ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','sy | |||
86 | do_install:append() { | 86 | do_install:append() { |
87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
88 | install -d ${D}${sysconfdir}/init.d | 88 | install -d ${D}${sysconfdir}/init.d |
89 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman | 89 | install -m 0755 ${UNPACKDIR}/connman ${D}${sysconfdir}/init.d/connman |
90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman | 90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman |
91 | fi | 91 | fi |
92 | 92 | ||