* [PATCH 0/2] connman-conf fixes @ 2013-03-18 13:38 Jukka Rissanen 2013-03-18 13:38 ` [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman Jukka Rissanen 2013-03-18 13:38 ` [PATCH 2/2] connman-conf: Avoid appending IPv4 address Jukka Rissanen 0 siblings, 2 replies; 7+ messages in thread From: Jukka Rissanen @ 2013-03-18 13:38 UTC (permalink / raw) To: openembedded-core Hi, noticed some issues with connman-conf that is used to setup the ethernet in qemu image. Cheers, Jukka Jukka Rissanen (2): connman-conf: Move the setup script into /usr/lib/connman connman-conf: Avoid appending IPv4 address meta/recipes-connectivity/connman/connman-conf.bb | 8 +++++--- .../recipes-connectivity/connman/connman-conf/qemuall/wired-setup | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) -- 1.7.11.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman 2013-03-18 13:38 [PATCH 0/2] connman-conf fixes Jukka Rissanen @ 2013-03-18 13:38 ` Jukka Rissanen 2013-03-18 14:09 ` Richard Purdie 2013-03-18 13:38 ` [PATCH 2/2] connman-conf: Avoid appending IPv4 address Jukka Rissanen 1 sibling, 1 reply; 7+ messages in thread From: Jukka Rissanen @ 2013-03-18 13:38 UTC (permalink / raw) To: openembedded-core The /etc/connman is not suitable for the setup script. There are other connman related scripts in /usr/lib/connman so moving the wired setup script there. Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> --- meta/recipes-connectivity/connman/connman-conf.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb index 7b99953..6ecfbfb 100644 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ b/meta/recipes-connectivity/connman/connman-conf.bb @@ -6,16 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 SRC_URI_append_qemuall = "file://wired.config \ file://wired-setup \ " -PR = "r1" +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}${sysconfdir}/connman - install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connman + install -d ${D}${libdir}/connman + install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman fi } -- 1.7.11.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman 2013-03-18 13:38 ` [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman Jukka Rissanen @ 2013-03-18 14:09 ` Richard Purdie 2013-03-18 14:35 ` Jukka Rissanen 0 siblings, 1 reply; 7+ messages in thread From: Richard Purdie @ 2013-03-18 14:09 UTC (permalink / raw) To: Jukka Rissanen; +Cc: openembedded-core On Mon, 2013-03-18 at 15:38 +0200, Jukka Rissanen wrote: > The /etc/connman is not suitable for the setup script. > There are other connman related scripts in /usr/lib/connman > so moving the wired setup script there. > > Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> > --- > meta/recipes-connectivity/connman/connman-conf.bb | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb > index 7b99953..6ecfbfb 100644 > --- a/meta/recipes-connectivity/connman/connman-conf.bb > +++ b/meta/recipes-connectivity/connman/connman-conf.bb > @@ -6,16 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 > SRC_URI_append_qemuall = "file://wired.config \ > file://wired-setup \ > " > -PR = "r1" > +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}${sysconfdir}/connman > - install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connman > + install -d ${D}${libdir}/connman > + install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman > fi > } You've moved the files, fine, but what uses them and do we need to update the caller? Cheers, Richard ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman 2013-03-18 14:09 ` Richard Purdie @ 2013-03-18 14:35 ` Jukka Rissanen 2013-03-19 10:52 ` Iorga, Cristian 2013-03-19 10:55 ` Iorga, Cristian 0 siblings, 2 replies; 7+ messages in thread From: Jukka Rissanen @ 2013-03-18 14:35 UTC (permalink / raw) To: Richard Purdie; +Cc: openembedded-core Hi Richard, On 18.03.2013 16:09, Richard Purdie wrote: > On Mon, 2013-03-18 at 15:38 +0200, Jukka Rissanen wrote: >> The /etc/connman is not suitable for the setup script. >> There are other connman related scripts in /usr/lib/connman >> so moving the wired setup script there. >> >> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> >> --- >> meta/recipes-connectivity/connman/connman-conf.bb | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb >> index 7b99953..6ecfbfb 100644 >> --- a/meta/recipes-connectivity/connman/connman-conf.bb >> +++ b/meta/recipes-connectivity/connman/connman-conf.bb >> @@ -6,16 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 >> SRC_URI_append_qemuall = "file://wired.config \ >> file://wired-setup \ >> " >> -PR = "r1" >> +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}${sysconfdir}/connman >> - install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connman >> + install -d ${D}${libdir}/connman >> + install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman >> fi >> } > > You've moved the files, fine, but what uses them and do we need to > update the caller? I sent a separate patch "[PATCH] connman-conf: Initial systemd support" for systemd support. I did not found any file that would have init.d support (I might have missed that one :) Cheers, Jukka ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman 2013-03-18 14:35 ` Jukka Rissanen @ 2013-03-19 10:52 ` Iorga, Cristian 2013-03-19 10:55 ` Iorga, Cristian 1 sibling, 0 replies; 7+ messages in thread From: Iorga, Cristian @ 2013-03-19 10:52 UTC (permalink / raw) To: Jukka Rissanen, Richard Purdie; +Cc: openembedded-core@lists.openembedded.org Hello Jukka, Please check connman recipe. Inside it, check connman/connman for wired-setup support.. Please add a patch for that also. Regards, Cristian -----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Jukka Rissanen Sent: Monday, March 18, 2013 4:35 PM To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman Hi Richard, On 18.03.2013 16:09, Richard Purdie wrote: > On Mon, 2013-03-18 at 15:38 +0200, Jukka Rissanen wrote: >> The /etc/connman is not suitable for the setup script. >> There are other connman related scripts in /usr/lib/connman so moving >> the wired setup script there. >> >> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> >> --- >> meta/recipes-connectivity/connman/connman-conf.bb | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb >> b/meta/recipes-connectivity/connman/connman-conf.bb >> index 7b99953..6ecfbfb 100644 >> --- a/meta/recipes-connectivity/connman/connman-conf.bb >> +++ b/meta/recipes-connectivity/connman/connman-conf.bb >> @@ -6,16 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 >> SRC_URI_append_qemuall = "file://wired.config \ >> file://wired-setup \ >> " >> -PR = "r1" >> +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}${sysconfdir}/connman >> - install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connman >> + install -d ${D}${libdir}/connman >> + install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman >> fi >> } > > You've moved the files, fine, but what uses them and do we need to > update the caller? I sent a separate patch "[PATCH] connman-conf: Initial systemd support" for systemd support. I did not found any file that would have init.d support (I might have missed that one :) Really? So wired-setup was just placed there, without anybody using it?? :-P :-) Cheers, Jukka _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman 2013-03-18 14:35 ` Jukka Rissanen 2013-03-19 10:52 ` Iorga, Cristian @ 2013-03-19 10:55 ` Iorga, Cristian 1 sibling, 0 replies; 7+ messages in thread From: Iorga, Cristian @ 2013-03-19 10:55 UTC (permalink / raw) To: Iorga, Cristian, Jukka Rissanen, Richard Purdie Cc: openembedded-core@lists.openembedded.org git grep wired-setup meta/recipes-connectivity/connman/connman-conf.bb: file://wired-setup \ meta/recipes-connectivity/connman/connman-conf.bb: if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-set meta/recipes-connectivity/connman/connman-conf.bb: install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connm meta/recipes-connectivity/connman/connman/connman: if [ -f /etc/connman/wired-setup ] ; then meta/recipes-connectivity/connman/connman/connman: . /etc/connman/wired-setup -----Original Message----- From: Iorga, Cristian Sent: Tuesday, March 19, 2013 12:52 PM To: 'Jukka Rissanen'; Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: RE: [OE-core] [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman Hello Jukka, Please check connman recipe. Inside it, check connman/connman for wired-setup support.. Please add a patch for that also. Regards, Cristian -----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Jukka Rissanen Sent: Monday, March 18, 2013 4:35 PM To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman Hi Richard, On 18.03.2013 16:09, Richard Purdie wrote: > On Mon, 2013-03-18 at 15:38 +0200, Jukka Rissanen wrote: >> The /etc/connman is not suitable for the setup script. >> There are other connman related scripts in /usr/lib/connman so moving >> the wired setup script there. >> >> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> >> --- >> meta/recipes-connectivity/connman/connman-conf.bb | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb >> b/meta/recipes-connectivity/connman/connman-conf.bb >> index 7b99953..6ecfbfb 100644 >> --- a/meta/recipes-connectivity/connman/connman-conf.bb >> +++ b/meta/recipes-connectivity/connman/connman-conf.bb >> @@ -6,16 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 >> SRC_URI_append_qemuall = "file://wired.config \ >> file://wired-setup \ >> " >> -PR = "r1" >> +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}${sysconfdir}/connman >> - install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connman >> + install -d ${D}${libdir}/connman >> + install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman >> fi >> } > > You've moved the files, fine, but what uses them and do we need to > update the caller? I sent a separate patch "[PATCH] connman-conf: Initial systemd support" for systemd support. I did not found any file that would have init.d support (I might have missed that one :) Really? So wired-setup was just placed there, without anybody using it?? :-P :-) Cheers, Jukka _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] connman-conf: Avoid appending IPv4 address 2013-03-18 13:38 [PATCH 0/2] connman-conf fixes Jukka Rissanen 2013-03-18 13:38 ` [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman Jukka Rissanen @ 2013-03-18 13:38 ` Jukka Rissanen 1 sibling, 0 replies; 7+ messages in thread From: Jukka Rissanen @ 2013-03-18 13:38 UTC (permalink / raw) To: openembedded-core If run more than once, the IP addresses would be appended to IPv4 variable. Avoid that by rewriting the IPv4 always. Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> --- meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup index 135a6c1..bfdbfb3 100644 --- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup +++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup @@ -12,5 +12,5 @@ if [ "x$NET_CONF" = "x" ]; then rm ${CONFIGF} else # Setup a connman config accordingly - sed -i -e "s|^\(IPv4 =\)|\1 ${NET_CONF}|" ${CONFIGF} + sed -i -e "s|^IPv4 =.*|IPv4 = ${NET_CONF}|" ${CONFIGF} fi -- 1.7.11.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-03-19 11:12 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-03-18 13:38 [PATCH 0/2] connman-conf fixes Jukka Rissanen 2013-03-18 13:38 ` [PATCH 1/2] connman-conf: Move the setup script into /usr/lib/connman Jukka Rissanen 2013-03-18 14:09 ` Richard Purdie 2013-03-18 14:35 ` Jukka Rissanen 2013-03-19 10:52 ` Iorga, Cristian 2013-03-19 10:55 ` Iorga, Cristian 2013-03-18 13:38 ` [PATCH 2/2] connman-conf: Avoid appending IPv4 address Jukka Rissanen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox