diff options
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-conf.bb | 32 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-conf/wired-connection.service (renamed from meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service) | 0 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-conf/wired-setup (renamed from meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup) | 0 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-conf/wired.config (renamed from meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config) | 0 |
4 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb index 9a519ec866e..b3e179e5848 100644 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ b/meta/recipes-connectivity/connman/connman-conf.bb @@ -1,3 +1,8 @@ +# TODO +# - rename connman-conf-testimage +# - ensure gets pulled into qemu images +# - what to do with connman-conf + 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." @@ -6,9 +11,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 inherit systemd -SRC_URI_append_qemuall = " file://wired.config \ - file://wired-setup \ - file://wired-connection.service \ +SRC_URI = " file://wired.config \ + file://wired-setup \ + file://wired-connection.service \ " PR = "r2" @@ -19,18 +24,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" FILES_${PN} = "${localstatedir}/* ${datadir}/*" do_install() { - #Configure Wired network interface in case of qemu* machines - if test -e ${WORKDIR}/wired.config && - test -e ${WORKDIR}/wired-setup && - test -e ${WORKDIR}/wired-connection.service; then - install -d ${D}${localstatedir}/lib/connman - install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman - install -d ${D}${datadir}/connman - install -m 0755 ${WORKDIR}/wired-setup ${D}${datadir}/connman - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/wired-connection.service ${D}${systemd_system_unitdir} - sed -i -e 's|@SCRIPTDIR@|${datadir}/connman|g' ${D}${systemd_system_unitdir}/wired-connection.service - fi + install -d ${D}${localstatedir}/lib/connman + install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman + install -d ${D}${datadir}/connman + install -m 0755 ${WORKDIR}/wired-setup ${D}${datadir}/connman + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/wired-connection.service ${D}${systemd_system_unitdir} + sed -i -e 's|@SCRIPTDIR@|${datadir}/connman|g' ${D}${systemd_system_unitdir}/wired-connection.service } -SYSTEMD_SERVICE_${PN}_qemuall = "wired-connection.service" +SYSTEMD_SERVICE_${PN} = "wired-connection.service" diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service b/meta/recipes-connectivity/connman/connman-conf/wired-connection.service index 48adfc08ac8..48adfc08ac8 100644 --- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service +++ b/meta/recipes-connectivity/connman/connman-conf/wired-connection.service diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-connectivity/connman/connman-conf/wired-setup index c46899ef327..c46899ef327 100644 --- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup +++ b/meta/recipes-connectivity/connman/connman-conf/wired-setup diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config b/meta/recipes-connectivity/connman/connman-conf/wired.config index 42998ce897c..42998ce897c 100644 --- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config +++ b/meta/recipes-connectivity/connman/connman-conf/wired.config |