Signed-off-by: Saul Wold <s...@linux.intel.com> --- .../conf-files/conf-files}/qemuall/wired-setup | 0 .../conf-files/conf-files}/qemuall/wired.config | 0 meta/recipes-connectivity/connman/connman-conf.bb | 24 ---------------------- meta/recipes-connectivity/connman/connman.inc | 2 +- meta/recipes-connectivity/connman/connman_1.23.bb | 2 +- 5 files changed, 2 insertions(+), 26 deletions(-) rename meta/{recipes-connectivity/connman/connman-conf => recipes-bsp/conf-files/conf-files}/qemuall/wired-setup (100%) rename meta/{recipes-connectivity/connman/connman-conf => recipes-bsp/conf-files/conf-files}/qemuall/wired.config (100%) delete mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-bsp/conf-files/conf-files/qemuall/wired-setup similarity index 100% rename from meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup rename to meta/recipes-bsp/conf-files/conf-files/qemuall/wired-setup diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config b/meta/recipes-bsp/conf-files/conf-files/qemuall/wired.config similarity index 100% rename from meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config rename to meta/recipes-bsp/conf-files/conf-files/qemuall/wired.config diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb deleted file mode 100644 index af72640..0000000 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Connman config to setup wired interface on qemu machines" -DESCRIPTION = "This is the ConnMan configuration to set up a Wired \ -network interface for a qemu machine." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI_append_qemuall = "file://wired.config \ - file://wired-setup \ - " -PR = "r2" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -FILES_${PN} = "${localstatedir}/* ${libdir}/*" - -do_install() { - #Configure Wired network interface in case of qemu* machines - if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-setup; then - install -d ${D}${localstatedir}/lib/connman - install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman - install -d ${D}${libdir}/connman - install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman - fi -} diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index f121a81..e5a6109 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -66,7 +66,7 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -inherit autotools-brokensep pkgconfig systemd update-rc.d +inherit autotools-brokensep pkgconfig systemd update-rc.d conf-files do_configure_append () { sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service diff --git a/meta/recipes-connectivity/connman/connman_1.23.bb b/meta/recipes-connectivity/connman/connman_1.23.bb index 43501af..dd21f6d 100644 --- a/meta/recipes-connectivity/connman/connman_1.23.bb +++ b/meta/recipes-connectivity/connman/connman_1.23.bb @@ -8,4 +8,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ SRC_URI[md5sum] = "f835b8137ab198e0af5deab043e2890a" SRC_URI[sha256sum] = "1dcac1d059d5303343e544fca0d0e76837cfb32f36e4a607a71c1b65ccf007c5" -RRECOMMENDS_${PN} = "connman-conf" + -- 1.8.3.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core